From 81ebdebf67941ad83eb44c14b1150fbbb146bc92 Mon Sep 17 00:00:00 2001 From: Shaojin Wen Date: Sun, 14 Sep 2025 02:27:49 +0800 Subject: [PATCH] Checkstyle 2509 (#6525) * fix test checkstyle * fix testcase * fix testcase * fix checkstyle --- .../handler/MySqlMockExecuteHandlerImpl.java | 2 +- .../alibaba/druid/pool/DruidDataSource.java | 2 +- .../com/alibaba/druid/stat/TableStat.java | 4 +- .../monitor/dao/MonitorDaoJdbcImpl.java | 18 +- .../com/alibaba/druid/util/JdbcUtils.java | 2 +- .../com/alibaba/druid/Bug_for_alibank.java | 4 +- .../test/java/com/alibaba/druid/DBCPTest.java | 8 +- .../com/alibaba/druid/DragoonMetaInfTest.java | 4 +- .../test/java/com/alibaba/druid/LockTest.java | 4 +- .../java/com/alibaba/druid/TestForZY.java | 1 - .../TestHibernateCRUDWithTransactional.java | 1 - .../java/com/alibaba/druid/TestIdel3.java | 16 +- .../test/java/com/alibaba/druid/TestLRU.java | 5 +- .../java/com/alibaba/druid/TestLockCount.java | 6 +- .../java/com/alibaba/druid/TestOracle.java | 9 +- .../com/alibaba/druid/TestOraclePing.java | 6 +- .../com/alibaba/druid/TestReplaceLicense.java | 14 +- .../java/com/alibaba/druid/TestRollBack.java | 9 +- .../java/com/alibaba/druid/TestSqlServer.java | 5 +- .../com/alibaba/druid/TestTraceFilter.java | 11 +- .../test/java/com/alibaba/druid/TestUtil.java | 12 +- .../druid/benckmark/pool/AsyncClose.java | 2 + .../alibaba/druid/benckmark/pool/Case0.java | 22 +- .../alibaba/druid/benckmark/pool/Case1.java | 23 +- .../alibaba/druid/benckmark/pool/Case2.java | 18 +- .../alibaba/druid/benckmark/pool/Case3.java | 22 +- .../benckmark/pool/CaseKylin_Oracle.java | 22 +- .../druid/benckmark/pool/CaseKylin_mysql.java | 22 +- .../pool/CaseKylin_mysql_idle_1.java | 20 +- .../pool/CaseKylin_mysql_idle_2.java | 22 +- .../benckmark/pool/Case_Concurrent_50.java | 20 +- .../druid/benckmark/pool/Oracle_Case0.java | 18 +- .../druid/benckmark/pool/Oracle_Case3.java | 18 +- .../druid/benckmark/pool/Oracle_Case4.java | 22 +- .../benckmark/pool/druid/DruidCase0.java | 9 +- .../benckmark/pool/model/TableOperator.java | 4 +- .../benckmark/proxy/BenchmarkExecutor.java | 6 +- .../benckmark/proxy/DirectSQLExecutor.java | 1 - .../benckmark/proxy/DruidBenchmarkTest.java | 3 +- .../proxy/TestAtomicPerformance.java | 4 +- .../benckmark/proxy/sqlcase/Select1.java | 10 +- .../proxy/sqlcase/SelectEmptyTable.java | 12 +- .../benckmark/proxy/sqlcase/SelectNow.java | 10 +- .../proxy/sqlcase/SelectSysUser.java | 10 +- .../benckmark/sql/MySqlInsertBenchmark.java | 4 - .../benckmark/sql/MySqlInsertBenchmark_2.java | 1 - .../druid/benckmark/sql/MySqlPerfMain.java | 6 +- .../sql/MySqlPerfMain_schemaStat.java | 3 - .../benckmark/sql/MySqlPerfMain_select.java | 15 +- .../benckmark/sql/MySqlPerfMain_visitor.java | 6 +- .../druid/benckmark/sql/MySqlPerfTest.java | 8 +- .../druid/benckmark/sql/SqlHolder.java | 29 +- .../druid/benckmark/sql/Templates.java | 1 - .../benckmark/wall/WallBenchmarkTest.java | 7 +- .../benckmark/wall/WallBenchmarkTest1.java | 13 +- .../wall/WallBenchmarkTest_mysql.java | 7 +- .../WallBenchmarkTest_mysql_concurrent.java | 11 +- .../alibaba/druid/bvt/AlipayUseCaseTest.java | 1 - .../java/com/alibaba/druid/bvt/OrTest.java | 14 +- .../bvt/bug/BugSqlParserIllegalWhere.java | 17 +- .../druid/bvt/bug/Bug_for_happyday517.java | 15 +- .../druid/bvt/bug/Bug_for_happyday517_2.java | 19 +- .../druid/bvt/bug/Bug_for_happyday517_3.java | 11 +- .../alibaba/druid/bvt/bug/Bug_for_order.java | 2 - .../alibaba/druid/bvt/bug/Bug_for_qianbi.java | 10 +- .../alibaba/druid/bvt/bug/Bug_for_ruiyi.java | 9 +- .../druid/bvt/bug/Bug_for_wdw1206.java | 7 +- .../alibaba/druid/bvt/bug/Bug_for_weizhi.java | 9 - .../druid/bvt/bug/Bug_for_xuershan.java | 13 +- .../com/alibaba/druid/bvt/bug/Issue1576.java | 1 - .../com/alibaba/druid/bvt/bug/Issue1759.java | 2 +- .../com/alibaba/druid/bvt/bug/Issue1762.java | 1 - .../com/alibaba/druid/bvt/bug/Issue1865.java | 4 - .../com/alibaba/druid/bvt/bug/Issue1898.java | 1 - .../com/alibaba/druid/bvt/bug/Issue1912.java | 2 - .../com/alibaba/druid/bvt/bug/Issue1935.java | 2 +- .../com/alibaba/druid/bvt/bug/Issue1994.java | 2 - .../com/alibaba/druid/bvt/bug/Issue2049.java | 3 - .../com/alibaba/druid/bvt/bug/Issue3952.java | 6 - .../com/alibaba/druid/bvt/bug/Issue4067.java | 4 +- .../com/alibaba/druid/bvt/bug/Issue5763.java | 6 - .../com/alibaba/druid/bvt/bug/Issue5845.java | 10 +- .../com/alibaba/druid/bvt/bug/Issue5847.java | 14 +- .../com/alibaba/druid/bvt/bug/Issue_4094.java | 5 +- .../com/alibaba/druid/bvt/bug/Issue_4190.java | 4 +- .../com/alibaba/druid/bvt/bug/Issue_685.java | 3 +- .../com/alibaba/druid/bvt/bug/Issue_697.java | 8 - .../com/alibaba/druid/bvt/bug/Issue_728.java | 6 +- .../druid/bvt/filter/ClearFilterTest.java | 8 - .../bvt/filter/EncodingConvertFilterTest.java | 18 +- .../filter/EncodingConvertFilterTest2.java | 32 +-- .../druid/bvt/filter/FilterChainImplTest.java | 44 +-- .../bvt/filter/FilterChainImplTest2.java | 17 +- .../bvt/filter/FilterChainImplTest3.java | 19 +- .../bvt/filter/FilterChainTest_Clob.java | 5 +- .../bvt/filter/FilterChainTest_Clob_2.java | 18 +- .../bvt/filter/FilterChainTest_NClob.java | 19 +- .../bvt/filter/FilterChainTest_NClob_2.java | 19 +- .../bvt/filter/FilterChainTest_ResultSet.java | 17 +- .../filter/FilterChainTest_ResultSet_2.java | 20 +- ...DatasourceConnectAndRecycleFilterTest.java | 15 +- .../druid/bvt/filter/FilterManagerTest.java | 13 +- .../MySQL8DateTimeSqlTypeFilterTest.java | 21 +- .../druid/bvt/filter/ReuseStatFilterTest.java | 3 +- .../druid/bvt/filter/Slf4jFilterTest.java | 10 +- .../bvt/filter/StatFilterAfterResetTest.java | 18 +- .../StatFilterBuildSlowParameterTest.java | 29 +- .../druid/bvt/filter/StatFilterClobTest.java | 16 +- .../bvt/filter/StatFilterExecErrorTest.java | 15 +- .../StatFilterExecuteFirstResultSetTest.java | 17 +- .../bvt/filter/StatFilterExecuteTest.java | 15 +- .../filter/StatFilterOpenBlobCountTest.java | 17 +- .../filter/StatFilterOpenBlobCountTest2.java | 17 +- .../filter/StatFilterOpenClobCountTest.java | 17 +- .../filter/StatFilterOpenClobCountTest2.java | 17 +- .../StatFilterOpenInputStreamCountTest.java | 17 +- .../StatFilterOpenInputStreamCountTest2.java | 17 +- .../filter/StatFilterOpenReaderCountTest.java | 18 +- .../filter/StatFilterReadBytesLengthTest.java | 15 +- .../StatFilterReadStringLengthTest.java | 15 +- .../StatFilterResultSetMultiCloseTest.java | 15 +- .../bvt/filter/config/ConfigFilterTest.java | 13 +- .../bvt/filter/config/ConfigFilterTest1.java | 7 +- .../bvt/filter/config/ConfigFilterTest2.java | 5 +- .../bvt/filter/config/ConfigFilterTest3.java | 13 +- .../bvt/filter/config/ConfigFilterTest4.java | 13 +- .../bvt/filter/config/ConfigFilterTest5.java | 6 +- .../bvt/filter/config/ConfigFilterTest6.java | 6 +- .../bvt/filter/config/ConfigToolsTest.java | 7 +- .../druid/bvt/filter/log/LogFilterTest.java | 9 +- .../druid/bvt/filter/log/LogFilterTest2.java | 9 +- .../druid/bvt/filter/log/LogFilterTest3.java | 9 +- .../druid/bvt/filter/log/LogFilterTest4.java | 10 +- .../druid/bvt/filter/log/LogFilterTest5.java | 9 +- .../bvt/filter/log/Slf4jLogFilterTest.java | 9 +- .../druid/bvt/filter/wall/BigSqlTest.java | 6 +- .../druid/bvt/filter/wall/BitwiseAndTest.java | 11 +- .../bvt/filter/wall/BitwiseInvertTest.java | 11 +- .../druid/bvt/filter/wall/BitwiseOrTest.java | 11 +- .../druid/bvt/filter/wall/BitwiseXorTest.java | 11 +- .../druid/bvt/filter/wall/BooleanXorTest.java | 11 +- .../wall/ConstantArithmeticCheckTest.java | 11 +- .../druid/bvt/filter/wall/CountTest.java | 7 +- .../bvt/filter/wall/DoPrivilegedTest.java | 12 +- .../bvt/filter/wall/IdentEqualsTest.java | 6 +- .../bvt/filter/wall/IdentEqualsTest1.java | 6 +- .../druid/bvt/filter/wall/IntersectTest.java | 11 +- .../druid/bvt/filter/wall/LikeTest.java | 7 +- .../druid/bvt/filter/wall/MinusTest.java | 11 +- .../filter/wall/MustParameterizedTest.java | 6 +- .../filter/wall/MustParameterizedTest1.java | 6 +- .../filter/wall/MustParameterizedTest2.java | 6 +- .../filter/wall/MustParameterizedTest3.java | 8 +- .../filter/wall/MustParameterizedTest4.java | 6 +- .../bvt/filter/wall/PGDenyFunctionTest.java | 11 +- .../druid/bvt/filter/wall/PGWallTest.java | 8 +- .../filter/wall/StrictSyntaxCheckTest.java | 7 +- .../druid/bvt/filter/wall/TAEWallTest.java | 11 +- .../bvt/filter/wall/TenantDeleteTest.java | 8 +- .../bvt/filter/wall/TenantInsertTest.java | 13 +- .../bvt/filter/wall/TenantSelectTest.java | 10 +- .../bvt/filter/wall/TenantSelectTest2.java | 12 +- .../bvt/filter/wall/TenantSelectTest3.java | 18 +- .../bvt/filter/wall/TenantSelectTest4.java | 18 +- .../bvt/filter/wall/TenantUpdateTest.java | 10 +- .../wall/Test01WallProviderCreator.java | 9 +- .../wall/Test02WallProviderCreator.java | 1 - .../WallAllowSelectAllColumnDefaultTest.java | 6 +- .../wall/WallAllowSelectAllColumnTest.java | 6 +- .../wall/WallAllowSelectAllColumnTest1.java | 6 +- .../wall/WallAllowSelectAllColumnTest2.java | 6 +- .../druid/bvt/filter/wall/WallCallTest.java | 6 +- .../bvt/filter/wall/WallCommentTest.java | 7 +- .../druid/bvt/filter/wall/WallConfigTest.java | 10 +- .../druid/bvt/filter/wall/WallDeleteTest.java | 6 +- .../bvt/filter/wall/WallDeleteWhereTest.java | 7 +- .../bvt/filter/wall/WallDeleteWhereTest1.java | 7 +- .../bvt/filter/wall/WallDeleteWhereTest2.java | 7 +- .../bvt/filter/wall/WallDenySchemaTest.java | 7 +- .../bvt/filter/wall/WallDenyTableTest.java | 7 +- .../druid/bvt/filter/wall/WallDropTest.java | 7 +- .../druid/bvt/filter/wall/WallDropTest1.java | 7 +- .../druid/bvt/filter/wall/WallDropTest2.java | 7 +- ...llFilterConfigSpiForNoMatchDbTypeTest.java | 2 - .../WallFilterConfigSpiForNullDbTypeTest.java | 2 - .../druid/bvt/filter/wall/WallFilterTest.java | 11 +- .../bvt/filter/wall/WallFilterTest2.java | 24 +- .../bvt/filter/wall/WallFilterTest3.java | 29 +- .../druid/bvt/filter/wall/WallHavingTest.java | 6 +- .../bvt/filter/wall/WallHavingTest6.java | 9 +- .../druid/bvt/filter/wall/WallInsertTest.java | 6 +- .../bvt/filter/wall/WallInsertTest2.java | 6 +- .../bvt/filter/wall/WallLineCommentTest.java | 7 +- .../filter/wall/WallMultiLineCommentTest.java | 6 +- .../filter/wall/WallMultiStatementTest.java | 6 +- .../bvt/filter/wall/WallProviderTest.java | 10 +- .../bvt/filter/wall/WallReadOnlyTest.java | 7 +- .../bvt/filter/wall/WallReadOnlyTest2.java | 9 +- .../bvt/filter/wall/WallSQLExceptionTest.java | 8 +- .../bvt/filter/wall/WallSelectIntoTest.java | 6 +- .../bvt/filter/wall/WallSelectIntoTest1.java | 6 +- .../bvt/filter/wall/WallSelectLimitTest.java | 7 +- .../filter/wall/WallSelectLimitTest_2.java | 6 +- .../bvt/filter/wall/WallSelectWhereTest.java | 7 +- .../bvt/filter/wall/WallSelectWhereTest0.java | 6 +- .../bvt/filter/wall/WallSelectWhereTest1.java | 7 +- .../bvt/filter/wall/WallSelectWhereTest2.java | 6 +- .../bvt/filter/wall/WallSelectWhereTest3.java | 2 - .../bvt/filter/wall/WallSelectWhereTest4.java | 6 +- .../bvt/filter/wall/WallSelectWhereTest5.java | 6 +- .../bvt/filter/wall/WallSelectWhereTest6.java | 9 +- .../wall/WallStatTestWhereAlwaysTrue.java | 11 +- .../filter/wall/WallStatTest_WhiteList.java | 8 +- .../wall/WallStatTest_WhiteList_disable.java | 9 +- .../filter/wall/WallStatTest_alter_table.java | 21 +- .../filter/wall/WallStatTest_blackList_1.java | 8 +- .../WallStatTest_blackList_syntaxError.java | 8 +- .../filter/wall/WallStatTest_blacklist.java | 12 +- .../wall/WallStatTest_create_table.java | 9 +- .../bvt/filter/wall/WallStatTest_delete.java | 8 +- .../filter/wall/WallStatTest_drop_table.java | 8 +- .../wall/WallStatTest_function_stats.java | 9 +- .../bvt/filter/wall/WallStatTest_insert.java | 9 +- .../bvt/filter/wall/WallStatTest_select.java | 8 +- .../filter/wall/WallStatTest_select_1.java | 8 +- .../filter/wall/WallStatTest_select_2.java | 1 - .../filter/wall/WallStatTest_select_into.java | 8 +- .../bvt/filter/wall/WallStatTest_statMap.java | 14 +- .../bvt/filter/wall/WallStatTest_update.java | 9 +- .../WallStatTest_whiteList_syntaxError.java | 8 +- .../bvt/filter/wall/WallTruncateTest.java | 8 +- .../bvt/filter/wall/WallTruncateTest1.java | 6 +- .../druid/bvt/filter/wall/WallUnionTest.java | 7 +- .../druid/bvt/filter/wall/WallUnionTest2.java | 8 +- .../druid/bvt/filter/wall/WallUnionTest3.java | 6 +- .../druid/bvt/filter/wall/WallUnionTest4.java | 5 - .../bvt/filter/wall/WallUpdateCheckTest.java | 1 - .../druid/bvt/filter/wall/WallUpdateTest.java | 6 +- .../bvt/filter/wall/WallUpdateTest1.java | 7 +- .../bvt/filter/wall/WallUpdateTest2.java | 7 +- .../bvt/filter/wall/WallUpdateTest3.java | 7 +- .../bvt/filter/wall/WallUpdateTest4.java | 6 +- .../bvt/filter/wall/WallUpdateWhereTest.java | 8 +- .../bvt/filter/wall/WallUpdateWhereTest1.java | 7 +- .../wall/WallVisitorUtilsLargeOrTest.java | 5 +- .../bvt/filter/wall/WallVisitorUtilsTest.java | 5 +- .../wall/mysql/MySqlWallDescribteTest.java | 7 +- .../filter/wall/mysql/MySqlWallLimitTest.java | 7 +- .../mysql/MySqlWallLoadDataInfileTest.java | 7 +- .../mysql/MySqlWallPermitFunctionTest.java | 8 +- .../wall/mysql/MySqlWallPermitTableTest.java | 9 +- .../mysql/MySqlWallPermitVariantTest.java | 7 +- .../bvt/filter/wall/mysql/MySqlWallTest.java | 7 +- .../bvt/filter/wall/mysql/MySqlWallTest1.java | 6 +- .../filter/wall/mysql/MySqlWallTest10.java | 6 +- .../filter/wall/mysql/MySqlWallTest100.java | 7 +- .../filter/wall/mysql/MySqlWallTest101.java | 7 +- .../filter/wall/mysql/MySqlWallTest102.java | 7 +- .../filter/wall/mysql/MySqlWallTest103.java | 7 +- .../filter/wall/mysql/MySqlWallTest104.java | 7 +- .../filter/wall/mysql/MySqlWallTest105.java | 7 +- .../filter/wall/mysql/MySqlWallTest106.java | 7 +- .../filter/wall/mysql/MySqlWallTest107.java | 7 +- .../filter/wall/mysql/MySqlWallTest108.java | 7 +- .../filter/wall/mysql/MySqlWallTest109.java | 7 +- .../filter/wall/mysql/MySqlWallTest11.java | 16 +- .../filter/wall/mysql/MySqlWallTest110.java | 7 +- .../filter/wall/mysql/MySqlWallTest111.java | 7 +- .../filter/wall/mysql/MySqlWallTest112.java | 7 +- .../filter/wall/mysql/MySqlWallTest113.java | 7 +- .../filter/wall/mysql/MySqlWallTest114.java | 7 +- .../filter/wall/mysql/MySqlWallTest115.java | 7 +- .../filter/wall/mysql/MySqlWallTest116.java | 7 +- .../filter/wall/mysql/MySqlWallTest117.java | 7 +- .../filter/wall/mysql/MySqlWallTest118.java | 7 +- .../filter/wall/mysql/MySqlWallTest119.java | 7 +- .../filter/wall/mysql/MySqlWallTest12.java | 12 +- .../filter/wall/mysql/MySqlWallTest120.java | 7 +- .../filter/wall/mysql/MySqlWallTest121.java | 7 +- .../filter/wall/mysql/MySqlWallTest122.java | 7 +- .../filter/wall/mysql/MySqlWallTest123.java | 7 +- .../filter/wall/mysql/MySqlWallTest124.java | 7 +- .../filter/wall/mysql/MySqlWallTest125.java | 7 +- .../filter/wall/mysql/MySqlWallTest126.java | 7 +- .../filter/wall/mysql/MySqlWallTest127.java | 7 +- .../filter/wall/mysql/MySqlWallTest128.java | 7 +- .../filter/wall/mysql/MySqlWallTest129.java | 13 +- .../filter/wall/mysql/MySqlWallTest13.java | 14 +- .../filter/wall/mysql/MySqlWallTest130.java | 13 +- .../filter/wall/mysql/MySqlWallTest131.java | 7 +- .../filter/wall/mysql/MySqlWallTest132.java | 7 +- .../filter/wall/mysql/MySqlWallTest133.java | 9 +- .../filter/wall/mysql/MySqlWallTest134.java | 8 +- .../filter/wall/mysql/MySqlWallTest135.java | 7 +- .../filter/wall/mysql/MySqlWallTest136.java | 7 +- .../filter/wall/mysql/MySqlWallTest137.java | 9 +- .../filter/wall/mysql/MySqlWallTest138.java | 21 +- .../filter/wall/mysql/MySqlWallTest139.java | 30 +-- .../filter/wall/mysql/MySqlWallTest14.java | 12 +- .../filter/wall/mysql/MySqlWallTest140.java | 8 +- .../filter/wall/mysql/MySqlWallTest141.java | 6 +- .../filter/wall/mysql/MySqlWallTest142.java | 6 +- .../filter/wall/mysql/MySqlWallTest143.java | 32 +-- .../filter/wall/mysql/MySqlWallTest144.java | 6 +- .../filter/wall/mysql/MySqlWallTest145.java | 6 +- .../filter/wall/mysql/MySqlWallTest146.java | 2 - .../wall/mysql/MySqlWallTest147_optimize.java | 2 - .../filter/wall/mysql/MySqlWallTest148.java | 2 - .../filter/wall/mysql/MySqlWallTest15.java | 26 +- .../filter/wall/mysql/MySqlWallTest16.java | 8 +- .../filter/wall/mysql/MySqlWallTest17.java | 8 +- .../filter/wall/mysql/MySqlWallTest18.java | 8 +- .../filter/wall/mysql/MySqlWallTest19.java | 13 +- .../bvt/filter/wall/mysql/MySqlWallTest2.java | 16 +- .../filter/wall/mysql/MySqlWallTest20.java | 8 +- .../filter/wall/mysql/MySqlWallTest21.java | 11 +- .../filter/wall/mysql/MySqlWallTest22.java | 11 +- .../filter/wall/mysql/MySqlWallTest23.java | 11 +- .../filter/wall/mysql/MySqlWallTest24.java | 11 +- .../filter/wall/mysql/MySqlWallTest25.java | 15 +- .../filter/wall/mysql/MySqlWallTest26.java | 8 +- .../filter/wall/mysql/MySqlWallTest27.java | 8 +- .../filter/wall/mysql/MySqlWallTest28.java | 8 +- .../filter/wall/mysql/MySqlWallTest29.java | 8 +- .../bvt/filter/wall/mysql/MySqlWallTest3.java | 10 +- .../filter/wall/mysql/MySqlWallTest30.java | 8 +- .../filter/wall/mysql/MySqlWallTest31.java | 8 +- .../filter/wall/mysql/MySqlWallTest32.java | 14 +- .../filter/wall/mysql/MySqlWallTest33.java | 11 +- .../filter/wall/mysql/MySqlWallTest34.java | 8 +- .../filter/wall/mysql/MySqlWallTest35.java | 11 +- .../filter/wall/mysql/MySqlWallTest36.java | 9 +- .../filter/wall/mysql/MySqlWallTest37.java | 9 +- .../filter/wall/mysql/MySqlWallTest38.java | 9 +- .../filter/wall/mysql/MySqlWallTest39.java | 9 +- .../bvt/filter/wall/mysql/MySqlWallTest4.java | 6 +- .../filter/wall/mysql/MySqlWallTest40.java | 12 +- .../filter/wall/mysql/MySqlWallTest41.java | 9 +- .../filter/wall/mysql/MySqlWallTest42.java | 13 +- .../filter/wall/mysql/MySqlWallTest43.java | 12 +- .../filter/wall/mysql/MySqlWallTest44.java | 7 +- .../filter/wall/mysql/MySqlWallTest45.java | 7 +- .../filter/wall/mysql/MySqlWallTest46.java | 7 +- .../filter/wall/mysql/MySqlWallTest47.java | 17 +- .../filter/wall/mysql/MySqlWallTest48.java | 15 +- .../filter/wall/mysql/MySqlWallTest49.java | 53 ++-- .../bvt/filter/wall/mysql/MySqlWallTest5.java | 6 +- .../filter/wall/mysql/MySqlWallTest50.java | 7 +- .../filter/wall/mysql/MySqlWallTest51.java | 7 +- .../filter/wall/mysql/MySqlWallTest52.java | 8 +- .../filter/wall/mysql/MySqlWallTest53.java | 8 +- .../filter/wall/mysql/MySqlWallTest54.java | 8 +- .../filter/wall/mysql/MySqlWallTest55.java | 9 +- .../filter/wall/mysql/MySqlWallTest56.java | 7 +- .../filter/wall/mysql/MySqlWallTest57.java | 8 +- .../filter/wall/mysql/MySqlWallTest58.java | 12 +- .../filter/wall/mysql/MySqlWallTest59.java | 12 +- .../bvt/filter/wall/mysql/MySqlWallTest6.java | 6 +- .../filter/wall/mysql/MySqlWallTest60.java | 8 +- .../filter/wall/mysql/MySqlWallTest61.java | 13 +- .../filter/wall/mysql/MySqlWallTest62.java | 34 +-- .../filter/wall/mysql/MySqlWallTest63.java | 9 +- .../filter/wall/mysql/MySqlWallTest64.java | 9 +- .../filter/wall/mysql/MySqlWallTest65.java | 3 - .../filter/wall/mysql/MySqlWallTest66.java | 28 +- .../filter/wall/mysql/MySqlWallTest67.java | 28 +- .../filter/wall/mysql/MySqlWallTest68.java | 10 +- .../filter/wall/mysql/MySqlWallTest69.java | 8 +- .../bvt/filter/wall/mysql/MySqlWallTest7.java | 6 +- .../filter/wall/mysql/MySqlWallTest70.java | 8 +- .../filter/wall/mysql/MySqlWallTest71.java | 9 +- .../filter/wall/mysql/MySqlWallTest72.java | 9 +- .../filter/wall/mysql/MySqlWallTest73.java | 22 +- .../filter/wall/mysql/MySqlWallTest74.java | 26 +- .../filter/wall/mysql/MySqlWallTest75.java | 10 +- .../filter/wall/mysql/MySqlWallTest76.java | 8 +- .../filter/wall/mysql/MySqlWallTest77.java | 8 +- .../filter/wall/mysql/MySqlWallTest78.java | 8 +- .../filter/wall/mysql/MySqlWallTest79.java | 8 +- .../bvt/filter/wall/mysql/MySqlWallTest8.java | 7 +- .../filter/wall/mysql/MySqlWallTest80.java | 8 +- .../filter/wall/mysql/MySqlWallTest81.java | 8 +- .../filter/wall/mysql/MySqlWallTest82.java | 8 +- .../filter/wall/mysql/MySqlWallTest83.java | 8 +- .../filter/wall/mysql/MySqlWallTest84.java | 8 +- .../filter/wall/mysql/MySqlWallTest85.java | 8 +- .../filter/wall/mysql/MySqlWallTest86.java | 8 +- .../filter/wall/mysql/MySqlWallTest87.java | 8 +- .../filter/wall/mysql/MySqlWallTest88.java | 8 +- .../filter/wall/mysql/MySqlWallTest89.java | 8 +- .../bvt/filter/wall/mysql/MySqlWallTest9.java | 10 +- .../filter/wall/mysql/MySqlWallTest90.java | 13 +- .../filter/wall/mysql/MySqlWallTest91.java | 3 - .../filter/wall/mysql/MySqlWallTest92.java | 9 +- .../filter/wall/mysql/MySqlWallTest93.java | 8 +- .../filter/wall/mysql/MySqlWallTest94.java | 9 +- .../filter/wall/mysql/MySqlWallTest95.java | 7 +- .../filter/wall/mysql/MySqlWallTest96.java | 7 +- .../filter/wall/mysql/MySqlWallTest97.java | 7 +- .../filter/wall/mysql/MySqlWallTest98.java | 7 +- .../filter/wall/mysql/MySqlWallTest99.java | 7 +- .../wall/mysql/MySqlWallTest_comment.java | 5 +- .../wall/mysql/MySqlWallTest_concat.java | 8 +- .../wall/mysql/MySqlWallTest_having.java | 7 +- .../filter/wall/mysql/MySqlWallTest_hint.java | 33 ++- .../filter/wall/mysql/MySqlWallTest_if.java | 8 +- .../wall/mysql/MySqlWallTest_ifnull_1.java | 8 +- .../wall/mysql/MySqlWallTest_ifnull_2.java | 8 +- .../wall/mysql/MySqlWallTest_like_1.java | 8 +- .../wall/mysql/MySqlWallTest_sqlmap.java | 9 +- .../wall/mysql/MySqlWallTest_union.java | 9 +- .../filter/wall/mysql/MySqlWallTest_var.java | 17 +- .../MySqlWallTest_var_autoincrement.java | 8 +- .../mysql/MysqlWallTest_rename_table.java | 5 - .../oracle/OracleWallPermitFunctionTest.java | 8 +- .../oracle/OracleWallPermitObjectTest.java | 7 +- .../oracle/OracleWallPermitSchemaTest.java | 8 +- .../oracle/OracleWallPermitTableTest.java | 7 +- .../oracle/OracleWallPermitVariantTest.java | 7 +- .../oracle/OracleWallPermitVariantTest2.java | 7 +- .../wall/oracle/OracleWallResourceTest.java | 1 - .../filter/wall/oracle/OracleWallTest.java | 5 +- .../filter/wall/oracle/OracleWallTest1.java | 7 +- .../filter/wall/oracle/OracleWallTest10.java | 2 - .../filter/wall/oracle/OracleWallTest2.java | 6 +- .../filter/wall/oracle/OracleWallTest3.java | 8 +- .../filter/wall/oracle/OracleWallTest4.java | 16 +- .../filter/wall/oracle/OracleWallTest5.java | 6 +- .../filter/wall/oracle/OracleWallTest6.java | 6 +- .../filter/wall/oracle/OracleWallTest7.java | 2 - .../oracle/OracleWallTest8_alter_rebuild.java | 2 - .../wall/oracle/OracleWallTest9_exists.java | 2 - .../druid/bvt/filter/wall/pg/PGWallTest1.java | 2 - .../SQLServerWallPermitFunctionTest.java | 8 +- .../SQLServerWallPermitObjectTest.java | 7 +- .../SQLServerWallPermitSchemaTest.java | 7 +- .../SQLServerWallPermitTableTest.java | 7 +- .../wall/sqlserver/SQLServerWallTest.java | 6 +- .../wall/sqlserver/SQLServerWallTest_0.java | 34 +-- .../wall/sqlserver/SQLServerWallTest_1.java | 8 +- .../wall/sqlserver/SQLServerWallTest_10.java | 8 +- .../wall/sqlserver/SQLServerWallTest_11.java | 12 +- .../wall/sqlserver/SQLServerWallTest_12.java | 8 +- .../wall/sqlserver/SQLServerWallTest_2.java | 8 +- .../wall/sqlserver/SQLServerWallTest_3.java | 9 +- .../wall/sqlserver/SQLServerWallTest_4.java | 8 +- .../wall/sqlserver/SQLServerWallTest_5.java | 9 +- .../wall/sqlserver/SQLServerWallTest_6.java | 9 +- .../wall/sqlserver/SQLServerWallTest_7.java | 8 +- .../wall/sqlserver/SQLServerWallTest_8.java | 8 +- .../wall/sqlserver/SQLServerWallTest_9.java | 14 +- .../bvt/hibernate/HibernateCRUDTest.java | 17 +- .../druid/bvt/hibernate/entity/Sample.java | 6 +- .../druid/bvt/jmx/DupRegisterTest.java | 10 +- .../druid/bvt/jmx/JMXExporterTest.java | 10 +- .../com/alibaba/druid/bvt/log/LoggerTest.java | 13 +- .../druid/bvt/mock/MockExecuteTest.java | 7 +- .../bvt/mock/MockResultSetMetaDataTest.java | 14 +- .../alibaba/druid/bvt/pool/AsyncInitTest.java | 1 - .../bvt/pool/Bug_for_dupCloseStmtError.java | 13 +- .../druid/bvt/pool/CallableStatmentTest.java | 14 +- .../com/alibaba/druid/bvt/pool/Case0.java | 12 +- .../com/alibaba/druid/bvt/pool/Case1.java | 14 +- .../com/alibaba/druid/bvt/pool/Case2.java | 14 +- .../com/alibaba/druid/bvt/pool/Case3.java | 10 +- .../alibaba/druid/bvt/pool/ClosedTest.java | 9 +- .../druid/bvt/pool/ConfigErrorTest.java | 11 +- .../druid/bvt/pool/ConfigErrorTest2.java | 7 +- .../druid/bvt/pool/ConfigErrorTest3.java | 10 +- .../druid/bvt/pool/ConfigErrorTestMysql.java | 9 +- .../druid/bvt/pool/CreateSchedulerTest.java | 10 +- .../CreateSchedulerTest_directCreate.java | 3 - .../pool/DataSourceDisableExceptionTest.java | 5 - .../druid/bvt/pool/DestorySchedulerTest.java | 10 +- .../bvt/pool/DruidConnectionHolderTest.java | 1 - .../bvt/pool/DruidConnectionHolderTest2.java | 10 +- .../bvt/pool/DruidConnectionHolderTest3.java | 10 +- .../bvt/pool/DruidConnectionHolderTest4.java | 13 +- .../pool/DruidDataSourceAsyncCloseTest.java | 5 +- .../pool/DruidDataSourceC3P0AdapterTest.java | 13 +- .../pool/DruidDataSourceConverterTest.java | 11 +- .../bvt/pool/DruidDataSourceDecryptTest.java | 12 +- .../bvt/pool/DruidDataSourceFactoryTest.java | 15 +- .../bvt/pool/DruidDataSourceFactoryTest0.java | 7 +- .../bvt/pool/DruidDataSourceFactoryTest1.java | 12 +- .../bvt/pool/DruidDataSourceFactoryTest2.java | 11 +- .../bvt/pool/DruidDataSourceFilterTest.java | 10 +- .../bvt/pool/DruidDataSourceShrinkTest.java | 4 +- .../druid/bvt/pool/DruidDataSourceTest.java | 9 +- .../druid/bvt/pool/DruidDataSourceTest1.java | 9 +- .../druid/bvt/pool/DruidDataSourceTest10.java | 4 +- .../druid/bvt/pool/DruidDataSourceTest2.java | 7 +- .../druid/bvt/pool/DruidDataSourceTest3.java | 17 +- .../druid/bvt/pool/DruidDataSourceTest4.java | 13 +- .../druid/bvt/pool/DruidDataSourceTest5.java | 15 +- .../druid/bvt/pool/DruidDataSourceTest6.java | 26 +- .../druid/bvt/pool/DruidDataSourceTest7.java | 14 +- .../druid/bvt/pool/DruidDataSourceTest8.java | 14 +- .../DruidDataSourceTest9_phyMaxUseCount.java | 1 - ...dDataSourceTestValidConnectionChecker.java | 6 +- .../pool/DruidDataSourceTest_autocommit.java | 16 +- .../pool/DruidDataSourceTest_autocommit2.java | 16 +- .../pool/DruidDataSourceTest_autocommit3.java | 16 +- .../pool/DruidDataSourceTest_autocommit4.java | 16 +- .../pool/DruidDataSourceTest_clearCache.java | 8 +- .../pool/DruidDataSourceTest_closeError.java | 7 +- .../pool/DruidDataSourceTest_createError.java | 14 +- .../bvt/pool/DruidDataSourceTest_enable.java | 10 +- .../DruidDataSourceTest_exceptionSorter.java | 16 +- ...DataSourceTest_exceptionSorter_extend.java | 12 +- .../bvt/pool/DruidDataSourceTest_fill.java | 8 +- .../bvt/pool/DruidDataSourceTest_fill2.java | 10 +- .../DruidDataSourceTest_getConnection.java | 11 +- .../DruidDataSourceTest_getConnection_2.java | 4 - ...uidDataSourceTest_getPooledConnection.java | 26 +- ...ruidDataSourceTest_getPoolingPeakTime.java | 9 +- .../DruidDataSourceTest_getProperties.java | 6 +- .../bvt/pool/DruidDataSourceTest_initSql.java | 12 +- .../DruidDataSourceTest_initSql_factory.java | 14 +- .../pool/DruidDataSourceTest_initSqls.java | 10 +- .../pool/DruidDataSourceTest_interrupt.java | 8 +- .../pool/DruidDataSourceTest_interrupt2.java | 10 +- .../pool/DruidDataSourceTest_interrupt3.java | 9 +- .../DruidDataSourceTest_lastCreateError.java | 13 +- .../pool/DruidDataSourceTest_lastError.java | 13 +- ...dDataSourceTest_loadSysPropertyFilter.java | 7 +- .../pool/DruidDataSourceTest_maxActive1.java | 7 +- .../pool/DruidDataSourceTest_maxActive2.java | 7 +- .../pool/DruidDataSourceTest_maxActive3.java | 7 +- .../pool/DruidDataSourceTest_maxActive4.java | 6 +- .../bvt/pool/DruidDataSourceTest_maxWait.java | 8 +- .../DruidDataSourceTest_notEmptyWait.java | 8 +- .../DruidDataSourceTest_notEmptyWait2.java | 18 +- .../bvt/pool/DruidDataSourceTest_oracle.java | 6 +- .../bvt/pool/DruidDataSourceTest_oracle2.java | 6 +- .../bvt/pool/DruidDataSourceTest_oracle3.java | 6 +- .../DruidDataSourceTest_oracle_error.java | 6 +- .../bvt/pool/DruidDataSourceTest_recycle.java | 8 +- .../pool/DruidDataSourceTest_recycle2.java | 17 +- ...ruidDataSourceTest_testOnBorrowFailed.java | 17 +- ...dDataSourceTest_testOnWhileIdleFailed.java | 17 +- .../bvt/pool/DruidDataSourceTest_tryGet.java | 8 +- ...DruidDataSourceTest_wrapDriverFilters.java | 7 +- .../DruidPooledCallableStatementTest.java | 19 +- .../bvt/pool/DruidPooledConnectionTest.java | 12 +- .../bvt/pool/DruidPooledConnectionTest1.java | 12 +- .../bvt/pool/DruidPooledConnectionTest2.java | 11 +- ...ruidPooledConnectionTest_prepareError.java | 13 +- .../DruidPooledPreparedStatementTest.java | 13 +- .../DruidPooledPreparedStatementTest1.java | 17 +- .../bvt/pool/DruidPooledResultSetTest.java | 12 +- .../bvt/pool/DruidPooledResultSetTest2.java | 11 +- .../bvt/pool/DruidPooledStatementTest.java | 19 +- .../com/alibaba/druid/bvt/pool/DumpTest.java | 10 +- .../druid/bvt/pool/ExceptionSorterTest.java | 13 +- .../com/alibaba/druid/bvt/pool/FullTest.java | 9 +- .../druid/bvt/pool/HoldableUnsupportTest.java | 9 +- .../bvt/pool/InitExceptionThrowTest.java | 2 +- .../com/alibaba/druid/bvt/pool/Issue4316.java | 4 - .../bvt/pool/JdbcDataSourceStatTest.java | 10 +- .../alibaba/druid/bvt/pool/KeepAliveTest.java | 1 - .../bvt/pool/KeepAliveTest_scheduler.java | 1 - .../druid/bvt/pool/LastActiveTest_0.java | 16 +- .../alibaba/druid/bvt/pool/LockFairTest.java | 12 +- .../druid/bvt/pool/ManagedDataSourceTest.java | 11 +- .../alibaba/druid/bvt/pool/PSCacheTest.java | 12 +- .../alibaba/druid/bvt/pool/PSCacheTest1.java | 14 +- .../alibaba/druid/bvt/pool/PSCacheTest2.java | 12 +- .../alibaba/druid/bvt/pool/PSCacheTest3.java | 7 +- .../alibaba/druid/bvt/pool/PSCacheTest4.java | 14 +- .../com/alibaba/druid/bvt/pool/ParamTest.java | 10 +- .../druid/bvt/pool/PasswordCallbackTest.java | 12 +- .../bvt/pool/PreparedStatementKeyTest.java | 37 +-- .../pool/PreparedStatementProxyImplTest.java | 11 +- .../alibaba/druid/bvt/pool/RegisterTest.java | 8 +- .../alibaba/druid/bvt/pool/SavepointTest.java | 11 +- .../druid/bvt/pool/SlowSqlMillisTest.java | 7 +- .../druid/bvt/pool/SlowSqlMillisTest2.java | 7 +- .../bvt/pool/SpringIbatisFilterTest.java | 29 +- .../bvt/pool/SpringMybatisFilterTest.java | 17 +- .../druid/bvt/pool/TestActiveTrace.java | 12 +- .../com/alibaba/druid/bvt/pool/TestClone.java | 13 +- .../alibaba/druid/bvt/pool/TestClose_0.java | 10 +- .../alibaba/druid/bvt/pool/TestClose_1.java | 12 +- .../alibaba/druid/bvt/pool/TestClose_2.java | 12 +- .../druid/bvt/pool/TestConnectError.java | 13 +- .../druid/bvt/pool/TestConnectTimeout.java | 14 +- .../alibaba/druid/bvt/pool/TestDefault.java | 10 +- .../alibaba/druid/bvt/pool/TestDisable.java | 14 +- .../druid/bvt/pool/TestDruidDataSource.java | 10 +- .../druid/bvt/pool/TestGetUpdateCount.java | 18 +- .../druid/bvt/pool/TestGraceShutdown.java | 12 +- .../com/alibaba/druid/bvt/pool/TestH2.java | 12 +- .../com/alibaba/druid/bvt/pool/TestIdle.java | 15 +- .../com/alibaba/druid/bvt/pool/TestIdle2.java | 10 +- .../com/alibaba/druid/bvt/pool/TestIdle3.java | 16 +- .../bvt/pool/TestLogLongTimeTransaction.java | 15 +- .../bvt/pool/TestOnBorrowFileAndNameTest.java | 18 +- .../druid/bvt/pool/TestOraclePrefetch.java | 19 +- .../druid/bvt/pool/TestOracleWall.java | 13 +- .../druid/bvt/pool/TestOracleWall2.java | 15 +- .../druid/bvt/pool/TestOracleWall3.java | 15 +- .../druid/bvt/pool/TestOracleWallJdbc3.java | 15 +- .../druid/bvt/pool/TestOracleWrap.java | 15 +- .../druid/bvt/pool/TestOracleWrap2.java | 15 +- .../bvt/pool/TestPoolPreparedStatement.java | 12 +- .../bvt/pool/TestPoolPreparedStatement2.java | 12 +- .../druid/bvt/pool/TestRemoveAbandoned.java | 10 +- .../druid/bvt/pool/TestRemoveAbandoned2.java | 11 +- .../bvt/pool/TestSharePreparedStatements.java | 12 +- .../com/alibaba/druid/bvt/pool/TestStat.java | 14 +- .../pool/TimeBetweenLogStatsMillisTest.java | 7 +- .../pool/TimeBetweenLogStatsMillisTest2.java | 7 +- .../pool/TimeBetweenLogStatsMillisTest3.java | 11 +- .../druid/bvt/pool/TransactionTest.java | 7 +- .../alibaba/druid/bvt/pool/UnwrapTest.java | 17 +- .../alibaba/druid/bvt/pool/UnwrapTest2.java | 15 +- .../druid/bvt/pool/UnwrapTest_filter.java | 10 +- .../bvt/pool/UserPasswordVersionTest.java | 6 - .../UsingDefaultLockModeBenchmarkTest.java | 21 +- .../bvt/pool/UsingFairLockBenchmarkTest.java | 21 +- .../pool/UsingUnfairLockBenchmarkTest.java | 21 +- .../bvt/pool/ValidationQueryLogDB2Test.java | 12 +- .../bvt/pool/ValidationQueryLogTest.java | 11 +- .../DruidDataSourceC3P0AdapterTest.java | 9 +- .../DruidDataSourceC3P0AdapterTest2.java | 10 +- .../druid/bvt/pool/basic/ConnectionTest.java | 12 +- .../druid/bvt/pool/basic/ConnectionTest2.java | 13 +- .../druid/bvt/pool/basic/ConnectionTest3.java | 15 +- .../druid/bvt/pool/basic/ConnectionTest4.java | 20 +- .../druid/bvt/pool/basic/ConnectionTest5.java | 18 +- .../druid/bvt/pool/basic/DataSourceTest3.java | 21 +- .../basic/DruidDataSourceFactoryTest.java | 13 +- .../basic/MaxEvictableIdleTimeMillisTest.java | 9 +- .../MaxEvictableIdleTimeMillisTest2.java | 7 - .../bvt/pool/basic/MaxPhyTimeMillisTest.java | 9 +- .../basic/PoolableCallableStatementTest.java | 14 +- .../basic/PoolablePreparedStatementTest.java | 23 +- .../bvt/pool/basic/PoolableStatementTest.java | 12 +- .../pool/basic/PoolableStatementTest2.java | 19 +- .../pool/basic/PoolableStatementTest3.java | 8 +- .../bvt/pool/basic/PoolableWrapperTest.java | 6 +- .../pool/basic/PreparedStatementKeyTest.java | 7 +- .../druid/bvt/pool/basic/ResultSetTest.java | 14 +- .../druid/bvt/pool/basic/ResultSetTest2.java | 14 +- .../druid/bvt/pool/basic/TestCommit.java | 12 +- .../bvt/pool/basic/TestDataSourceBasic.java | 17 +- .../bvt/pool/basic/TestDataSourceBasic2.java | 10 +- .../dynamic/ConnectPropertiesChangeTest.java | 12 +- .../dynamic/ConnectPropertiesChangeTest1.java | 12 +- .../DruidDataSourceStatLoggerImplTest.java | 11 +- .../bvt/pool/dynamic/MaxActiveChangeTest.java | 9 +- .../PoolPreparedStatementsChangeTest.java | 11 +- .../bvt/pool/dynamic/SqlSkipCountTest.java | 14 +- .../OceanBaseOracleExceptionSorterTest.java | 5 - .../exception/OracleExceptionSorterTest.java | 14 +- .../OracleExceptionSorterTest_closeConn.java | 16 +- ...OracleExceptionSorterTest_closeConn_1.java | 16 +- ...OracleExceptionSorterTest_closeConn_2.java | 16 +- ...OracleExceptionSorterTest_closeConn_3.java | 16 +- ...rterTest_closeConnectFailedDatasource.java | 20 +- .../OracleExceptionSorterTest_closeStmt.java | 14 +- .../OracleExceptionSorterTest_commit.java | 11 +- .../OracleExceptionSorterTest_concurrent.java | 17 +- .../OracleExceptionSorterTest_rollback.java | 12 +- .../OracleExceptionSorterTest_setCatalog.java | 16 +- ...ExceptionSorterTest_setIsolationLevel.java | 16 +- ...OracleExceptionSorterTest_setReadOnly.java | 16 +- ...racleExceptionSorterTest_setSavepoint.java | 18 +- ...eptionSorterTest_setSavepointWithName.java | 16 +- ...acleExceptionSorterTest_stmt_addBatch.java | 16 +- ...OracleExceptionSorterTest_stmt_cancel.java | 16 +- ...leExceptionSorterTest_stmt_clearBatch.java | 16 +- ...ceptionSorterTest_stmt_clearWarrnings.java | 16 +- ...racleExceptionSorterTest_stmt_execute.java | 16 +- ...ExceptionSorterTest_stmt_executeBatch.java | 16 +- ...ExceptionSorterTest_stmt_executeQuery.java | 16 +- ...xceptionSorterTest_stmt_executeUpdate.java | 16 +- ...eptionSorterTest_stmt_executeUpdate_1.java | 16 +- ...eptionSorterTest_stmt_executeUpdate_2.java | 16 +- ...eptionSorterTest_stmt_executeUpdate_3.java | 16 +- ...cleExceptionSorterTest_stmt_execute_1.java | 16 +- ...cleExceptionSorterTest_stmt_execute_2.java | 16 +- ...cleExceptionSorterTest_stmt_execute_3.java | 16 +- ...tionSorterTest_stmt_getFetchDirection.java | 16 +- ...ExceptionSorterTest_stmt_getFetchSize.java | 16 +- ...ptionSorterTest_stmt_getGeneratedKeys.java | 16 +- ...eExceptionSorterTest_stmt_getMaxField.java | 16 +- ...leExceptionSorterTest_stmt_getMaxRows.java | 16 +- ...ceptionSorterTest_stmt_getMoreResults.java | 16 +- ...ptionSorterTest_stmt_getMoreResults_1.java | 16 +- ...eptionSorterTest_stmt_getQueryTimeout.java | 16 +- ...ExceptionSorterTest_stmt_getResultSet.java | 16 +- ...rterTest_stmt_getResultSetConcurrency.java | 16 +- ...rterTest_stmt_getResultSetHoldability.java | 16 +- ...ptionSorterTest_stmt_getResultSetType.java | 16 +- ...ceptionSorterTest_stmt_getUpdateCount.java | 16 +- ...ExceptionSorterTest_stmt_getWarrnings.java | 16 +- ...xceptionSorterTest_stmt_setCursorName.java | 16 +- ...onSorterTest_stmt_setEscapeProcessing.java | 16 +- ...tionSorterTest_stmt_setFetchDirection.java | 18 +- ...ExceptionSorterTest_stmt_setFetchSize.java | 16 +- ...eExceptionSorterTest_stmt_setMaxField.java | 16 +- ...leExceptionSorterTest_stmt_setMaxRows.java | 16 +- ...eptionSorterTest_stmt_setQueryTimeout.java | 16 +- .../OracleExceptionSorter_userDefined.java | 10 +- .../OracleExceptionSorter_userDefined_1.java | 10 +- .../druid/bvt/pool/profile/FailFastTest.java | 11 +- .../bvt/pool/profile/ProfileEnableTest.java | 2 - .../pool/property/PropertyTest_filters.java | 7 - .../property/PropertyTest_testOnBorrow.java | 8 +- .../property/PropertyTest_testWhileIdle.java | 8 +- .../PropertyTest_useGlobalDataSourceStat.java | 8 +- .../PropertyTest_validationQuery.java | 7 - .../vendor/InformixExceptionSorterTest.java | 10 +- .../MSSQLValidConnectionCheckerTest.java | 11 +- .../MySQLValidConnectionCheckerTest.java | 11 +- .../pool/vendor/MySqlExceptionSorterTest.java | 9 +- .../vendor/MySqlExceptionSorterTest_2.java | 3 - .../MySqlExceptionSorterTest_oceanbase.java | 9 +- .../pool/vendor/PGExceptionSorterTest.java | 8 +- .../vendor/SybaseExceptionSorterTest.java | 10 +- .../ValidConnectionCheckerAdapterTest.java | 7 - .../alibaba/druid/bvt/pool/xa/H2XATest.java | 7 +- .../bvt/pool/xa/JtdsXAConnectionTest.java | 12 +- .../druid/bvt/proxy/AllStatisticTest.java | 20 +- .../druid/bvt/proxy/BasicTypeTest.java | 29 +- .../druid/bvt/proxy/BatchReadTest.java | 13 +- .../com/alibaba/druid/bvt/proxy/BlobTest.java | 19 +- .../druid/bvt/proxy/CallStatementTest.java | 36 ++- .../proxy/CallableStatementProxyImplTest.java | 33 +-- .../com/alibaba/druid/bvt/proxy/ClobTest.java | 19 +- .../druid/bvt/proxy/CommonsLogFilterTest.java | 13 +- .../bvt/proxy/ConnectionProxyImplTest.java | 13 +- .../bvt/proxy/ConnectionStatisticTest.java | 7 +- .../druid/bvt/proxy/ConnectionTest.java | 19 +- .../druid/bvt/proxy/CounterFilterTest.java | 19 +- .../alibaba/druid/bvt/proxy/DriverTest.java | 18 +- .../druid/bvt/proxy/DruidDriverTest.java | 13 +- .../alibaba/druid/bvt/proxy/InsertValues.java | 6 +- .../druid/bvt/proxy/InsertValues_1.java | 1 - .../druid/bvt/proxy/InsertValues_2.java | 1 - .../bvt/proxy/JdbcFilterEventAdapterTest.java | 27 +- .../druid/bvt/proxy/JdbcUtilsTest.java | 24 +- .../druid/bvt/proxy/Log4j2FilterTest.java | 18 +- .../druid/bvt/proxy/Log4jFilterTest.java | 12 +- .../druid/bvt/proxy/LogFilterTest.java | 20 +- .../alibaba/druid/bvt/proxy/PrecallTest.java | 26 +- ...edStatementProxyImplGetParametersTest.java | 16 +- .../bvt/proxy/PreparedStatementTest.java | 23 +- .../druid/bvt/proxy/ProxyDriverTest.java | 10 +- .../bvt/proxy/ResultSetProxyImplTest.java | 17 +- .../druid/bvt/proxy/SchemaReadTest.java | 21 +- .../druid/bvt/proxy/SqlStatisticTest.java | 7 +- .../druid/bvt/proxy/StatementTest.java | 13 +- .../druid/bvt/proxy/StatisticTest.java | 6 +- .../alibaba/druid/bvt/proxy/WrapImplTest.java | 17 +- .../druid/bvt/proxy/fake/DruidDriverTest.java | 9 +- .../druid/bvt/proxy/fake/FakeDriverTest.java | 7 +- .../druid/bvt/proxy/filter/ClobTest.java | 18 +- .../bvt/proxy/filter/GlobalStatTest0.java | 22 +- .../bvt/proxy/filter/GlobalStatTest1.java | 20 +- .../bvt/proxy/filter/MergeStatFilterTest.java | 8 +- .../proxy/filter/MergeStatFilterTest2.java | 9 +- .../proxy/filter/MergeStatFilterTest3.java | 13 +- .../filter/MergeStatFilterTest_tddl.java | 18 +- .../filter/MergeStatFilterTest_tddl_1.java | 18 +- .../filter/MergeStatFilterTest_tddl_2.java | 18 +- .../filter/MergeStatFilterTest_tddl_3.java | 18 +- .../filter/MergeStatFilterTest_tddl_4.java | 18 +- .../filter/StatFilterConcurrentTest.java | 12 +- .../bvt/proxy/filter/StatFilterTest.java | 18 +- .../bvt/proxy/filter/StatFilterTest2.java | 9 +- .../bvt/proxy/filter/StatFilterTest3.java | 14 +- .../filter/encoding/CharsetConvertTest.java | 8 +- .../filter/encoding/CharsetParameterTest.java | 6 +- .../bvt/proxy/utils/DruidLoaderUtilsTest.java | 17 +- .../bvt/spring/DruidJdbcExtractorTest.java | 13 +- .../bvt/spring/SpringMethodInfoTest.java | 8 +- .../bvt/spring/SqlMapClientWrapperTest.java | 23 +- .../bvt/spring/SqlMapExecutorWrapperTest.java | 14 +- .../spring/SqlMapExecutorWrapperTest_2.java | 23 +- .../bvt/spring/SqlMapSessionWrapperTest.java | 10 +- .../com/alibaba/druid/bvt/sql/BigOrTest.java | 7 +- .../druid/bvt/sql/CreateCompareTest.java | 5 - .../druid/bvt/sql/CreateCompareTest_1.java | 1 - .../bvt/sql/CreateCompareTest_cycle.java | 3 - .../druid/bvt/sql/CreateDatabaseTest.java | 7 +- .../alibaba/druid/bvt/sql/DistinctTest.java | 1 - .../com/alibaba/druid/bvt/sql/EqualTest2.java | 7 +- .../druid/bvt/sql/EqualTest_OracleDate.java | 5 +- .../sql/EqualTest_OracleTimestampExpr.java | 7 +- .../sql/EqualTest_SQLSelectQueryBlock.java | 5 +- .../druid/bvt/sql/EqualTest_aggreate.java | 7 +- .../bvt/sql/EqualTest_aggreate_over.java | 7 +- .../alibaba/druid/bvt/sql/EqualTest_any.java | 7 +- .../druid/bvt/sql/EqualTest_between.java | 7 +- .../druid/bvt/sql/EqualTest_binary.java | 7 +- .../druid/bvt/sql/EqualTest_binaryOp.java | 7 +- .../druid/bvt/sql/EqualTest_boolean.java | 7 +- .../alibaba/druid/bvt/sql/EqualTest_case.java | 7 +- .../alibaba/druid/bvt/sql/EqualTest_cast.java | 7 +- .../druid/bvt/sql/EqualTest_cursor.java | 7 +- .../druid/bvt/sql/EqualTest_dbLink.java | 5 +- .../druid/bvt/sql/EqualTest_exists.java | 7 +- .../bvt/sql/EqualTest_extract_mysql.java | 5 +- .../bvt/sql/EqualTest_extract_oracle.java | 5 +- .../druid/bvt/sql/EqualTest_groupSet.java | 5 +- .../druid/bvt/sql/EqualTest_inList.java | 7 +- .../druid/bvt/sql/EqualTest_inquery.java | 7 +- .../bvt/sql/EqualTest_inquery_mysql.java | 7 +- .../bvt/sql/EqualTest_inquery_oracle.java | 7 +- .../bvt/sql/EqualTest_interval_mysql.java | 7 +- .../alibaba/druid/bvt/sql/EqualTest_not.java | 7 +- .../druid/bvt/sql/EqualTest_not_2.java | 5 +- .../druid/bvt/sql/EqualTest_number.java | 7 +- .../druid/bvt/sql/EqualTest_orderBy.java | 7 +- .../druid/bvt/sql/EqualTest_query.java | 7 +- .../druid/bvt/sql/EqualTest_select.java | 4 - .../alibaba/druid/bvt/sql/EqualTest_some.java | 7 +- .../druid/bvt/sql/EqualTest_unary.java | 7 +- .../druid/bvt/sql/EqualTest_unary_mysql.java | 7 +- .../bvt/sql/ExportParameterShardingTest.java | 1 - .../druid/bvt/sql/FirstCommentTest.java | 7 +- .../alibaba/druid/bvt/sql/GetParentTest.java | 4 +- .../druid/bvt/sql/GroupingSetsTest.java | 3 - .../com/alibaba/druid/bvt/sql/HashTest_0.java | 15 +- .../bvt/sql/HashTest_1_propertyExpr.java | 26 +- .../alibaba/druid/bvt/sql/MybatisTest.java | 5 +- .../alibaba/druid/bvt/sql/MybatisTest2.java | 4 +- .../com/alibaba/druid/bvt/sql/OverTest.java | 22 +- .../bvt/sql/PagerUtilsTest_Count_MySql_0.java | 10 +- .../sql/PagerUtilsTest_Count_Oracle_0.java | 17 +- .../bvt/sql/PagerUtilsTest_Count_PG_0.java | 12 +- .../sql/PagerUtilsTest_Count_SQLServer_0.java | 11 +- .../sql/PagerUtilsTest_Limit_SQLServer_1.java | 5 +- .../sql/PagerUtilsTest_Limit_SQLServer_2.java | 5 +- .../sql/PagerUtilsTest_Limit_SQLServer_3.java | 9 +- .../sql/PagerUtilsTest_Limit_SQLServer_4.java | 5 +- .../sql/PagerUtilsTest_Limit_SQLServer_5.java | 5 +- .../sql/PagerUtilsTest_Limit_SQLServer_6.java | 1 - .../bvt/sql/PagerUtilsTest_Limit_db2_0.java | 9 +- .../bvt/sql/PagerUtilsTest_Limit_db2_1.java | 5 +- .../bvt/sql/PagerUtilsTest_Limit_h2_0.java | 4 +- .../bvt/sql/PagerUtilsTest_Limit_hive_0.java | 4 +- .../bvt/sql/PagerUtilsTest_Limit_mysql_0.java | 20 +- ...Test_Limit_mysql_question_placeholder.java | 2 - .../sql/PagerUtilsTest_Limit_oracle_0.java | 9 +- .../sql/PagerUtilsTest_Limit_presto_0.java | 2 - .../sql/PagerUtilsTest_hasUnorderedLimit.java | 2 - ...gerUtilsTest_hasUnorderedLimit_oracle.java | 20 +- .../alibaba/druid/bvt/sql/ReplaceTest.java | 2 +- .../bvt/sql/SQLASTVisitorAdapterTest.java | 35 +-- .../bvt/sql/SQLCommentStatementTest.java | 5 +- .../alibaba/druid/bvt/sql/SQLDialectTest.java | 4 +- .../alibaba/druid/bvt/sql/SQLJoinTest.java | 1 - .../druid/bvt/sql/SQLParseExceptionTest.java | 3 +- .../druid/bvt/sql/SQLResourceTest.java | 8 +- .../bvt/sql/SQLSelectQueryBlockTest.java | 8 +- .../com/alibaba/druid/bvt/sql/SchemaTest.java | 3 +- .../alibaba/druid/bvt/sql/TestNewSpout.java | 17 +- .../bvt/sql/athena/AthenaResourceTest.java | 1 - .../bvt/sql/bigquery/BigQueryCommentTest.java | 1 - .../sql/bigquery/BigQueryDataTypeTest.java | 3 +- .../bvt/sql/bigquery/BigQueryNameTest.java | 2 - .../bvt/sql/builder/BuilderDeleteTest.java | 13 +- .../bvt/sql/builder/BuilderSelectTest.java | 5 +- .../bvt/sql/builder/BuilderUpdateTest.java | 9 +- .../bvt/sql/canal/CanalSQLSchemaTest.java | 6 +- .../druid/bvt/sql/clickhouse/CKCloneNpe.java | 4 +- .../bvt/sql/clickhouse/CKResourceTest.java | 1 - .../druid/bvt/sql/clickhouse/CK_select_3.java | 16 +- .../druid/bvt/sql/clickhouse/CK_update_0.java | 19 +- .../bvt/sql/clickhouse/issues/Issue5933.java | 6 +- .../druid/bvt/sql/cobar/DALParserTest.java | 1 - .../druid/bvt/sql/cobar/DDLParserTest.java | 9 +- .../bvt/sql/cobar/DMLCallParserTest.java | 5 +- .../bvt/sql/cobar/DMLDeleteParserTest.java | 31 +-- .../bvt/sql/cobar/DMLInsertParserTest.java | 13 +- .../cobar/DMLInsertParserTest_Special.java | 7 +- .../bvt/sql/cobar/DMLReplaceParserTest.java | 5 +- .../bvt/sql/cobar/DMLSelectParserTest.java | 44 ++- .../bvt/sql/cobar/DMLUpdateParserTest.java | 4 +- .../druid/bvt/sql/cobar/HintsTest.java | 5 +- .../bvt/sql/cobar/LiteralHexadecimalTest.java | 4 +- .../druid/bvt/sql/cobar/MTSParserTest.java | 4 +- .../databricks/DatabricksResourceTest.java | 1 - .../db2/DB2AlterTableTest_1_setNotNull.java | 2 - .../bvt/sql/db2/DB2AlterTableTest_2.java | 2 - .../sql/db2/DB2AlterTableTest_drop_pk.java | 4 - .../bvt/sql/db2/DB2CreateTableTest_01.java | 1 - .../bvt/sql/db2/DB2CreateTableTest_02.java | 2 - .../bvt/sql/db2/DB2CreateTableTest_03.java | 1 - .../bvt/sql/db2/DB2CreateTableTest_04.java | 1 - .../bvt/sql/db2/DB2CreateTableTest_05.java | 1 - .../bvt/sql/db2/DB2DropSequenceTest_0.java | 6 +- .../druid/bvt/sql/db2/DB2InsertTest_0.java | 6 +- .../druid/bvt/sql/db2/DB2InsertTest_1.java | 1 - .../druid/bvt/sql/db2/DB2MergeTest.java | 2 - .../druid/bvt/sql/db2/DB2ResourceTest.java | 2 - .../druid/bvt/sql/db2/DB2ResourceTest2.java | 6 +- .../druid/bvt/sql/db2/DB2SelectTest_0.java | 10 +- .../druid/bvt/sql/db2/DB2SelectTest_1.java | 8 +- .../druid/bvt/sql/db2/DB2SelectTest_10.java | 6 +- .../druid/bvt/sql/db2/DB2SelectTest_11.java | 6 +- .../druid/bvt/sql/db2/DB2SelectTest_12.java | 6 +- .../druid/bvt/sql/db2/DB2SelectTest_13.java | 8 +- .../druid/bvt/sql/db2/DB2SelectTest_14.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_15.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_16.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_17.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_18.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_19.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_2.java | 8 +- .../druid/bvt/sql/db2/DB2SelectTest_20.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_21.java | 7 +- .../druid/bvt/sql/db2/DB2SelectTest_22.java | 6 +- .../druid/bvt/sql/db2/DB2SelectTest_23.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_24.java | 1 - .../bvt/sql/db2/DB2SelectTest_25_concat.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_26.java | 1 - .../sql/db2/DB2SelectTest_27_interval.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_28.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_29.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_3.java | 8 +- .../sql/db2/DB2SelectTest_35_lockRequest.java | 1 - .../druid/bvt/sql/db2/DB2SelectTest_4.java | 8 +- .../druid/bvt/sql/db2/DB2SelectTest_5.java | 32 ++- .../druid/bvt/sql/db2/DB2SelectTest_6.java | 10 +- .../druid/bvt/sql/db2/DB2SelectTest_7.java | 10 +- .../druid/bvt/sql/db2/DB2SelectTest_8.java | 10 +- .../druid/bvt/sql/db2/DB2SelectTest_9.java | 6 +- .../sql/db2/DB2SelectTest_hierarchical_1.java | 3 +- .../druid/bvt/sql/db2/DB2SetTest_0.java | 2 - .../druid/bvt/sql/db2/DB2SetTest_1.java | 1 - .../bvt/sql/db2/DB2SetTest_2_schema.java | 1 - .../druid/bvt/sql/db2/DB2TruncateTest.java | 6 +- .../druid/bvt/sql/db2/DB2TruncateTest2.java | 6 +- .../druid/bvt/sql/db2/DB2TruncateTest3.java | 6 +- .../druid/bvt/sql/db2/DB2TruncateTest4.java | 6 +- .../druid/bvt/sql/db2/DB2TruncateTest5.java | 6 +- .../druid/bvt/sql/db2/DB2Values_Test.java | 1 - .../druid/bvt/sql/derby/DerbySelectTest.java | 1 - .../druid/bvt/sql/eval/EvalAndOrTest.java | 4 +- .../druid/bvt/sql/eval/EvalBetweenTest.java | 5 +- .../druid/bvt/sql/eval/EvalCaseThen.java | 4 +- .../druid/bvt/sql/eval/EvalConcatTest.java | 5 +- .../druid/bvt/sql/eval/EvalInTest.java | 4 +- .../druid/bvt/sql/eval/EvalIsNullTest.java | 4 +- .../druid/bvt/sql/eval/EvalLikeTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodAbsTest.java | 9 +- .../bvt/sql/eval/EvalMethodAcosTest.java | 5 +- .../bvt/sql/eval/EvalMethodAsciiTest.java | 4 +- .../bvt/sql/eval/EvalMethodAsinTest.java | 5 +- .../bvt/sql/eval/EvalMethodAtan2Test.java | 5 +- .../bvt/sql/eval/EvalMethodAtanTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodBinTest.java | 5 +- .../bvt/sql/eval/EvalMethodBitLengthTest.java | 4 +- .../bvt/sql/eval/EvalMethodCeilTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodCosTest.java | 5 +- .../bvt/sql/eval/EvalMethodInstrTest.java | 4 +- .../bvt/sql/eval/EvalMethodLeftTest.java | 4 +- .../bvt/sql/eval/EvalMethodLengthTest.java | 4 +- .../bvt/sql/eval/EvalMethodLog10Test.java | 5 +- .../druid/bvt/sql/eval/EvalMethodLogTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodModTest.java | 4 +- .../druid/bvt/sql/eval/EvalMethodNowTest.java | 8 +- .../druid/bvt/sql/eval/EvalMethodPITest.java | 4 +- .../bvt/sql/eval/EvalMethodPowerTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodRandom.java | 5 +- .../bvt/sql/eval/EvalMethodReverseTest.java | 4 +- .../bvt/sql/eval/EvalMethodRightTest.java | 4 +- .../druid/bvt/sql/eval/EvalMethodSinTest.java | 5 +- .../bvt/sql/eval/EvalMethodSqrtTest.java | 5 +- .../druid/bvt/sql/eval/EvalMethodTanTest.java | 5 +- .../bvt/sql/eval/EvalMethodTest_Char.java | 5 +- .../bvt/sql/eval/EvalMethodTest_Char_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_Elt.java | 5 +- .../bvt/sql/eval/EvalMethodTest_Elt_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_insert.java | 5 +- .../bvt/sql/eval/EvalMethodTest_insert_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_insert_2.java | 5 +- .../bvt/sql/eval/EvalMethodTest_instr.java | 5 +- .../bvt/sql/eval/EvalMethodTest_instr_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_lcase.java | 5 +- .../bvt/sql/eval/EvalMethodTest_left.java | 5 +- .../bvt/sql/eval/EvalMethodTest_len.java | 5 +- .../bvt/sql/eval/EvalMethodTest_locate.java | 5 +- .../bvt/sql/eval/EvalMethodTest_locate_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_locate_2.java | 5 +- .../bvt/sql/eval/EvalMethodTest_lower.java | 5 +- .../bvt/sql/eval/EvalMethodTest_lpad.java | 5 +- .../bvt/sql/eval/EvalMethodTest_lpad_1.java | 5 +- .../bvt/sql/eval/EvalMethodTest_ltrim.java | 5 +- .../bvt/sql/eval/EvalMethodTest_mid.java | 5 +- .../sql/eval/EvalMethodTest_substring.java | 5 +- .../sql/eval/EvalMethodTest_substring_1.java | 5 +- .../sql/eval/EvalMethodTest_substring_2.java | 5 +- .../sql/eval/EvalMethodTest_substring_3.java | 5 +- .../sql/eval/EvalMethodTest_substring_4.java | 5 +- .../bvt/sql/eval/EvalMethodTrimTest.java | 4 +- .../druid/bvt/sql/eval/EvalRlikeTest.java | 4 +- .../druid/bvt/sql/eval/EvalSelectTest.java | 10 +- .../alibaba/druid/bvt/sql/eval/EvalTest.java | 8 +- .../druid/bvt/sql/eval/EvalTest_add.java | 5 +- .../druid/bvt/sql/eval/EvalTest_add_long.java | 5 +- .../bvt/sql/eval/EvalTest_add_short.java | 5 +- .../druid/bvt/sql/eval/EvalTest_div.java | 11 +- .../druid/bvt/sql/eval/EvalTest_gt.java | 11 +- .../druid/bvt/sql/eval/EvalTest_gt_true.java | 11 +- .../druid/bvt/sql/eval/EvalTest_lt.java | 11 +- .../druid/bvt/sql/eval/EvalTest_lt_false.java | 11 +- .../druid/bvt/sql/eval/EvalTest_lteq.java | 11 +- .../bvt/sql/eval/EvalTest_multi_short.java | 5 +- .../alibaba/druid/bvt/sql/eval/LikeTest.java | 5 +- .../bvt/sql/eval/SQLEvalVisitorUtilsTest.java | 6 - .../druid/bvt/sql/h2/H2ResourceTest.java | 2 - .../druid/bvt/sql/h2/H2_AlterTableTest_0.java | 4 +- .../bvt/sql/h2/H2_CreateTableTest_0.java | 4 +- .../bvt/sql/h2/H2_CreateTableTest_1.java | 7 +- .../bvt/sql/h2/H2_CreateTriggerTest_0.java | 4 +- .../druid/bvt/sql/h2/H2_Explain_0.java | 4 +- .../druid/bvt/sql/h2/H2_InsertTest_0.java | 4 +- .../druid/bvt/sql/h2/H2_MergeTest_0.java | 4 +- .../druid/bvt/sql/h2/H2_MergeTest_1.java | 4 +- .../druid/bvt/sql/h2/H2_Select_0_limit.java | 4 +- .../bvt/sql/h2/H2_Select_1_for_update.java | 3 +- .../bvt/sql/h2/H2_Select_1_nulls_first.java | 4 +- .../bvt/sql/hive/HiveCreateDatabase_0.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_0.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_1.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_10.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_11.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_12.java | 4 +- .../sql/hive/HiveCreateTableTest_13_skew.java | 4 +- .../sql/hive/HiveCreateTableTest_14_skew.java | 4 +- .../sql/hive/HiveCreateTableTest_15_pk.java | 4 +- .../sql/hive/HiveCreateTableTest_16_fk.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_17.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_18.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_19.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_2.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_20.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_21.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_22.java | 4 +- .../HiveCreateTableTest_23_temporary.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_24.java | 6 +- .../bvt/sql/hive/HiveCreateTableTest_25.java | 5 +- .../hive/HiveCreateTableTest_26_struct.java | 5 +- .../bvt/sql/hive/HiveCreateTableTest_27.java | 5 +- .../hive/HiveCreateTableTest_28_struct.java | 5 +- .../bvt/sql/hive/HiveCreateTableTest_29.java | 5 +- .../bvt/sql/hive/HiveCreateTableTest_3.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_30.java | 12 +- ...veCreateTableTest_31_mappedBy_for_dla.java | 5 +- .../HiveCreateTableTest_32_properties.java | 8 +- .../hive/HiveCreateTableTest_33_struct.java | 5 +- .../bvt/sql/hive/HiveCreateTableTest_34.java | 5 +- .../sql/hive/HiveCreateTableTest_35_dla.java | 5 +- .../sql/hive/HiveCreateTableTest_36_dla.java | 5 +- .../sql/hive/HiveCreateTableTest_37_dla.java | 5 +- .../sql/hive/HiveCreateTableTest_38_dla.java | 3 - .../sql/hive/HiveCreateTableTest_39_dla.java | 2 - .../bvt/sql/hive/HiveCreateTableTest_4.java | 4 +- .../sql/hive/HiveCreateTableTest_40_dla.java | 2 - .../bvt/sql/hive/HiveCreateTableTest_41.java | 2 - .../bvt/sql/hive/HiveCreateTableTest_42.java | 2 - .../bvt/sql/hive/HiveCreateTableTest_43.java | 2 - .../sql/hive/HiveCreateTableTest_43_dla.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_44.java | 1 - .../sql/hive/HiveCreateTableTest_45_dla.java | 1 - .../sql/hive/HiveCreateTableTest_46_dla.java | 1 - .../sql/hive/HiveCreateTableTest_47_dla.java | 1 - .../sql/hive/HiveCreateTableTest_49_dla.java | 1 - .../bvt/sql/hive/HiveCreateTableTest_5.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_6.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_7.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_8.java | 4 +- .../bvt/sql/hive/HiveCreateTableTest_9.java | 4 +- .../druid/bvt/sql/hive/HiveInsert_0.java | 3 +- .../druid/bvt/sql/hive/HiveInsert_1.java | 3 +- .../druid/bvt/sql/hive/HiveInsert_3.java | 3 +- .../druid/bvt/sql/hive/HiveKeywordsTest.java | 4 - .../druid/bvt/sql/hive/HiveResourceTest.java | 1 - .../druid/bvt/sql/hive/HiveSelectTest_0.java | 4 +- .../bvt/sql/hive/HiveSelectTest_1_limit.java | 2 +- .../hive/HiveSelectTest_2_lateralview.java | 2 +- .../bvt/sql/hive/HiveSelectTest_2_true.java | 3 +- .../bvt/sql/hive/HiveSelectTest_3_array.java | 3 +- .../bvt/sql/hive/HiveSelectTest_42_cte.java | 1 - .../hive/HiveSelectTest_44_issue_3973.java | 2 - .../hive/HiveSelectTest_45_issue_3987.java | 1 - .../druid/bvt/sql/hive/HiveSelectTest_47.java | 1 - .../druid/bvt/sql/hive/HiveSelectTest_48.java | 2 - .../bvt/sql/hive/HiveSelectTest_4_array.java | 3 +- .../druid/bvt/sql/hive/HiveSetTest_1.java | 11 +- .../druid/bvt/sql/hive/issues/Issue5430.java | 11 +- .../druid/bvt/sql/hive/issues/Issue5853.java | 7 +- .../druid/bvt/sql/hive/issues/Issue5901.java | 14 +- .../druid/bvt/sql/hive/issues/Issue5968.java | 8 +- .../bvt/sql/hologres/HoloKeywordsTest.java | 1 - .../bvt/sql/hologres/HoloResourceTest.java | 1 - .../bvt/sql/impala/ImpalaResourceTest.java | 1 - .../bvt/sql/informix/InformixSelectTest.java | 3 - .../druid/bvt/sql/mysql/AdsDumpTest_0.java | 4 +- .../druid/bvt/sql/mysql/AntlrMySqlTest.java | 2 +- .../druid/bvt/sql/mysql/CobarHintsTest.java | 3 - .../ComparisonFunctionsAndOperatorsTest.java | 11 +- .../sql/mysql/ControlFlowFunctionsTest.java | 11 +- .../druid/bvt/sql/mysql/CreateUserTest.java | 8 +- .../sql/mysql/DateAndTimeFunctionsTest.java | 12 +- .../bvt/sql/mysql/DateAndTimeValuesTest.java | 11 +- .../druid/bvt/sql/mysql/DeleteSyntaxTest.java | 12 +- .../druid/bvt/sql/mysql/DropTableTest.java | 8 +- .../druid/bvt/sql/mysql/DropUserTest.java | 8 +- ...EncryptionAndCompressionFunctionsTest.java | 8 +- ...ullTextSearchesWithQueryExpansionTest.java | 16 +- .../alibaba/druid/bvt/sql/mysql/HelpTest.java | 6 +- .../bvt/sql/mysql/HexadecimalValuesTest.java | 11 +- .../druid/bvt/sql/mysql/IdentifierTest.java | 8 +- .../sql/mysql/InformationFunctionsTest.java | 11 +- .../druid/bvt/sql/mysql/InsertSyntaxTest.java | 26 +- .../druid/bvt/sql/mysql/Kill_Test.java | 8 +- .../bvt/sql/mysql/LOAD_XML_Syntax_Test.java | 13 +- .../sql/mysql/LoadDataInFileSyntaxTest.java | 11 +- .../bvt/sql/mysql/LogicalOperatorsTest.java | 4 - .../sql/mysql/MathematicalFunctionsTest.java | 11 +- .../sql/mysql/MiscellaneousFunctionsTest.java | 11 +- .../druid/bvt/sql/mysql/MySql57Test.java | 12 +- .../sql/mysql/MySqlASTVisitorAdapterTest.java | 7 +- .../bvt/sql/mysql/MySqlAnalyzeTest_1.java | 6 +- .../druid/bvt/sql/mysql/MySqlBeginTest.java | 9 +- .../bvt/sql/mysql/MySqlChecksumTableTest.java | 1 - .../bvt/sql/mysql/MySqlDeleteTest_0.java | 6 +- .../bvt/sql/mysql/MySqlDeleteTest_1.java | 6 +- .../bvt/sql/mysql/MySqlDeleteTest_2.java | 6 +- .../bvt/sql/mysql/MySqlDeleteTest_3.java | 8 +- .../MySqlDeleteTest_4_force_partition.java | 1 - .../MySqlDeleteTest_5_force_partition.java | 1 - .../bvt/sql/mysql/MySqlDeleteTest_6.java | 1 - .../bvt/sql/mysql/MySqlDeleteTest_7.java | 10 +- .../druid/bvt/sql/mysql/MySqlDescTest_0.java | 6 +- .../bvt/sql/mysql/MySqlDescribteTest.java | 6 +- .../druid/bvt/sql/mysql/MySqlDumpTest_1.java | 1 - .../druid/bvt/sql/mysql/MySqlError_test.java | 5 +- .../bvt/sql/mysql/MySqlError_test_1.java | 2 - .../bvt/sql/mysql/MySqlError_test_3.java | 9 +- .../druid/bvt/sql/mysql/MySqlExplainTest.java | 2 - .../bvt/sql/mysql/MySqlExplainTest_0.java | 6 +- .../bvt/sql/mysql/MySqlExplainTest_1.java | 1 - .../druid/bvt/sql/mysql/MySqlFormatTest.java | 12 +- .../druid/bvt/sql/mysql/MySqlFormatTest2.java | 4 +- .../druid/bvt/sql/mysql/MySqlFormatTest3.java | 1 - .../druid/bvt/sql/mysql/MySqlFormatTest4.java | 15 +- .../druid/bvt/sql/mysql/MySqlHelpTest_0.java | 6 +- .../bvt/sql/mysql/MySqlHintStatementTest.java | 4 +- .../bvt/sql/mysql/MySqlOptimizeTest_1.java | 6 +- .../bvt/sql/mysql/MySqlOrderingExprTest.java | 3 - .../bvt/sql/mysql/MySqlRepCheckTest.java | 4 +- .../druid/bvt/sql/mysql/MySqlRepTest.java | 1 - .../druid/bvt/sql/mysql/MySqlReplaceTest.java | 3 - .../bvt/sql/mysql/MySqlResourceTest.java | 1 - .../druid/bvt/sql/mysql/MySqlRevokeTest.java | 3 - .../bvt/sql/mysql/MySqlSetPasswordTest.java | 6 +- .../druid/bvt/sql/mysql/MySqlSetTest_0.java | 6 +- .../druid/bvt/sql/mysql/MySqlSetTest_1.java | 7 +- .../druid/bvt/sql/mysql/MySqlSetTest_2.java | 1 - .../druid/bvt/sql/mysql/MySqlSetTest_3.java | 1 - .../bvt/sql/mysql/MySqlTruncateTest_1.java | 4 - .../mysql/MySqlUpdateStatementLimitTest.java | 5 +- .../druid/bvt/sql/mysql/MySqlUseTest_0.java | 6 +- .../druid/bvt/sql/mysql/MysqlCheckTest.java | 24 +- .../druid/bvt/sql/mysql/NumberTest.java | 13 +- .../bvt/sql/mysql/REPLACE_Syntax_Test.java | 12 +- .../bvt/sql/mysql/RegularExpressionsTest.java | 8 +- .../druid/bvt/sql/mysql/Reset_Test.java | 9 +- .../bvt/sql/mysql/SELECT_Syntax_Test.java | 26 +- .../sql/mysql/SHOW_COLUMNS_Syntax_Test.java | 11 +- .../sql/mysql/SHOW_DATABASES_Syntax_Test.java | 11 +- .../sql/mysql/SHOW_STATUS_Syntax_Test.java | 9 +- .../sql/mysql/SHOW_TABLES_Syntax_Test.java | 14 +- .../sql/mysql/SHOW_WARNINGS_Syntax_Test.java | 12 +- .../druid/bvt/sql/mysql/SQLSelectTest.java | 7 +- .../bvt/sql/mysql/SQLUtilsAddColumnTest.java | 12 +- .../sql/mysql/SQLUtilsAddConditionTest.java | 27 +- .../mysql/SQLUtilsAddConditionTest_mysql.java | 29 +- .../SQLUtilsAddConditionTest_oracle.java | 23 +- .../mysql/SQLUtilsAddConditionTest_pg.java | 23 +- .../SQLUtilsAddConditionTest_sqlserver.java | 28 +- .../druid/bvt/sql/mysql/SQLUtilsTest.java | 20 +- .../bvt/sql/mysql/START_TRANSACTION_Test.java | 11 +- .../mysql/StringComparisonFunctionsTest.java | 1 - .../bvt/sql/mysql/StringFunctionsTest.java | 11 +- .../druid/bvt/sql/mysql/StringTest.java | 11 +- .../druid/bvt/sql/mysql/TiDBBeginTest.java | 9 +- .../druid/bvt/sql/mysql/XMLFunctionsTest.java | 11 +- .../MySqlAlterMaterializedViewTest_0.java | 3 - .../alter/MySqlAlterTableGroupTest_0.java | 1 - .../alter/MySqlAlterTable_refactor_test.java | 4 +- .../sql/mysql/alter/MySqlAlterUserTest.java | 1 - .../sql/mysql/alter/MySqlAlterViewTest_0.java | 1 - .../alterTable/MySqlAlterTableAddIndex_0.java | 8 +- .../alterTable/MySqlAlterTableAddIndex_1.java | 6 +- .../MySqlAlterTableAddIndex_10.java | 2 - .../MySqlAlterTableAddIndex_11.java | 2 - .../alterTable/MySqlAlterTableAddIndex_2.java | 2 - .../alterTable/MySqlAlterTableAddIndex_3.java | 2 - .../alterTable/MySqlAlterTableAddIndex_4.java | 2 - .../alterTable/MySqlAlterTableAddIndex_5.java | 6 +- .../alterTable/MySqlAlterTableAddIndex_6.java | 6 +- .../alterTable/MySqlAlterTableAddIndex_7.java | 6 +- .../alterTable/MySqlAlterTableAddIndex_8.java | 2 - .../alterTable/MySqlAlterTableAddIndex_9.java | 2 - .../MySqlAlterTableAddPrimaryKey.java | 10 +- .../MySqlAlterTableAddPrimaryKey_1.java | 6 +- .../MySqlAlterTableAddUniqueTest.java | 2 - ...lAlterTableAlterColumnDropDefaultTest.java | 6 +- ...qlAlterTableAlterColumnSetDefaultTest.java | 6 +- .../MySqlAlterTableAlterColumnTest.java | 1 - .../MySqlAlterTableDisableKeys.java | 6 +- .../MySqlAlterTableDropIndex_0.java | 5 +- .../MySqlAlterTableDropIndex_1.java | 9 +- .../alterTable/MySqlAlterTableDropKey.java | 6 +- .../MySqlAlterTableDropPrimaryKey.java | 6 +- .../alterTable/MySqlAlterTableDrop_Test.java | 6 +- .../MySqlAlterTableDrop_Test_1.java | 2 - .../MySqlAlterTableDrop_Test_2.java | 2 - .../alterTable/MySqlAlterTableEnableKeys.java | 6 +- .../mysql/alterTable/MySqlAlterTableTest.java | 6 +- .../alterTable/MySqlAlterTableTest1.java | 2 - .../alterTable/MySqlAlterTableTest10.java | 4 +- .../alterTable/MySqlAlterTableTest11.java | 2 - .../alterTable/MySqlAlterTableTest12.java | 4 +- .../alterTable/MySqlAlterTableTest13.java | 4 +- .../alterTable/MySqlAlterTableTest14.java | 4 +- .../alterTable/MySqlAlterTableTest15.java | 4 +- .../alterTable/MySqlAlterTableTest16.java | 4 +- .../alterTable/MySqlAlterTableTest17.java | 4 +- .../alterTable/MySqlAlterTableTest18.java | 1 - .../alterTable/MySqlAlterTableTest19.java | 1 - .../alterTable/MySqlAlterTableTest2.java | 6 +- .../alterTable/MySqlAlterTableTest20.java | 1 - .../alterTable/MySqlAlterTableTest21.java | 1 - .../alterTable/MySqlAlterTableTest22.java | 3 +- .../alterTable/MySqlAlterTableTest23.java | 1 - .../alterTable/MySqlAlterTableTest24.java | 1 - .../alterTable/MySqlAlterTableTest25.java | 1 - .../alterTable/MySqlAlterTableTest26.java | 1 - .../alterTable/MySqlAlterTableTest27.java | 1 - .../alterTable/MySqlAlterTableTest28.java | 1 - .../alterTable/MySqlAlterTableTest29.java | 1 - .../alterTable/MySqlAlterTableTest3.java | 6 +- .../alterTable/MySqlAlterTableTest30.java | 1 - .../MySqlAlterTableTest31_renameIndex.java | 1 - .../alterTable/MySqlAlterTableTest32.java | 1 - .../MySqlAlterTableTest34_renameIndex.java | 1 - .../MySqlAlterTableTest35_multi.java | 2 - .../alterTable/MySqlAlterTableTest4.java | 4 +- .../alterTable/MySqlAlterTableTest43.java | 1 - .../alterTable/MySqlAlterTableTest44.java | 1 - .../MySqlAlterTableTest46_add_column.java | 1 - .../alterTable/MySqlAlterTableTest47.java | 1 - .../alterTable/MySqlAlterTableTest48.java | 1 - .../alterTable/MySqlAlterTableTest49.java | 1 - .../alterTable/MySqlAlterTableTest5.java | 4 +- .../alterTable/MySqlAlterTableTest50.java | 1 - .../MySqlAlterTableTest51_table_options.java | 4 - ...qlAlterTableTest52_primary_prefix_key.java | 3 - .../alterTable/MySqlAlterTableTest6.java | 4 +- .../alterTable/MySqlAlterTableTest7.java | 4 +- .../alterTable/MySqlAlterTableTest8.java | 4 +- .../alterTable/MySqlAlterTableTest9.java | 6 +- .../MySqlAlterTableTest_40_change.java | 3 - .../alterTable/MySqlAlterTableTest_addFk.java | 11 +- .../MySqlAlterTableTest_drop_constraint.java | 6 +- .../MySQLCreateMaterializedViewTest0.java | 2 +- .../MySQLCreateMaterializedViewTest1.java | 2 +- .../MySQLCreateMaterializedViewTest2.java | 2 +- .../MySQLCreateMaterializedViewTest3.java | 2 +- .../MySQLCreateMaterializedViewTest4.java | 2 +- .../MySQLCreateMaterializedViewTest5.java | 2 +- .../MySQLCreateMaterializedViewTest6.java | 2 - .../MySQLCreateMaterializedViewTest7.java | 3 - ...ewTest8_distributed_by_with_duplicate.java | 2 +- .../MySQLCreateMaterializedViewTest_fail.java | 2 - .../MySqlCreateAddLogFileGroupTest.java | 1 - .../mysql/create/MySqlCreateDatabaseTest.java | 1 - .../create/MySqlCreateDatabaseTest2.java | 1 - .../create/MySqlCreateDatabaseTest3.java | 1 - .../create/MySqlCreateDatabaseTest4.java | 1 - .../create/MySqlCreateDatabaseTest5.java | 1 - .../create/MySqlCreateDatabaseTest8_drds.java | 1 - .../MySqlCreateDatabaseTest9_issue_3975.java | 2 +- .../mysql/create/MySqlCreateEventTest.java | 1 - .../mysql/create/MySqlCreateEventTest1.java | 1 - .../MySqlCreateExternalCatalogTest1.java | 1 - .../MySqlCreateExternalCatalogTest2.java | 1 - .../MySqlCreateFullTextAnalyzerTest.java | 1 - .../MySqlCreateFullTextCharFilterTest.java | 1 - .../create/MySqlCreateFullTextDictTest.java | 1 - .../MySqlCreateFullTextTokenFilterTest.java | 1 - .../MySqlCreateFullTextTokenizeTest.java | 1 - .../create/MySqlCreateFunctionTest_1.java | 8 +- .../mysql/create/MySqlCreateIndex2Test.java | 1 - .../mysql/create/MySqlCreateIndexTest.java | 1 - .../mysql/create/MySqlCreateIndexTest_1.java | 1 - .../create/MySqlCreateIndexTest_11_adb.java | 1 - .../mysql/create/MySqlCreateIndexTest_3.java | 1 - .../mysql/create/MySqlCreateIndexTest_4.java | 1 - .../create/MySqlCreateProcedureTest.java | 13 +- .../create/MySqlCreateProcedureTest1.java | 13 +- .../create/MySqlCreateProcedureTest10.java | 11 +- .../create/MySqlCreateProcedureTest11.java | 13 +- .../create/MySqlCreateProcedureTest12.java | 11 +- .../create/MySqlCreateProcedureTest13.java | 12 +- .../create/MySqlCreateProcedureTest14.java | 8 +- .../create/MySqlCreateProcedureTest15.java | 9 - .../create/MySqlCreateProcedureTest16.java | 1 - .../create/MySqlCreateProcedureTest2.java | 29 +- .../create/MySqlCreateProcedureTest3.java | 33 ++- .../create/MySqlCreateProcedureTest4.java | 24 +- .../create/MySqlCreateProcedureTest5.java | 16 +- .../create/MySqlCreateProcedureTest6.java | 29 +- .../create/MySqlCreateProcedureTest7.java | 7 - .../create/MySqlCreateProcedureTest8.java | 48 +--- .../create/MySqlCreateProcedureTest9.java | 36 ++- .../create/MySqlCreateResourceGroupTest.java | 2 - .../MySqlCreateResourceGroupTest_hive.java | 2 - .../mysql/create/MySqlCreateSequenceTest.java | 1 - .../create/MySqlCreateSequenceTest1.java | 10 +- .../create/MySqlCreateSequenceTest3.java | 1 - .../mysql/create/MySqlCreateServerTest.java | 1 - .../create/MySqlCreateTableSpaceTest.java | 1 - .../create/MySqlCreateTableUnitTest.java | 1 - .../MySqlCreateTable_refactor_test.java | 2 - ...eateTable_showColumns_repository_test.java | 118 ++++---- .../MySqlCreateTable_showColumns_test.java | 2 - .../MySqlCreateTable_storage_type_test.java | 1 - .../mysql/create/MySqlCreateTriggerTest.java | 2 - .../mysql/create/MySqlCreateTriggerTest2.java | 2 - .../mysql/create/MySqlCreateTriggerTest3.java | 1 - .../mysql/create/MySqlCreateTriggerTest4.java | 1 - .../mysql/create/MySqlCreateTriggerTest5.java | 1 - .../mysql/create/MySqlCreateUserTest_1.java | 1 - .../mysql/create/MySqlCreateUserTest_2.java | 1 - .../mysql/create/MySqlCreateUserTest_3.java | 1 - .../mysql/create/MySqlCreateUserTest_4.java | 1 - .../mysql/create/MySqlCreateUserTest_5.java | 3 - .../mysql/create/MySqlCreateUserTest_6.java | 4 - .../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 | 3 +- .../createTable/MySqlCeateTableTest34.java | 3 +- .../createTable/MySqlCreateTableTest.java | 5 - .../createTable/MySqlCreateTableTest1.java | 5 +- .../createTable/MySqlCreateTableTest10.java | 15 +- .../createTable/MySqlCreateTableTest100.java | 3 +- .../MySqlCreateTableTest101_geometry.java | 2 +- .../createTable/MySqlCreateTableTest102.java | 2 +- .../createTable/MySqlCreateTableTest103.java | 2 +- .../createTable/MySqlCreateTableTest104.java | 2 +- .../createTable/MySqlCreateTableTest105.java | 2 +- .../createTable/MySqlCreateTableTest106.java | 2 +- .../createTable/MySqlCreateTableTest107.java | 2 +- .../MySqlCreateTableTest108_drds.java | 4 +- .../MySqlCreateTableTest108_error.java | 5 +- .../createTable/MySqlCreateTableTest11.java | 13 +- .../MySqlCreateTableTest110_drds.java | 3 +- .../MySqlCreateTableTest111_ann.java | 2 +- .../createTable/MySqlCreateTableTest112.java | 3 +- .../MySqlCreateTableTest113_drds.java | 2 +- .../createTable/MySqlCreateTableTest114.java | 3 +- .../createTable/MySqlCreateTableTest115.java | 3 +- .../createTable/MySqlCreateTableTest116.java | 15 +- .../createTable/MySqlCreateTableTest117.java | 18 +- .../createTable/MySqlCreateTableTest118.java | 7 +- .../MySqlCreateTableTest119_ann.java | 3 +- .../createTable/MySqlCreateTableTest12.java | 1 - .../createTable/MySqlCreateTableTest120.java | 11 +- .../MySqlCreateTableTest121_fulltext.java | 3 +- .../MySqlCreateTableTest122_ads.java | 6 +- .../MySqlCreateTableTest125_drds.java | 13 +- .../createTable/MySqlCreateTableTest126.java | 6 +- .../MySqlCreateTableTest126_drds.java | 6 +- .../MySqlCreateTableTest127_ads_ann.java | 6 +- .../MySqlCreateTableTest128_quote.java | 6 +- .../MySqlCreateTableTest129_ads.java | 17 +- .../createTable/MySqlCreateTableTest13.java | 21 +- .../MySqlCreateTableTest130_ads.java | 7 +- .../MySqlCreateTableTest131_drds.java | 5 +- ...SqlCreateTableTest132_drds_primaryKey.java | 7 +- .../MySqlCreateTableTest133_drds_gsi.java | 13 +- .../createTable/MySqlCreateTableTest134.java | 6 +- .../createTable/MySqlCreateTableTest135.java | 3 - .../MySqlCreateTableTest135_isString.java | 5 +- .../createTable/MySqlCreateTableTest136.java | 6 +- .../createTable/MySqlCreateTableTest137.java | 8 +- .../createTable/MySqlCreateTableTest138.java | 8 +- .../createTable/MySqlCreateTableTest139.java | 6 +- .../createTable/MySqlCreateTableTest14.java | 17 +- .../createTable/MySqlCreateTableTest140.java | 6 +- .../createTable/MySqlCreateTableTest141.java | 6 +- .../createTable/MySqlCreateTableTest142.java | 6 +- .../MySqlCreateTableTest143_position.java | 3 - ...ySqlCreateTableTest144_three_backtick.java | 4 - .../MySqlCreateTableTest145_tail_hint.java | 3 - .../MySqlCreateTableTest146_col_def.java | 1 - .../MySqlCreateTableTest147_fulltext.java | 1 - .../MySqlCreateTableTest147_fulltext2.java | 1 - .../MySqlCreateTableTest147_fulltext3.java | 1 - ...MySqlCreateTableTest148_national_char.java | 1 - ...TableTest149_collate_before_generated.java | 1 - .../createTable/MySqlCreateTableTest15.java | 25 +- ...ateTableTest150_eunm_set_with_charset.java | 1 - ...qlCreateTableTest151_double_precision.java | 1 - ...MySqlCreateTableTest152_table_options.java | 1 - .../MySqlCreateTableTest153_collate.java | 6 +- .../MySqlCreateTableTest154_hint.java | 6 +- .../createTable/MySqlCreateTableTest155.java | 5 +- .../MySqlCreateTableTest156_ob.java | 2 +- .../MySqlCreateTableTest157_shadow.java | 2 +- .../MySqlCreateTableTest158_asselect.java | 3 +- .../createTable/MySqlCreateTableTest159.java | 4 +- .../createTable/MySqlCreateTableTest16.java | 25 +- .../createTable/MySqlCreateTableTest160.java | 3 +- ...ySqlCreateTableTest161_storage_policy.java | 3 +- ...Test162_distributed_by_with_duplicate.java | 5 +- .../createTable/MySqlCreateTableTest17.java | 5 +- .../createTable/MySqlCreateTableTest18.java | 41 ++- .../createTable/MySqlCreateTableTest19.java | 2 - .../createTable/MySqlCreateTableTest2.java | 1 - .../createTable/MySqlCreateTableTest20.java | 2 - .../createTable/MySqlCreateTableTest21.java | 2 - .../createTable/MySqlCreateTableTest22.java | 14 +- .../createTable/MySqlCreateTableTest23.java | 14 +- .../createTable/MySqlCreateTableTest24.java | 14 +- .../createTable/MySqlCreateTableTest25.java | 14 +- .../createTable/MySqlCreateTableTest26.java | 14 +- .../createTable/MySqlCreateTableTest27.java | 14 +- .../createTable/MySqlCreateTableTest28.java | 14 +- .../createTable/MySqlCreateTableTest29.java | 14 +- .../createTable/MySqlCreateTableTest3.java | 1 - .../createTable/MySqlCreateTableTest30.java | 14 +- .../createTable/MySqlCreateTableTest31.java | 14 +- .../createTable/MySqlCreateTableTest32.java | 14 +- .../createTable/MySqlCreateTableTest33.java | 14 +- .../createTable/MySqlCreateTableTest34.java | 14 +- .../createTable/MySqlCreateTableTest35.java | 14 +- .../createTable/MySqlCreateTableTest36.java | 14 +- .../createTable/MySqlCreateTableTest37.java | 14 +- .../createTable/MySqlCreateTableTest38.java | 14 +- .../createTable/MySqlCreateTableTest39.java | 14 +- .../createTable/MySqlCreateTableTest4.java | 13 +- .../createTable/MySqlCreateTableTest40.java | 12 +- .../createTable/MySqlCreateTableTest41.java | 16 +- .../createTable/MySqlCreateTableTest42.java | 22 +- .../createTable/MySqlCreateTableTest43.java | 22 +- .../createTable/MySqlCreateTableTest44.java | 22 +- .../createTable/MySqlCreateTableTest45.java | 34 ++- .../createTable/MySqlCreateTableTest46.java | 14 +- .../createTable/MySqlCreateTableTest47.java | 14 +- .../createTable/MySqlCreateTableTest48.java | 8 +- .../createTable/MySqlCreateTableTest49.java | 10 +- .../createTable/MySqlCreateTableTest5.java | 11 +- .../createTable/MySqlCreateTableTest50.java | 10 +- .../createTable/MySqlCreateTableTest51.java | 10 +- .../createTable/MySqlCreateTableTest52.java | 3 +- .../createTable/MySqlCreateTableTest53.java | 7 +- .../createTable/MySqlCreateTableTest54.java | 3 - .../createTable/MySqlCreateTableTest55.java | 8 +- .../createTable/MySqlCreateTableTest56.java | 13 +- .../createTable/MySqlCreateTableTest57.java | 3 - .../createTable/MySqlCreateTableTest58.java | 97 ++++--- .../createTable/MySqlCreateTableTest59.java | 8 +- .../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 | 1 - .../createTable/MySqlCreateTableTest67.java | 1 - .../createTable/MySqlCreateTableTest68.java | 1 - .../createTable/MySqlCreateTableTest69.java | 1 - .../createTable/MySqlCreateTableTest7.java | 15 +- .../createTable/MySqlCreateTableTest70.java | 1 - .../createTable/MySqlCreateTableTest71.java | 7 +- .../createTable/MySqlCreateTableTest72.java | 1 - .../createTable/MySqlCreateTableTest73.java | 1 - .../createTable/MySqlCreateTableTest74.java | 1 - .../createTable/MySqlCreateTableTest75.java | 1 - .../createTable/MySqlCreateTableTest76.java | 1 - .../createTable/MySqlCreateTableTest8.java | 17 +- .../createTable/MySqlCreateTableTest84.java | 4 +- .../createTable/MySqlCreateTableTest9.java | 7 +- .../createTable/MySqlCreateTableTest91.java | 17 +- .../createTable/MySqlCreateTableTest92.java | 4 +- .../createTable/MySqlCreateTableTest93.java | 3 +- .../createTable/MySqlCreateTableTest94.java | 2 +- .../createTable/MySqlCreateTableTest95.java | 2 +- .../MySqlCreateTableTest96_set.java | 2 +- .../createTable/MySqlCreateTableTest97.java | 2 +- .../MySqlCreateTableTest98_keyword.java | 8 +- .../createTable/MySqlCreateTableTest99.java | 2 +- .../MySql_Create_Function_0.java | 1 - .../MySql_Create_Function_1.java | 1 - .../sql/mysql/drop/MySqlDropDatabaseTest.java | 6 +- .../mysql/drop/MySqlDropDatabaseTest2.java | 1 - .../sql/mysql/drop/MySqlDropFunctionTest.java | 6 +- .../sql/mysql/drop/MySqlDropIndexTest.java | 7 +- .../sql/mysql/drop/MySqlDropIndexTest1.java | 2 - .../sql/mysql/drop/MySqlDropIndexTest2.java | 2 - .../mysql/drop/MySqlDropProcedureTest.java | 6 +- .../sql/mysql/drop/MySqlDropTableTest.java | 6 +- .../drop/MySqlDropTableTest_1_hints.java | 1 - .../sql/mysql/drop/MySqlDropTablespace.java | 4 - .../mysql/drop/MySqlDropTablespaceTest.java | 6 +- .../sql/mysql/drop/MySqlDropTriggerTest.java | 1 - .../bvt/sql/mysql/drop/MySqlDropUserTest.java | 6 +- .../bvt/sql/mysql/drop/MySqlDropViewTest.java | 7 +- .../bvt/sql/mysql/grant/MySqlGrantTest.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_1.java | 1 - .../sql/mysql/grant/MySqlGrantTest_10.java | 1 - .../sql/mysql/grant/MySqlGrantTest_11.java | 1 - .../sql/mysql/grant/MySqlGrantTest_13.java | 1 - .../sql/mysql/grant/MySqlGrantTest_14.java | 1 - .../sql/mysql/grant/MySqlGrantTest_15.java | 1 - .../sql/mysql/grant/MySqlGrantTest_16.java | 1 - .../sql/mysql/grant/MySqlGrantTest_17.java | 1 - .../sql/mysql/grant/MySqlGrantTest_18.java | 1 - .../sql/mysql/grant/MySqlGrantTest_19.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_2.java | 1 - .../sql/mysql/grant/MySqlGrantTest_20.java | 1 - .../sql/mysql/grant/MySqlGrantTest_21.java | 3 +- .../sql/mysql/grant/MySqlGrantTest_22.java | 3 +- .../sql/mysql/grant/MySqlGrantTest_23.java | 1 - .../sql/mysql/grant/MySqlGrantTest_24.java | 1 - .../sql/mysql/grant/MySqlGrantTest_25.java | 1 - .../sql/mysql/grant/MySqlGrantTest_26.java | 3 - .../sql/mysql/grant/MySqlGrantTest_27.java | 1 - .../sql/mysql/grant/MySqlGrantTest_28.java | 1 - .../sql/mysql/grant/MySqlGrantTest_29.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_3.java | 1 - .../sql/mysql/grant/MySqlGrantTest_30.java | 1 - .../sql/mysql/grant/MySqlGrantTest_31.java | 1 - .../sql/mysql/grant/MySqlGrantTest_32.java | 1 - .../sql/mysql/grant/MySqlGrantTest_33.java | 1 - .../sql/mysql/grant/MySqlGrantTest_34.java | 1 - .../sql/mysql/grant/MySqlGrantTest_35.java | 1 - .../sql/mysql/grant/MySqlGrantTest_36.java | 1 - .../sql/mysql/grant/MySqlGrantTest_37.java | 2 - .../bvt/sql/mysql/grant/MySqlGrantTest_4.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_5.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_6.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_7.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_8.java | 1 - .../bvt/sql/mysql/grant/MySqlGrantTest_9.java | 1 - .../sql/mysql/grant/MySqlGrantTest_ads.java | 3 - .../mysql/grant/MySqlRevokeTest_ads_1.java | 2 - .../sql/mysql/insert/MySqlInsertTest_0.java | 40 ++- .../sql/mysql/insert/MySqlInsertTest_1.java | 8 +- .../sql/mysql/insert/MySqlInsertTest_10.java | 6 +- .../sql/mysql/insert/MySqlInsertTest_11.java | 7 +- .../sql/mysql/insert/MySqlInsertTest_12.java | 7 +- .../sql/mysql/insert/MySqlInsertTest_13.java | 2 - .../sql/mysql/insert/MySqlInsertTest_14.java | 2 - .../sql/mysql/insert/MySqlInsertTest_15.java | 2 - .../mysql/insert/MySqlInsertTest_16_hint.java | 2 - .../sql/mysql/insert/MySqlInsertTest_17.java | 2 - .../insert/MySqlInsertTest_18_alias.java | 2 - .../sql/mysql/insert/MySqlInsertTest_2.java | 8 +- .../mysql/insert/MySqlInsertTest_25_time.java | 2 - .../insert/MySqlInsertTest_26_special.java | 5 - .../sql/mysql/insert/MySqlInsertTest_3.java | 8 +- .../sql/mysql/insert/MySqlInsertTest_36.java | 3 - .../sql/mysql/insert/MySqlInsertTest_4.java | 8 +- .../sql/mysql/insert/MySqlInsertTest_43.java | 4 - .../sql/mysql/insert/MySqlInsertTest_5.java | 10 +- .../sql/mysql/insert/MySqlInsertTest_6.java | 27 +- .../sql/mysql/insert/MySqlInsertTest_7.java | 12 +- .../sql/mysql/insert/MySqlInsertTest_8.java | 14 +- .../sql/mysql/insert/MySqlInsertTest_9.java | 6 +- .../insert/UseInsertColumnsCacheTest.java | 6 +- .../druid/bvt/sql/mysql/issues/Issue3775.java | 5 +- .../druid/bvt/sql/mysql/issues/Issue4444.java | 6 - .../druid/bvt/sql/mysql/issues/Issue4454.java | 5 +- .../druid/bvt/sql/mysql/issues/Issue5219.java | 8 +- .../druid/bvt/sql/mysql/issues/Issue5260.java | 6 +- .../druid/bvt/sql/mysql/issues/Issue5362.java | 9 - .../druid/bvt/sql/mysql/issues/Issue5381.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5421.java | 10 +- .../druid/bvt/sql/mysql/issues/Issue5498.java | 11 - .../druid/bvt/sql/mysql/issues/Issue5642.java | 1 - .../druid/bvt/sql/mysql/issues/Issue5650.java | 2 - .../druid/bvt/sql/mysql/issues/Issue5686.java | 21 +- .../druid/bvt/sql/mysql/issues/Issue5702.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5761.java | 8 +- .../druid/bvt/sql/mysql/issues/Issue5774.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5797.java | 8 +- .../druid/bvt/sql/mysql/issues/Issue5803.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5813.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5861.java | 9 +- .../druid/bvt/sql/mysql/issues/Issue5894.java | 6 +- .../druid/bvt/sql/mysql/issues/Issue5908.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5932.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5951.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5958.java | 7 +- .../druid/bvt/sql/mysql/issues/Issue5976.java | 8 +- .../druid/bvt/sql/mysql/issues/Issue6102.java | 11 +- .../druid/bvt/sql/mysql/mysql_block_0.java | 3 +- .../druid/bvt/sql/mysql/mysql_block_1.java | 3 +- .../druid/bvt/sql/mysql/mysql_block_2.java | 3 +- .../mysql/param/MySQLParameterizedTest.java | 1 - ...MySqlParameterizedOutputVisitorTest_1.java | 1 - ...ySqlParameterizedOutputVisitorTest_10.java | 1 - ...ySqlParameterizedOutputVisitorTest_15.java | 1 - ...MySqlParameterizedOutputVisitorTest_3.java | 1 - ...qlParameterizedOutputVisitorTest_38_1.java | 4 +- ...ySqlParameterizedOutputVisitorTest_39.java | 4 +- ...MySqlParameterizedOutputVisitorTest_4.java | 6 +- ...ySqlParameterizedOutputVisitorTest_40.java | 4 +- ...ySqlParameterizedOutputVisitorTest_41.java | 4 +- ...ySqlParameterizedOutputVisitorTest_42.java | 4 +- ...ySqlParameterizedOutputVisitorTest_43.java | 5 +- ...ySqlParameterizedOutputVisitorTest_44.java | 4 +- ...rameterizedOutputVisitorTest_47_hints.java | 1 - ...ySqlParameterizedOutputVisitorTest_56.java | 1 - ...MySqlParameterizedOutputVisitorTest_6.java | 1 - ...ySqlParameterizedOutputVisitorTest_61.java | 3 +- ...ySqlParameterizedOutputVisitorTest_62.java | 3 +- ...ySqlParameterizedOutputVisitorTest_63.java | 2 +- ...ySqlParameterizedOutputVisitorTest_64.java | 3 +- ...ySqlParameterizedOutputVisitorTest_65.java | 2 - ...ySqlParameterizedOutputVisitorTest_66.java | 3 +- ...ySqlParameterizedOutputVisitorTest_67.java | 3 +- ...ySqlParameterizedOutputVisitorTest_68.java | 1 - ...ySqlParameterizedOutputVisitorTest_69.java | 2 +- ...MySqlParameterizedOutputVisitorTest_7.java | 3 +- ...ySqlParameterizedOutputVisitorTest_70.java | 9 +- ...ySqlParameterizedOutputVisitorTest_71.java | 9 +- ...ySqlParameterizedOutputVisitorTest_72.java | 9 +- ...ySqlParameterizedOutputVisitorTest_73.java | 1 - ...ySqlParameterizedOutputVisitorTest_74.java | 2 +- ...lParameterizedOutputVisitorTest_75_or.java | 2 +- ...ySqlParameterizedOutputVisitorTest_76.java | 3 +- ...rameterizedOutputVisitorTest_78_nchar.java | 2 +- ...edOutputVisitorTest_79_group_asc_desc.java | 3 +- ...MySqlParameterizedOutputVisitorTest_8.java | 2 - ...MySqlParameterizedOutputVisitorTest_9.java | 2 - .../druid/bvt/sql/mysql/param/ParseUtil.java | 14 +- .../bvt/sql/mysql/resolve/ResolveTest_0.java | 6 +- .../bvt/sql/mysql/resolve/ResolveTest_1.java | 6 +- .../mysql/resolve/Resolve_AllColumn_Test.java | 4 +- .../resolve/Resolve_AllColumn_Test_1.java | 3 - .../sql/mysql/resolve/TPCDS_ALL_Resolve.java | 1 - .../bvt/sql/mysql/select/AdsDumpTest_0.java | 5 +- .../bvt/sql/mysql/select/CTERewriteTest.java | 8 +- .../select/MySqlSelectTestIssue5431.java | 16 +- .../sql/mysql/select/MySqlSelectTest_0.java | 1 - .../sql/mysql/select/MySqlSelectTest_1.java | 1 - .../sql/mysql/select/MySqlSelectTest_10.java | 5 - .../select/MySqlSelectTest_100_alias.java | 5 +- .../select/MySqlSelectTest_101_binary.java | 6 +- .../select/MySqlSelectTest_102_orderBy.java | 6 +- .../MySqlSelectTest_103_union_orderBy.java | 4 +- .../MySqlSelectTest_104_union_orderBy.java | 4 +- .../select/MySqlSelectTest_105_hints.java | 5 +- .../select/MySqlSelectTest_106_hints.java | 4 +- .../select/MySqlSelectTest_107_between.java | 6 +- .../select/MySqlSelectTest_108_alias.java | 4 +- .../select/MySqlSelectTest_109_alias.java | 4 +- .../sql/mysql/select/MySqlSelectTest_11.java | 5 +- .../sql/mysql/select/MySqlSelectTest_110.java | 3 - .../select/MySqlSelectTest_111_sequence.java | 2 - .../select/MySqlSelectTest_112_orderBy.java | 2 - .../select/MySqlSelectTest_113_time.java | 2 - .../sql/mysql/select/MySqlSelectTest_114.java | 2 - .../select/MySqlSelectTest_115_collate.java | 3 +- .../select/MySqlSelectTest_116_with_cube.java | 2 +- .../sql/mysql/select/MySqlSelectTest_117.java | 2 +- .../select/MySqlSelectTest_118_timestamp.java | 2 +- .../select/MySqlSelectTest_119_date.java | 2 +- .../select/MySqlSelectTest_119_real.java | 2 +- .../sql/mysql/select/MySqlSelectTest_12.java | 1 - .../mysql/select/MySqlSelectTest_120_not.java | 2 +- .../sql/mysql/select/MySqlSelectTest_121.java | 2 +- .../sql/mysql/select/MySqlSelectTest_122.java | 2 +- .../mysql/select/MySqlSelectTest_123_mod.java | 3 +- .../select/MySqlSelectTest_124_contains.java | 2 +- .../mysql/select/MySqlSelectTest_125_eq.java | 4 +- .../select/MySqlSelectTest_126_ads_minus.java | 4 +- .../sql/mysql/select/MySqlSelectTest_127.java | 4 +- .../mysql/select/MySqlSelectTest_129_ads.java | 4 +- .../sql/mysql/select/MySqlSelectTest_13.java | 3 +- .../mysql/select/MySqlSelectTest_130_ads.java | 4 +- .../mysql/select/MySqlSelectTest_131_div.java | 4 +- .../select/MySqlSelectTest_132_not_in.java | 4 +- .../sql/mysql/select/MySqlSelectTest_133.java | 4 +- .../sql/mysql/select/MySqlSelectTest_134.java | 2 +- .../sql/mysql/select/MySqlSelectTest_135.java | 4 +- .../sql/mysql/select/MySqlSelectTest_136.java | 4 +- .../sql/mysql/select/MySqlSelectTest_137.java | 4 +- .../select/MySqlSelectTest_138_ads_minus.java | 5 +- .../sql/mysql/select/MySqlSelectTest_139.java | 8 +- .../sql/mysql/select/MySqlSelectTest_14.java | 3 +- .../select/MySqlSelectTest_140_union.java | 8 +- .../select/MySqlSelectTest_141_bigunion.java | 5 +- .../sql/mysql/select/MySqlSelectTest_142.java | 8 +- .../sql/mysql/select/MySqlSelectTest_143.java | 9 +- .../MySqlSelectTest_144_ads_values.java | 8 +- .../select/MySqlSelectTest_145_bigand.java | 4 +- .../sql/mysql/select/MySqlSelectTest_146.java | 9 +- .../select/MySqlSelectTest_147_huizhi.java | 7 +- .../select/MySqlSelectTest_148_extract.java | 13 +- .../sql/mysql/select/MySqlSelectTest_149.java | 18 +- .../sql/mysql/select/MySqlSelectTest_15.java | 5 +- .../sql/mysql/select/MySqlSelectTest_150.java | 10 +- .../sql/mysql/select/MySqlSelectTest_151.java | 9 +- .../sql/mysql/select/MySqlSelectTest_152.java | 14 +- .../sql/mysql/select/MySqlSelectTest_153.java | 9 +- .../sql/mysql/select/MySqlSelectTest_154.java | 9 +- .../sql/mysql/select/MySqlSelectTest_155.java | 9 +- .../sql/mysql/select/MySqlSelectTest_156.java | 9 +- .../sql/mysql/select/MySqlSelectTest_157.java | 14 +- .../sql/mysql/select/MySqlSelectTest_158.java | 17 +- .../sql/mysql/select/MySqlSelectTest_159.java | 17 +- .../sql/mysql/select/MySqlSelectTest_16.java | 2 - .../sql/mysql/select/MySqlSelectTest_160.java | 15 +- .../sql/mysql/select/MySqlSelectTest_161.java | 15 +- .../sql/mysql/select/MySqlSelectTest_162.java | 15 +- .../sql/mysql/select/MySqlSelectTest_163.java | 8 +- .../select/MySqlSelectTest_164_window.java | 5 +- .../select/MySqlSelectTest_165_json.java | 5 +- .../mysql/select/MySqlSelectTest_166_xor.java | 4 +- .../sql/mysql/select/MySqlSelectTest_167.java | 3 +- .../select/MySqlSelectTest_168_decimal.java | 3 +- .../mysql/select/MySqlSelectTest_168_int.java | 4 +- .../select/MySqlSelectTest_168_union.java | 3 +- .../MySqlSelectTest_169_not_between.java | 3 +- .../select/MySqlSelectTest_169_not_in.java | 13 +- .../select/MySqlSelectTest_169_values.java | 3 +- .../sql/mysql/select/MySqlSelectTest_17.java | 1 - .../select/MySqlSelectTest_170_tddl_hint.java | 2 +- .../MySqlSelectTest_171_multi_error.java | 4 +- .../select/MySqlSelectTest_172_trim.java | 2 +- .../sql/mysql/select/MySqlSelectTest_173.java | 5 +- .../select/MySqlSelectTest_174_union.java | 4 +- .../select/MySqlSelectTest_175_hints.java | 6 +- .../select/MySqlSelectTest_176_hints.java | 7 +- .../select/MySqlSelectTest_177_hints.java | 11 +- .../sql/mysql/select/MySqlSelectTest_178.java | 5 +- .../sql/mysql/select/MySqlSelectTest_179.java | 9 +- .../sql/mysql/select/MySqlSelectTest_18.java | 29 +- .../select/MySqlSelectTest_180_extract.java | 2 +- .../select/MySqlSelectTest_181_limit.java | 1 - .../mysql/select/MySqlSelectTest_183_mpp.java | 2 - .../sql/mysql/select/MySqlSelectTest_184.java | 1 - .../sql/mysql/select/MySqlSelectTest_185.java | 1 - .../sql/mysql/select/MySqlSelectTest_186.java | 4 - .../sql/mysql/select/MySqlSelectTest_187.java | 1 - .../sql/mysql/select/MySqlSelectTest_188.java | 2 +- .../sql/mysql/select/MySqlSelectTest_189.java | 2 +- .../sql/mysql/select/MySqlSelectTest_19.java | 1 - .../select/MySqlSelectTest_190_drds.java | 2 +- .../MySqlSelectTest_191_specialName.java | 2 +- .../select/MySqlSelectTest_192_ibatis.java | 2 +- .../select/MySqlSelectTest_193_ibatis.java | 2 +- .../select/MySqlSelectTest_196_wall.java | 3 +- .../sql/mysql/select/MySqlSelectTest_197.java | 4 +- .../sql/mysql/select/MySqlSelectTest_198.java | 2 +- .../select/MySqlSelectTest_199_hint.java | 8 - .../sql/mysql/select/MySqlSelectTest_2.java | 1 - .../sql/mysql/select/MySqlSelectTest_20.java | 2 - .../select/MySqlSelectTest_200_presto.java | 3 - .../sql/mysql/select/MySqlSelectTest_201.java | 3 - .../select/MySqlSelectTest_20190424_01.java | 5 +- ...MySqlSelectTest_205_drds_group_concat.java | 3 - .../select/MySqlSelectTest_206_union.java | 5 - .../select/MySqlSelectTest_207_cast.java | 4 - .../mysql/select/MySqlSelectTest_209_not.java | 5 - .../sql/mysql/select/MySqlSelectTest_21.java | 4 - .../select/MySqlSelectTest_210_union.java | 6 - .../select/MySqlSelectTest_211_union.java | 4 - .../select/MySqlSelectTest_212_alias.java | 6 +- .../sql/mysql/select/MySqlSelectTest_213.java | 3 +- .../sql/mysql/select/MySqlSelectTest_214.java | 3 +- .../sql/mysql/select/MySqlSelectTest_215.java | 7 +- .../sql/mysql/select/MySqlSelectTest_216.java | 5 +- .../select/MySqlSelectTest_217_unnest.java | 5 +- .../select/MySqlSelectTest_218_jdbc.java | 4 +- .../select/MySqlSelectTest_219_jdbc_fn.java | 3 +- .../sql/mysql/select/MySqlSelectTest_22.java | 4 - .../select/MySqlSelectTest_220_jdbc_fn.java | 3 +- .../sql/mysql/select/MySqlSelectTest_221.java | 3 +- .../sql/mysql/select/MySqlSelectTest_222.java | 3 +- .../select/MySqlSelectTest_223_jdbc_fn.java | 3 +- .../sql/mysql/select/MySqlSelectTest_224.java | 3 +- .../mysql/select/MySqlSelectTest_225_reg.java | 3 +- .../sql/mysql/select/MySqlSelectTest_226.java | 3 +- .../sql/mysql/select/MySqlSelectTest_227.java | 7 +- .../sql/mysql/select/MySqlSelectTest_228.java | 7 +- .../select/MySqlSelectTest_229_interval.java | 6 +- .../sql/mysql/select/MySqlSelectTest_230.java | 8 +- .../select/MySqlSelectTest_231_keywords.java | 5 +- .../sql/mysql/select/MySqlSelectTest_232.java | 6 +- .../sql/mysql/select/MySqlSelectTest_233.java | 10 +- .../sql/mysql/select/MySqlSelectTest_234.java | 9 +- .../sql/mysql/select/MySqlSelectTest_235.java | 6 +- .../sql/mysql/select/MySqlSelectTest_236.java | 6 +- .../sql/mysql/select/MySqlSelectTest_237.java | 6 +- .../sql/mysql/select/MySqlSelectTest_238.java | 4 - .../sql/mysql/select/MySqlSelectTest_239.java | 6 +- .../sql/mysql/select/MySqlSelectTest_24.java | 4 - .../sql/mysql/select/MySqlSelectTest_240.java | 6 +- .../sql/mysql/select/MySqlSelectTest_241.java | 7 +- .../sql/mysql/select/MySqlSelectTest_242.java | 7 +- .../sql/mysql/select/MySqlSelectTest_243.java | 6 +- .../sql/mysql/select/MySqlSelectTest_244.java | 7 +- .../sql/mysql/select/MySqlSelectTest_245.java | 7 +- .../sql/mysql/select/MySqlSelectTest_246.java | 7 +- .../sql/mysql/select/MySqlSelectTest_247.java | 8 +- .../sql/mysql/select/MySqlSelectTest_248.java | 9 +- .../sql/mysql/select/MySqlSelectTest_249.java | 6 +- .../sql/mysql/select/MySqlSelectTest_25.java | 4 - .../sql/mysql/select/MySqlSelectTest_250.java | 6 +- .../sql/mysql/select/MySqlSelectTest_251.java | 6 +- .../sql/mysql/select/MySqlSelectTest_252.java | 6 +- .../sql/mysql/select/MySqlSelectTest_253.java | 5 +- .../sql/mysql/select/MySqlSelectTest_254.java | 5 +- .../sql/mysql/select/MySqlSelectTest_255.java | 5 +- .../sql/mysql/select/MySqlSelectTest_256.java | 5 +- .../sql/mysql/select/MySqlSelectTest_257.java | 5 +- .../sql/mysql/select/MySqlSelectTest_258.java | 5 +- .../sql/mysql/select/MySqlSelectTest_259.java | 5 +- .../sql/mysql/select/MySqlSelectTest_26.java | 4 - .../sql/mysql/select/MySqlSelectTest_260.java | 5 +- .../sql/mysql/select/MySqlSelectTest_261.java | 5 +- .../sql/mysql/select/MySqlSelectTest_262.java | 5 +- .../sql/mysql/select/MySqlSelectTest_263.java | 5 +- .../sql/mysql/select/MySqlSelectTest_264.java | 5 +- .../sql/mysql/select/MySqlSelectTest_265.java | 11 +- .../sql/mysql/select/MySqlSelectTest_266.java | 12 +- .../sql/mysql/select/MySqlSelectTest_267.java | 6 +- .../sql/mysql/select/MySqlSelectTest_268.java | 5 +- .../sql/mysql/select/MySqlSelectTest_269.java | 5 +- .../sql/mysql/select/MySqlSelectTest_27.java | 4 - .../sql/mysql/select/MySqlSelectTest_270.java | 5 +- .../sql/mysql/select/MySqlSelectTest_271.java | 5 +- .../sql/mysql/select/MySqlSelectTest_272.java | 5 +- .../sql/mysql/select/MySqlSelectTest_273.java | 5 +- .../sql/mysql/select/MySqlSelectTest_274.java | 5 +- .../sql/mysql/select/MySqlSelectTest_275.java | 6 +- .../sql/mysql/select/MySqlSelectTest_276.java | 5 +- .../sql/mysql/select/MySqlSelectTest_277.java | 5 +- .../sql/mysql/select/MySqlSelectTest_278.java | 5 +- .../sql/mysql/select/MySqlSelectTest_279.java | 5 +- .../sql/mysql/select/MySqlSelectTest_28.java | 3 - .../sql/mysql/select/MySqlSelectTest_280.java | 5 +- .../sql/mysql/select/MySqlSelectTest_281.java | 5 +- .../sql/mysql/select/MySqlSelectTest_282.java | 5 +- .../MySqlSelectTest_283_current_user.java | 5 +- .../sql/mysql/select/MySqlSelectTest_284.java | 5 +- .../sql/mysql/select/MySqlSelectTest_285.java | 5 +- .../sql/mysql/select/MySqlSelectTest_286.java | 5 +- .../sql/mysql/select/MySqlSelectTest_287.java | 6 +- .../sql/mysql/select/MySqlSelectTest_288.java | 5 +- .../sql/mysql/select/MySqlSelectTest_289.java | 5 +- .../sql/mysql/select/MySqlSelectTest_29.java | 4 - .../sql/mysql/select/MySqlSelectTest_290.java | 9 +- .../select/MySqlSelectTest_292_lateral.java | 5 +- ...ySqlSelectTest_293_group_concat_clone.java | 6 +- ...SqlSelectTest_293_operator_precedence.java | 5 +- .../mysql/select/MySqlSelectTest_294_dla.java | 4 +- .../sql/mysql/select/MySqlSelectTest_295.java | 4 +- .../sql/mysql/select/MySqlSelectTest_296.java | 4 +- .../sql/mysql/select/MySqlSelectTest_297.java | 3 +- .../sql/mysql/select/MySqlSelectTest_298.java | 3 +- .../mysql/select/MySqlSelectTest_299_mtr.java | 7 +- .../sql/mysql/select/MySqlSelectTest_3.java | 1 - .../sql/mysql/select/MySqlSelectTest_30.java | 4 - .../select/MySqlSelectTest_300_genAlias.java | 2 +- .../mysql/select/MySqlSelectTest_301_dla.java | 4 +- .../mysql/select/MySqlSelectTest_302_agg.java | 3 +- .../select/MySqlSelectTest_304_adb_hints.java | 3 +- .../mysql/select/MySqlSelectTest_305_dla.java | 2 +- .../MySqlSelectTest_306_outer_orderby.java | 5 +- .../MySqlSelectTest_307_lateralview.java | 2 +- .../mysql/select/MySqlSelectTest_308_mtr.java | 2 +- .../sql/mysql/select/MySqlSelectTest_309.java | 2 +- .../sql/mysql/select/MySqlSelectTest_31.java | 4 - .../sql/mysql/select/MySqlSelectTest_310.java | 2 +- .../select/MySqlSelectTest_311_issue.java | 2 +- .../sql/mysql/select/MySqlSelectTest_313.java | 2 +- .../MySqlSelectTest_315_issue_3960.java | 5 +- .../MySqlSelectTest_316_json_table.java | 2 +- .../sql/mysql/select/MySqlSelectTest_32.java | 4 - .../sql/mysql/select/MySqlSelectTest_33.java | 4 - .../sql/mysql/select/MySqlSelectTest_34.java | 4 - .../sql/mysql/select/MySqlSelectTest_35.java | 4 - .../sql/mysql/select/MySqlSelectTest_36.java | 4 - .../sql/mysql/select/MySqlSelectTest_37.java | 4 - .../sql/mysql/select/MySqlSelectTest_38.java | 4 - .../sql/mysql/select/MySqlSelectTest_39.java | 4 - .../sql/mysql/select/MySqlSelectTest_4.java | 1 - .../sql/mysql/select/MySqlSelectTest_40.java | 2 - .../sql/mysql/select/MySqlSelectTest_41.java | 2 - .../select/MySqlSelectTest_42_with_cte.java | 2 - .../select/MySqlSelectTest_43_with_cte.java | 2 - .../select/MySqlSelectTest_44_with_cte.java | 1 - ...SelectTest_45_subquery_scalar_operand.java | 2 - .../MySqlSelectTest_46_group_concat.java | 2 - .../MySqlSelectTest_47_group_concat.java | 2 - .../select/MySqlSelectTest_48_union.java | 1 - ...MySqlSelectTest_49_for_update_no_wait.java | 1 - .../sql/mysql/select/MySqlSelectTest_5.java | 1 - .../select/MySqlSelectTest_50_union.java | 1 - .../mysql/select/MySqlSelectTest_51_open.java | 1 - .../select/MySqlSelectTest_52_comment.java | 1 - .../select/MySqlSelectTest_53_match.java | 11 +- .../sql/mysql/select/MySqlSelectTest_54.java | 1 - .../sql/mysql/select/MySqlSelectTest_55.java | 1 - .../sql/mysql/select/MySqlSelectTest_56.java | 1 - .../sql/mysql/select/MySqlSelectTest_57.java | 1 - .../select/MySqlSelectTest_58_alias_dot.java | 1 - .../mysql/select/MySqlSelectTest_59_neq.java | 1 - .../sql/mysql/select/MySqlSelectTest_6.java | 1 - .../sql/mysql/select/MySqlSelectTest_7.java | 1 - .../sql/mysql/select/MySqlSelectTest_8.java | 1 - .../sql/mysql/select/MySqlSelectTest_9.java | 1 - .../sql/mysql/select/MySqlSelectTest_90.java | 7 +- .../sql/mysql/select/MySqlSelectTest_92.java | 1 - .../sql/mysql/select/MySqlSelectTest_94.java | 4 - .../select/MySqlSelectTest_94_error.java | 1 - .../select/MySqlSelectTest_95_soundsLike.java | 4 +- .../select/MySqlSelectTest_96_istrue.java | 3 +- .../select/MySqlSelectTest_97_alias.java | 4 +- .../sql/mysql/select/MySqlSelectTest_98.java | 4 - .../MySqlSelectTest_99_union_order.java | 1 - .../select/MySqlSelectTest_BinaryConcat.java | 7 +- .../select/MySqlSelectTest_POSITION.java | 15 +- .../select/MySqlSelectTest_ads_keywords.java | 4 - .../MySqlSelectTest_ads_keywords_0.java | 2 - .../MySqlSelectTest_ads_keywords_1.java | 7 - .../select/MySqlSelectTest_clearLimit.java | 8 - .../select/MySqlSelectTest_comma_src.java | 2 - .../mysql/select/MySqlSelectTest_comment.java | 5 +- .../select/MySqlSelectTest_crossjoin.java | 3 +- ...MySqlSelectTest_eq_null_parameterized.java | 1 - .../mysql/select/MySqlSelectTest_equals.java | 2 - .../select/MySqlSelectTest_exportTables.java | 5 - .../mysql/select/MySqlSelectTest_forADB.java | 6 - .../MySqlSelectTest_func_in_order_by.java | 2 - .../select/MySqlSelectTest_group_concat.java | 18 +- .../MySqlSelectTest_group_concat_2.java | 13 +- .../mysql/select/MySqlSelectTest_jinyuan.java | 2 +- .../mysql/select/MySqlSelectTest_json.java | 3 - .../sql/mysql/select/MySqlSelectTest_mtr.java | 4 +- .../select/MySqlSelectTest_partition.java | 7 +- .../select/MySqlSelectTest_plus_ques.java | 3 - .../MySqlSelectTest_plus_sub_comment.java | 1 - .../select/MySqlSelectTest_straight_join.java | 1 - .../mysql/select/MySqlSelectTest_trim.java | 6 +- .../mysql/select/MySqlSelectTest_update.java | 1 - .../select/MySqlSelectTest_with_20433301.java | 7 +- .../sql/mysql/select/MysqlResolveTest.java | 7 +- .../select/MysqlSelectTest_issue_5140.java | 2 - .../sql/mysql/show/MySqlShowFieldsTest.java | 2 - .../show/MySqlShowTestMaterializedView.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_0.java | 3 - .../bvt/sql/mysql/show/MySqlShowTest_1.java | 2 - .../show/MySqlShowTest_10_broadcasts.java | 1 - .../show/MySqlShowTest_11_datasources.java | 1 - .../sql/mysql/show/MySqlShowTest_12_node.java | 1 - .../sql/mysql/show/MySqlShowTest_13_help.java | 1 - .../sql/mysql/show/MySqlShowTest_14_slow.java | 1 - .../mysql/show/MySqlShowTest_15_outlines.java | 3 - .../show/MySqlShowTest_15_queryTask.java | 3 - .../show/MySqlShowTest_17_recyclebin.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_18.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_2.java | 2 - .../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 | 2 - .../mysql/show/MySqlShowTest_30_hints.java | 1 - .../mysql/show/MySqlShowTest_31_hints.java | 1 - .../mysql/show/MySqlShowTest_32_hints.java | 1 - .../mysql/show/MySqlShowTest_34_stats.java | 1 - ...MySqlShowTest_35_PHYSICAL_PROCESSLIST.java | 1 - .../mysql/show/MySqlShowTest_37_hints.java | 2 +- .../mysql/show/MySqlShowTest_38_hints.java | 2 +- .../bvt/sql/mysql/show/MySqlShowTest_4.java | 2 - .../show/MySqlShowTest_40_partitions.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_41.java | 1 - .../show/MySqlShowTest_41_partitions.java | 1 - .../sql/mysql/show/MySqlShowTest_42_dla.java | 1 - .../bvt/sql/mysql/show/MySqlShowTest_5.java | 2 - .../bvt/sql/mysql/show/MySqlShowTest_6.java | 2 - .../mysql/show/MySqlShowTest_7_show_rule.java | 2 - .../mysql/show/MySqlShowTest_8_topology.java | 2 - .../show/MySqlShowTest_9_partitions.java | 1 - .../mysql/show/MySqlShowTest_mappings.java | 1 - .../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 | 1 - .../show/SHOW_DATABASES_Syntax_Test.java | 1 - .../mysql/show/SHOW_STATUS_Syntax_Test.java | 1 - .../mysql/show/SHOW_TABLES_Syntax_Test.java | 3 - .../mysql/show/SHOW_WARNINGS_Syntax_Test.java | 2 - .../sql/mysql/update/MySqlUpdateTest_0.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_1.java | 13 +- .../sql/mysql/update/MySqlUpdateTest_10.java | 1 - .../update/MySqlUpdateTest_11_using.java | 1 - .../sql/mysql/update/MySqlUpdateTest_12.java | 1 - .../MySqlUpdateTest_13_force_partition.java | 1 - .../MySqlUpdateTest_14_force_partition.java | 1 - .../sql/mysql/update/MySqlUpdateTest_17.java | 2 - .../sql/mysql/update/MySqlUpdateTest_2.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_3.java | 14 +- .../sql/mysql/update/MySqlUpdateTest_4.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_5.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_6.java | 1 - .../sql/mysql/update/MySqlUpdateTest_7.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_8.java | 6 +- .../sql/mysql/update/MySqlUpdateTest_9.java | 1 - .../MySqlParameterizedOutputVisitorTest.java | 1 - .../visitor/MySqlSchemaStatVisitorTest1.java | 11 +- .../visitor/MySqlSchemaStatVisitorTest2.java | 12 +- .../visitor/MySqlSchemaStatVisitorTest3.java | 10 +- .../visitor/MySqlSchemaStatVisitorTest4.java | 10 +- .../visitor/MySqlSchemaStatVisitorTest5.java | 5 +- .../visitor/MySqlSchemaStatVisitorTest6.java | 5 +- .../visitor/MySqlSchemaStatVisitorTest7.java | 21 +- .../MySqlSchemaStatVisitorTest7_between.java | 4 +- .../visitor/MySqlSchemaStatVisitorTest8.java | 6 +- .../MySqlSchemaStatVisitorTest9_in.java | 6 +- .../MySqlSchemaStatVisitorTest_Alter.java | 3 - .../MySqlSchemaStatVisitorTest_Delete.java | 10 +- .../MySqlSchemaStatVisitorTest_Subquery.java | 10 +- .../MySqlSchemaStatVisitorTest_Subquery2.java | 10 +- .../MySqlSchemaStatVisitorTest_Update.java | 10 +- .../MySqlSchemaStatVisitorTest_pk_0.java | 5 +- .../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 | 13 +- ...ceanbaseAlterTableImportPartitionTest.java | 9 +- ...eanbaseAlterTableImportPartitionTest2.java | 9 +- ...anbaseAlterTableOptimizePartitionTest.java | 9 +- ...nbaseAlterTableOptimizePartitionTest2.java | 9 +- ...baseAlterTableReOrganizePartitionTest.java | 13 +- ...aseAlterTableReOrganizePartitionTest2.java | 15 +- ...eanbaseAlterTableRebuildPartitionTest.java | 9 +- ...anbaseAlterTableRebuildPartitionTest2.java | 9 +- ...nbaseAlterTableRemovePartitioningTest.java | 9 +- ...ceanbaseAlterTableRepairPartitionTest.java | 9 +- ...eanbaseAlterTableRepairPartitionTest2.java | 9 +- ...anbaseAlterTableTruncatePartitionTest.java | 9 +- ...nbaseAlterTableTruncatePartitionTest2.java | 9 +- ...baseAlterTableUpgradePartitioningTest.java | 9 +- ...OceanbaseCreateTableTest_Index_Global.java | 2 - ...anbaseCreateTableTest_partitionByHash.java | 9 +- ...nbaseCreateTableTest_partitionByHash2.java | 21 +- ...eanbaseCreateTableTest_partitionByKey.java | 9 +- ...eanbaseCreateTableTest_rangePartition.java | 18 +- ...anbaseCreateTableTest_rangePartition2.java | 26 +- ...anbaseCreateTableTest_rangePartition3.java | 24 +- ...anbaseCreateTableTest_rangePartition4.java | 27 +- ...anbaseCreateTableTest_rangePartition5.java | 4 +- ...OceanbaseCreateTableTest_subPartition.java | 21 +- ...ceanbaseCreateTableTest_subPartition2.java | 25 +- ...ceanbaseCreateTableTest_subPartition3.java | 17 +- ...ceanbaseCreateTableTest_subPartition4.java | 19 +- .../oceanbase/OceanbaseHintTest_Index.java | 7 +- .../oceanbase/OceanbaseHintTest_Index2.java | 7 +- .../sql/oceanbase/OceanbaseHintTest_Topk.java | 7 +- .../oceanbase/OceanbaseHintTest_multiget.java | 7 +- .../oceanbase/OceanbaseHintTest_parallel.java | 7 +- .../OceanbaseSelectPartitionTest.java | 13 +- .../sql/oceanbase/OceanbaseSelectTest.java | 3 +- .../OceanbaseSelectTest_hierarchical_1.java | 3 +- .../bvt/sql/oceanbase/issues/Issue5078.java | 5 - .../bvt/sql/odps/OdpsAddStatisticTest.java | 3 - .../odps/OdpsAlterTableAddColumnsTest.java | 4 +- .../odps/OdpsAlterTableAddPartitionTest.java | 5 +- .../odps/OdpsAlterTableChangeColumnTest.java | 4 +- .../odps/OdpsAlterTableChangeColumnTest2.java | 4 +- .../odps/OdpsAlterTableChangeColumnTest3.java | 4 +- .../odps/OdpsAlterTableChangeColumnTest4.java | 3 +- .../odps/OdpsAlterTableDisableLifecycle.java | 7 +- .../odps/OdpsAlterTableDropPartitionTest.java | 7 +- .../OdpsAlterTableDropPartitionTest2.java | 1 - .../odps/OdpsAlterTableEnableLifecycle.java | 7 +- .../OdpsAlterTableMergeSmallFilesTest.java | 1 - .../OdpsAlterTableRenamePartitionTest.java | 3 - .../odps/OdpsAlterTableSetCommentTest.java | 5 +- .../sql/odps/OdpsAlterTableSetLifecycle.java | 5 +- .../bvt/sql/odps/OdpsAlterTableTouchTest.java | 7 +- .../druid/bvt/sql/odps/OdpsAlterViewTest.java | 3 - .../bvt/sql/odps/OdpsAnalyzeTableTest.java | 4 - .../bvt/sql/odps/OdpsAsNumberFirstTest.java | 6 +- .../druid/bvt/sql/odps/OdpsCaseWhenTest.java | 3 - .../bvt/sql/odps/OdpsCreateTableTest.java | 21 +- .../bvt/sql/odps/OdpsCreateTableTest2.java | 7 +- .../bvt/sql/odps/OdpsCreateTableTest3.java | 5 +- .../bvt/sql/odps/OdpsCreateTableTest4.java | 3 +- .../sql/odps/OdpsCreateTableTest6_array.java | 3 +- .../sql/odps/OdpsCreateTableTest7_struct.java | 3 +- .../bvt/sql/odps/OdpsCreateViewTest.java | 29 +- .../druid/bvt/sql/odps/OdpsDescTest.java | 6 +- .../bvt/sql/odps/OdpsDoubleQuoteTest.java | 9 +- .../druid/bvt/sql/odps/OdpsDropViewTest.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest.java | 13 +- .../bvt/sql/odps/OdpsFormatCommentTest10.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest11.java | 8 +- .../bvt/sql/odps/OdpsFormatCommentTest12.java | 6 +- .../bvt/sql/odps/OdpsFormatCommentTest13.java | 10 +- .../bvt/sql/odps/OdpsFormatCommentTest14.java | 14 +- .../bvt/sql/odps/OdpsFormatCommentTest15.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest16.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest17.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest18.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest19.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest2.java | 8 +- .../bvt/sql/odps/OdpsFormatCommentTest20.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest21.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest22.java | 4 - .../bvt/sql/odps/OdpsFormatCommentTest23.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest24.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest25.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest26.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest27.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest28.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest29.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest3.java | 14 +- .../bvt/sql/odps/OdpsFormatCommentTest30.java | 3 - .../bvt/sql/odps/OdpsFormatCommentTest4.java | 18 +- .../bvt/sql/odps/OdpsFormatCommentTest5.java | 39 ++- .../bvt/sql/odps/OdpsFormatCommentTest6.java | 14 +- .../bvt/sql/odps/OdpsFormatCommentTest7.java | 10 +- .../bvt/sql/odps/OdpsFormatCommentTest8.java | 12 +- .../bvt/sql/odps/OdpsFormatCommentTest9.java | 4 - .../druid/bvt/sql/odps/OdpsFormatInTest.java | 3 - .../druid/bvt/sql/odps/OdpsFormatTest.java | 15 +- .../druid/bvt/sql/odps/OdpsGrantTest.java | 5 +- .../druid/bvt/sql/odps/OdpsIfTest.java | 5 +- .../druid/bvt/sql/odps/OdpsInsertTest.java | 18 +- .../druid/bvt/sql/odps/OdpsKeywordsTest.java | 2 +- .../bvt/sql/odps/OdpsListResourcesTest.java | 41 ++- .../druid/bvt/sql/odps/OdpsListTest.java | 6 +- .../bvt/sql/odps/OdpsMultiInsertTest.java | 18 +- .../bvt/sql/odps/OdpsMultiInsertTest2.java | 1 - .../druid/bvt/sql/odps/OdpsReadTest.java | 4 - .../bvt/sql/odps/OdpsRemoveStatisticTest.java | 3 - .../druid/bvt/sql/odps/OdpsResourceTest.java | 14 +- .../druid/bvt/sql/odps/OdpsSelectTest.java | 24 +- .../druid/bvt/sql/odps/OdpsSelectTest10.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest11.java | 11 +- .../druid/bvt/sql/odps/OdpsSelectTest12.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest13.java | 11 +- .../druid/bvt/sql/odps/OdpsSelectTest14.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest15.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest16.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest17.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest18.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest19.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest2.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest20.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest21.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest22.java | 4 +- .../druid/bvt/sql/odps/OdpsSelectTest23.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest24.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest25.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest26.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest27.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest28.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest29.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest3.java | 6 +- .../druid/bvt/sql/odps/OdpsSelectTest30.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest31.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest32.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest33.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest34.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest35.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest36.java | 3 +- .../druid/bvt/sql/odps/OdpsSelectTest37.java | 1 - .../druid/bvt/sql/odps/OdpsSelectTest38.java | 1 - .../druid/bvt/sql/odps/OdpsSelectTest4.java | 5 +- .../druid/bvt/sql/odps/OdpsSelectTest5.java | 6 +- .../druid/bvt/sql/odps/OdpsSelectTest6.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest7.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest8.java | 10 +- .../druid/bvt/sql/odps/OdpsSelectTest9.java | 10 +- .../bvt/sql/odps/OdpsSelectTest_mapjoin.java | 4 - .../sql/odps/OdpsSelectTest_over_rows.java | 4 +- .../sql/odps/OdpsSelectTest_over_rows_1.java | 4 +- .../sql/odps/OdpsSelectTest_over_rows_2.java | 4 +- .../sql/odps/OdpsSelectTest_over_rows_3.java | 4 +- .../sql/odps/OdpsSelectTest_over_rows_4.java | 4 +- .../sql/odps/OdpsSelectTest_over_rows_5.java | 4 +- .../odps/OdpsSelect_distribute_by_Test.java | 18 +- .../druid/bvt/sql/odps/OdpsSetLabelTest.java | 5 +- .../druid/bvt/sql/odps/OdpsSetLabelTest2.java | 5 +- .../bvt/sql/odps/OdpsShowGrantsTest.java | 6 +- .../bvt/sql/odps/OdpsShowPartitionsTest.java | 5 +- .../bvt/sql/odps/OdpsShowStatisticTest.java | 5 +- .../bvt/sql/odps/OdpsShowTablesTest0.java | 5 +- .../druid/bvt/sql/odps/OdpsUDFTest.java | 5 +- .../druid/bvt/sql/odps/OdpsUDTFTest.java | 9 +- .../druid/bvt/sql/odps/OdpsWhoamiTest.java | 5 +- .../druid/bvt/sql/odps/issues/Issue4933.java | 2 +- .../druid/bvt/sql/odps/issues/Issue4992.java | 3 +- .../druid/bvt/sql/odps/issues/Issue5791.java | 7 +- .../bvt/sql/odps/udf/ExportColumnsTest0.java | 1 - .../odps/udf/ExportSelectListColumnsTest.java | 1 - .../udf/ExportSelectListColumnsTest2.java | 4 - .../druid/bvt/sql/oracle/CallTest.java | 7 +- .../druid/bvt/sql/oracle/CursorTest.java | 4 +- .../druid/bvt/sql/oracle/LargeOrTest.java | 8 +- .../druid/bvt/sql/oracle/MergeTest.java | 4 +- .../bvt/sql/oracle/OracleAnalyticTest.java | 1 - .../druid/bvt/sql/oracle/OracleAnyTest.java | 4 +- .../druid/bvt/sql/oracle/OracleCallTest.java | 6 +- .../druid/bvt/sql/oracle/OracleCallTest2.java | 6 +- .../bvt/sql/oracle/OracleDeleteTest.java | 11 +- .../bvt/sql/oracle/OracleDeleteTest_1.java | 7 +- .../bvt/sql/oracle/OracleDeleteTest_2.java | 4 - .../bvt/sql/oracle/OracleDeleteTest_3.java | 2 - .../bvt/sql/oracle/OracleDropDbLinkTest.java | 7 +- .../sql/oracle/OracleDropFunctionTest.java | 1 - .../bvt/sql/oracle/OracleDropIndexTest.java | 8 +- .../bvt/sql/oracle/OracleDropPackageTest.java | 2 - .../sql/oracle/OracleDropSequenceTest.java | 7 +- .../bvt/sql/oracle/OracleDropTableTest.java | 8 +- .../bvt/sql/oracle/OracleDropTableTest2.java | 8 +- .../bvt/sql/oracle/OracleDropTriggerTest.java | 8 +- .../bvt/sql/oracle/OracleDropUserTest.java | 8 +- .../bvt/sql/oracle/OracleDropViewTest.java | 8 +- .../bvt/sql/oracle/OracleEXTRACTTest.java | 4 +- .../bvt/sql/oracle/OracleEXTRACTTest2.java | 1 - .../bvt/sql/oracle/OracleExplainTest.java | 6 +- .../bvt/sql/oracle/OracleExplainTest2.java | 20 +- .../bvt/sql/oracle/OracleExplainTest3.java | 6 +- .../sql/oracle/OracleFlashbackQueryTest.java | 4 +- .../sql/oracle/OracleFlashbackQueryTest2.java | 4 +- .../sql/oracle/OracleFlashbackQueryTest3.java | 4 +- .../sql/oracle/OracleFlashbackQueryTest4.java | 1 - .../bvt/sql/oracle/OracleFormatTest.java | 3 +- .../bvt/sql/oracle/OracleFormatTest2.java | 3 +- .../druid/bvt/sql/oracle/OracleGrantTest.java | 6 +- .../bvt/sql/oracle/OracleGrantTest_1.java | 8 +- .../bvt/sql/oracle/OracleGrantTest_2.java | 22 +- .../bvt/sql/oracle/OracleGrantTest_3.java | 8 +- .../bvt/sql/oracle/OracleGrantTest_4.java | 18 +- .../bvt/sql/oracle/OracleGrantTest_5.java | 3 +- .../bvt/sql/oracle/OracleGroupingSetTest.java | 5 +- .../sql/oracle/OracleGroupingSetsTest.java | 6 +- .../druid/bvt/sql/oracle/OracleHintTest.java | 10 +- .../sql/oracle/OracleIbatisSelectTest.java | 7 +- .../sql/oracle/OracleIbatisSelectTest1.java | 7 +- .../bvt/sql/oracle/OracleIntervalTest.java | 5 +- .../bvt/sql/oracle/OracleIsASetTest.java | 5 +- .../bvt/sql/oracle/OracleIsEmptyTest.java | 5 +- .../druid/bvt/sql/oracle/OracleLexerTest.java | 3 +- .../bvt/sql/oracle/OracleListAggTest.java | 21 +- .../bvt/sql/oracle/OracleListAggTest1.java | 4 +- .../bvt/sql/oracle/OracleLiteralTest.java | 6 +- .../bvt/sql/oracle/OracleLockTableTest1.java | 7 +- .../bvt/sql/oracle/OracleLockTableTest2.java | 7 +- .../bvt/sql/oracle/OracleLockTableTest3.java | 3 - .../bvt/sql/oracle/OracleLockTableTest4.java | 2 - .../druid/bvt/sql/oracle/OracleMergeTest.java | 23 +- .../bvt/sql/oracle/OracleMergeTest10.java | 2 - .../bvt/sql/oracle/OracleMergeTest11.java | 2 - .../bvt/sql/oracle/OracleMergeTest2.java | 63 +++-- .../bvt/sql/oracle/OracleMergeTest3.java | 8 +- .../bvt/sql/oracle/OracleMergeTest4.java | 2 - .../bvt/sql/oracle/OracleMergeTest5.java | 23 +- .../bvt/sql/oracle/OracleMergeTest6.java | 19 +- .../bvt/sql/oracle/OracleMergeTest7.java | 29 +- .../bvt/sql/oracle/OracleMergeTest8.java | 11 +- .../bvt/sql/oracle/OracleMergeTest9.java | 2 - .../bvt/sql/oracle/OracleMultiInsertTest.java | 44 ++- .../sql/oracle/OracleMultiInsertTest2.java | 26 +- .../sql/oracle/OracleNumberLiteralTest.java | 4 +- .../druid/bvt/sql/oracle/OracleOuterTest.java | 5 +- .../bvt/sql/oracle/OraclePivotClauseTest.java | 1 - .../druid/bvt/sql/oracle/OraclePriorTest.java | 4 +- .../oracle/OracleSQLParserResourceTest.java | 16 +- .../bvt/sql/oracle/OracleSQLParserTest.java | 9 +- .../sql/oracle/OracleSampleClauseTest.java | 7 +- .../oracle/OracleSchemaStatVisitorTest.java | 10 +- .../sql/oracle/OracleSetTransactionTest.java | 6 +- .../sql/oracle/OracleSetTransactionTest2.java | 6 +- .../sql/oracle/OracleSetTransactionTest3.java | 1 - .../oracle/OracleSubqueryFactoringTest.java | 6 +- .../oracle/OracleSubqueryFactoringTest2.java | 5 +- .../druid/bvt/sql/oracle/OracleTest2.java | 4 +- .../sql/oracle/OracleTruncateTableTest.java | 6 +- .../bvt/sql/oracle/OracleUpdateTest1.java | 15 +- .../bvt/sql/oracle/OracleUpdateTest2.java | 27 +- .../bvt/sql/oracle/OracleUpdateTest3.java | 23 +- .../bvt/sql/oracle/OracleUpdateTest4.java | 15 +- .../OracleUpdateTest5_encoding_error.java | 3 +- .../bvt/sql/oracle/OracleXmlelementTest.java | 1 - .../alter/OracleAlterFunctionTest0.java | 5 +- .../oracle/alter/OracleAlterIndexTest1.java | 6 +- .../oracle/alter/OracleAlterIndexTest2.java | 6 +- .../oracle/alter/OracleAlterIndexTest3.java | 6 +- .../oracle/alter/OracleAlterIndexTest4.java | 6 +- .../oracle/alter/OracleAlterPackageTest.java | 2 - .../alter/OracleAlterProcedureTest.java | 6 +- .../alter/OracleAlterProcedureTest2.java | 6 +- .../oracle/alter/OracleAlterSequence_0.java | 1 - .../oracle/alter/OracleAlterSessionTest.java | 7 +- .../oracle/alter/OracleAlterSynonymTest.java | 6 +- .../oracle/alter/OracleAlterTableTest.java | 6 +- .../oracle/alter/OracleAlterTableTest10.java | 6 +- .../oracle/alter/OracleAlterTableTest11.java | 6 +- .../oracle/alter/OracleAlterTableTest12.java | 6 +- .../oracle/alter/OracleAlterTableTest13.java | 6 +- .../oracle/alter/OracleAlterTableTest14.java | 6 +- .../oracle/alter/OracleAlterTableTest15.java | 6 +- .../oracle/alter/OracleAlterTableTest16.java | 6 +- .../oracle/alter/OracleAlterTableTest17.java | 6 +- .../oracle/alter/OracleAlterTableTest18.java | 6 +- .../oracle/alter/OracleAlterTableTest19.java | 8 +- .../oracle/alter/OracleAlterTableTest2.java | 6 +- .../oracle/alter/OracleAlterTableTest20.java | 10 +- .../oracle/alter/OracleAlterTableTest21.java | 6 +- .../oracle/alter/OracleAlterTableTest22.java | 12 +- .../oracle/alter/OracleAlterTableTest24.java | 1 - .../alter/OracleAlterTableTest25_drop_pk.java | 2 - .../oracle/alter/OracleAlterTableTest26.java | 2 - .../oracle/alter/OracleAlterTableTest3.java | 14 +- .../oracle/alter/OracleAlterTableTest4.java | 6 +- .../oracle/alter/OracleAlterTableTest5.java | 6 +- .../oracle/alter/OracleAlterTableTest6.java | 6 +- .../oracle/alter/OracleAlterTableTest7.java | 6 +- .../oracle/alter/OracleAlterTableTest8.java | 6 +- .../oracle/alter/OracleAlterTableTest9.java | 6 +- .../alter/OracleAlterTableTestRename.java | 6 +- .../OracleAlterTableTest_drop_constraint.java | 9 +- .../alter/OracleAlterTablespaceTest.java | 6 +- .../oracle/alter/OracleAlterTriggerTest.java | 6 +- .../oracle/alter/OracleAlterTriggerTest2.java | 6 +- .../oracle/alter/OracleAlterTypeTest0.java | 5 +- .../sql/oracle/alter/OracleAlterViewTest.java | 6 +- .../bvt/sql/oracle/block/OracleBlockTest.java | 6 +- .../sql/oracle/block/OracleBlockTest1.java | 6 +- .../sql/oracle/block/OracleBlockTest10.java | 26 +- .../sql/oracle/block/OracleBlockTest11.java | 8 +- .../sql/oracle/block/OracleBlockTest12.java | 8 +- .../sql/oracle/block/OracleBlockTest13.java | 62 +++-- .../sql/oracle/block/OracleBlockTest14.java | 64 +++-- .../sql/oracle/block/OracleBlockTest15.java | 4 +- .../sql/oracle/block/OracleBlockTest16.java | 4 +- .../sql/oracle/block/OracleBlockTest17.java | 3 +- .../sql/oracle/block/OracleBlockTest18.java | 3 +- .../sql/oracle/block/OracleBlockTest19.java | 4 +- .../sql/oracle/block/OracleBlockTest2.java | 38 ++- .../sql/oracle/block/OracleBlockTest20.java | 2 +- .../sql/oracle/block/OracleBlockTest21.java | 2 +- .../block/OracleBlockTest22_comment.java | 2 +- .../sql/oracle/block/OracleBlockTest3.java | 26 +- .../sql/oracle/block/OracleBlockTest4.java | 6 +- .../sql/oracle/block/OracleBlockTest5.java | 32 ++- .../sql/oracle/block/OracleBlockTest6.java | 58 ++-- .../sql/oracle/block/OracleBlockTest7.java | 56 ++-- .../sql/oracle/block/OracleBlockTest8.java | 56 ++-- .../sql/oracle/block/OracleBlockTest9.java | 44 ++- .../oracle/create/OracleCreateDbLinkTest.java | 2 - .../create/OracleCreateDbLinkTest1.java | 3 +- .../create/OracleCreateFunctionTest_0.java | 2 +- .../create/OracleCreateFunctionTest_1.java | 2 +- .../create/OracleCreateFunctionTest_2.java | 2 +- .../create/OracleCreateFunctionTest_3.java | 2 +- .../create/OracleCreateFunctionTest_4.java | 2 +- .../create/OracleCreateFunctionTest_5.java | 2 +- .../oracle/create/OracleCreateIndexTest1.java | 1 - .../OracleCreateIndexTest10_function.java | 4 +- .../create/OracleCreateIndexTest11.java | 4 +- .../create/OracleCreateIndexTest12.java | 4 +- .../create/OracleCreateIndexTest13.java | 4 +- .../create/OracleCreateIndexTest14.java | 4 +- .../create/OracleCreateIndexTest15.java | 4 +- .../create/OracleCreateIndexTest16_local.java | 4 +- .../OracleCreateIndexTest17_global.java | 4 +- .../OracleCreateIndexTest18_global.java | 4 +- .../OracleCreateIndexTest19_global.java | 4 +- .../OracleCreateIndexTest19_local_store.java | 4 +- .../oracle/create/OracleCreateIndexTest2.java | 5 +- .../create/OracleCreateIndexTest20.java | 4 +- .../create/OracleCreateIndexTest21.java | 6 +- .../oracle/create/OracleCreateIndexTest3.java | 1 - .../oracle/create/OracleCreateIndexTest4.java | 5 +- .../oracle/create/OracleCreateIndexTest5.java | 1 - .../OracleCreateMaterializedViewTest0.java | 2 +- .../OracleCreateMaterializedViewTest1.java | 2 +- .../OracleCreateMaterializedViewTest2.java | 2 +- .../OracleCreateMaterializedViewTest3.java | 2 +- .../OracleCreateMaterializedViewTest4.java | 3 +- .../create/OracleCreatePackageTest0.java | 3 +- .../create/OracleCreatePackageTest1.java | 3 +- .../create/OracleCreatePackageTest2.java | 3 +- .../create/OracleCreatePackageTest3.java | 3 +- .../create/OracleCreatePackageTest4.java | 3 +- .../create/OracleCreatePackageTest5.java | 3 +- .../create/OracleCreateProcedureTest1.java | 5 +- .../create/OracleCreateProcedureTest2.java | 33 ++- .../create/OracleCreateProcedureTest3.java | 3 +- .../create/OracleCreateProcedureTest4.java | 2 +- .../create/OracleCreateProcedureTest5.java | 2 +- .../create/OracleCreateProcedureTest7.java | 4 - .../create/OracleCreateSequenceTest.java | 9 +- .../create/OracleCreateSequenceTest_1.java | 1 - .../OracleCreateSequenceTest_1_bugfix.java | 1 - .../create/OracleCreateSequenceTest_2.java | 3 +- ...OracleCreateSequenceTest_3_cachevalue.java | 3 +- .../OracleCreateSequenceTest_4_order.java | 3 +- .../OracleCreateSequenceTest_5_noorder.java | 3 +- .../OracleCreateSequenceTest_6_goto.java | 3 +- .../create/OracleCreateSynonymTest.java | 1 - .../create/OracleCreateSynonymTest1.java | 1 - .../create/OracleCreateSynonymTest2.java | 1 - .../create/OracleCreateSynonymTest_0.java | 4 +- .../create/OracleCreateSynonymTest_1.java | 4 +- .../create/OracleCreateSynonymTest_2.java | 4 +- .../create/OracleCreateTableSpaceTest.java | 4 - .../create/OracleCreateTriggerTest.java | 5 +- .../create/OracleCreateTriggerTest2.java | 3 +- .../create/OracleCreateTriggerTest3.java | 3 +- .../create/OracleCreateTriggerTest4.java | 3 +- .../create/OracleCreateTriggerTest5.java | 5 +- .../create/OracleCreateTriggerTest6.java | 5 +- .../oracle/create/OracleCreateTypeTest0.java | 2 +- .../oracle/create/OracleCreateTypeTest1.java | 2 +- .../oracle/create/OracleCreateTypeTest10.java | 3 +- .../oracle/create/OracleCreateTypeTest11.java | 3 +- .../oracle/create/OracleCreateTypeTest12.java | 3 +- .../oracle/create/OracleCreateTypeTest2.java | 2 +- .../oracle/create/OracleCreateTypeTest3.java | 2 +- .../oracle/create/OracleCreateTypeTest4.java | 2 +- .../oracle/create/OracleCreateTypeTest5.java | 2 +- .../oracle/create/OracleCreateTypeTest6.java | 2 +- .../oracle/create/OracleCreateTypeTest7.java | 2 +- .../oracle/create/OracleCreateTypeTest8.java | 3 +- .../oracle/create/OracleCreateTypeTest9.java | 3 +- .../oracle/create/OracleCreateUserTest1.java | 2 +- .../oracle/create/OracleCreateViewTest0.java | 3 +- .../oracle/create/OracleCreateViewTest1.java | 3 +- ...OracleCreateViewTest10_with_read_only.java | 2 +- .../oracle/create/OracleCreateViewTest12.java | 2 +- .../oracle/create/OracleCreateViewTest13.java | 2 +- .../oracle/create/OracleCreateViewTest14.java | 2 +- .../oracle/create/OracleCreateViewTest15.java | 2 +- .../oracle/create/OracleCreateViewTest16.java | 2 +- .../create/OracleCreateViewTest17_dblink.java | 2 +- ...cleCreateViewTest18_with_check_option.java | 1 - .../oracle/create/OracleCreateViewTest2.java | 3 +- .../oracle/create/OracleCreateViewTest3.java | 3 +- .../oracle/create/OracleCreateViewTest4.java | 3 +- .../oracle/create/OracleCreateViewTest5.java | 3 +- .../oracle/create/OracleCreateViewTest6.java | 3 +- .../oracle/create/OracleCreateViewTest7.java | 3 +- .../oracle/create/OracleCreateViewTest8.java | 3 +- .../OracleCreateViewTest9_check_option.java | 2 +- .../create/OracleDropSynonymTest_0.java | 4 +- .../oracle/create/OracleDropTypeTest_0.java | 4 +- .../create/OraclePipeRowStatementTest.java | 2 +- .../createTable/OracleCreateTableTest1.java | 1 - .../createTable/OracleCreateTableTest10.java | 5 +- .../createTable/OracleCreateTableTest11.java | 67 +++-- .../createTable/OracleCreateTableTest12.java | 31 ++- .../createTable/OracleCreateTableTest13.java | 17 +- .../createTable/OracleCreateTableTest14.java | 53 ++-- .../createTable/OracleCreateTableTest15.java | 28 +- .../createTable/OracleCreateTableTest16.java | 29 +- .../createTable/OracleCreateTableTest17.java | 1 - .../createTable/OracleCreateTableTest18.java | 25 +- .../createTable/OracleCreateTableTest19.java | 35 ++- .../createTable/OracleCreateTableTest2.java | 1 - .../createTable/OracleCreateTableTest20.java | 35 ++- .../createTable/OracleCreateTableTest21.java | 9 +- .../createTable/OracleCreateTableTest22.java | 5 +- .../createTable/OracleCreateTableTest23.java | 35 ++- .../createTable/OracleCreateTableTest24.java | 31 ++- .../createTable/OracleCreateTableTest25.java | 19 +- .../createTable/OracleCreateTableTest26.java | 6 +- .../createTable/OracleCreateTableTest27.java | 25 +- .../createTable/OracleCreateTableTest28.java | 37 ++- .../createTable/OracleCreateTableTest29.java | 23 +- .../createTable/OracleCreateTableTest3.java | 1 - .../createTable/OracleCreateTableTest30.java | 49 ++-- .../createTable/OracleCreateTableTest31.java | 7 +- .../createTable/OracleCreateTableTest32.java | 9 +- .../createTable/OracleCreateTableTest33.java | 13 +- .../createTable/OracleCreateTableTest34.java | 3 +- .../createTable/OracleCreateTableTest35.java | 5 +- .../createTable/OracleCreateTableTest36.java | 3 +- .../createTable/OracleCreateTableTest37.java | 3 +- .../createTable/OracleCreateTableTest38.java | 3 +- .../createTable/OracleCreateTableTest39.java | 3 +- .../createTable/OracleCreateTableTest4.java | 1 - .../createTable/OracleCreateTableTest40.java | 3 +- .../createTable/OracleCreateTableTest41.java | 3 +- .../createTable/OracleCreateTableTest42.java | 3 +- .../createTable/OracleCreateTableTest43.java | 3 +- .../createTable/OracleCreateTableTest44.java | 3 +- .../createTable/OracleCreateTableTest45.java | 3 +- .../createTable/OracleCreateTableTest46.java | 3 +- .../createTable/OracleCreateTableTest47.java | 3 +- .../createTable/OracleCreateTableTest48.java | 3 +- .../createTable/OracleCreateTableTest49.java | 3 +- .../createTable/OracleCreateTableTest5.java | 1 - .../createTable/OracleCreateTableTest50.java | 3 +- .../createTable/OracleCreateTableTest51.java | 3 +- .../createTable/OracleCreateTableTest52.java | 3 +- .../createTable/OracleCreateTableTest53.java | 3 +- .../createTable/OracleCreateTableTest54.java | 3 +- .../createTable/OracleCreateTableTest55.java | 3 +- .../createTable/OracleCreateTableTest56.java | 3 +- .../createTable/OracleCreateTableTest57.java | 3 +- .../createTable/OracleCreateTableTest58.java | 3 +- .../createTable/OracleCreateTableTest59.java | 3 +- .../createTable/OracleCreateTableTest6.java | 1 - .../createTable/OracleCreateTableTest60.java | 3 +- .../createTable/OracleCreateTableTest61.java | 3 +- .../createTable/OracleCreateTableTest62.java | 3 +- .../createTable/OracleCreateTableTest63.java | 3 +- .../createTable/OracleCreateTableTest64.java | 3 +- .../createTable/OracleCreateTableTest65.java | 3 +- .../createTable/OracleCreateTableTest66.java | 3 +- .../createTable/OracleCreateTableTest67.java | 3 +- .../createTable/OracleCreateTableTest68.java | 2 +- .../createTable/OracleCreateTableTest69.java | 2 +- .../createTable/OracleCreateTableTest7.java | 5 +- .../createTable/OracleCreateTableTest70.java | 2 +- .../createTable/OracleCreateTableTest71.java | 2 +- .../createTable/OracleCreateTableTest72.java | 2 +- .../createTable/OracleCreateTableTest74.java | 2 +- .../createTable/OracleCreateTableTest75.java | 2 +- .../createTable/OracleCreateTableTest76.java | 2 +- .../createTable/OracleCreateTableTest77.java | 2 +- .../createTable/OracleCreateTableTest78.java | 2 +- .../createTable/OracleCreateTableTest79.java | 2 +- .../createTable/OracleCreateTableTest8.java | 21 +- .../createTable/OracleCreateTableTest80.java | 2 +- .../createTable/OracleCreateTableTest81.java | 2 +- .../createTable/OracleCreateTableTest82.java | 2 +- .../createTable/OracleCreateTableTest83.java | 4 +- .../createTable/OracleCreateTableTest84.java | 4 +- .../createTable/OracleCreateTableTest85.java | 1 - .../createTable/OracleCreateTableTest86.java | 3 - .../createTable/OracleCreateTableTest87.java | 2 - .../createTable/OracleCreateTableTest88.java | 2 - .../createTable/OracleCreateTableTest89.java | 2 - .../createTable/OracleCreateTableTest9.java | 11 +- .../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 - .../sql/oracle/insert/OracleInsertTest.java | 8 +- .../sql/oracle/insert/OracleInsertTest1.java | 8 +- .../sql/oracle/insert/OracleInsertTest10.java | 11 +- .../sql/oracle/insert/OracleInsertTest11.java | 9 +- .../sql/oracle/insert/OracleInsertTest12.java | 19 +- .../sql/oracle/insert/OracleInsertTest13.java | 13 +- .../sql/oracle/insert/OracleInsertTest14.java | 13 +- .../sql/oracle/insert/OracleInsertTest15.java | 13 +- .../sql/oracle/insert/OracleInsertTest16.java | 13 +- .../sql/oracle/insert/OracleInsertTest17.java | 9 +- .../sql/oracle/insert/OracleInsertTest18.java | 9 +- .../sql/oracle/insert/OracleInsertTest19.java | 9 +- .../sql/oracle/insert/OracleInsertTest2.java | 18 +- .../insert/OracleInsertTest20_first.java | 4 +- .../OracleInsertTest21_encoding_error.java | 3 +- .../sql/oracle/insert/OracleInsertTest22.java | 3 +- .../sql/oracle/insert/OracleInsertTest3.java | 13 +- .../sql/oracle/insert/OracleInsertTest4.java | 37 ++- .../sql/oracle/insert/OracleInsertTest5.java | 7 +- .../sql/oracle/insert/OracleInsertTest6.java | 7 +- .../sql/oracle/insert/OracleInsertTest7.java | 7 +- .../sql/oracle/insert/OracleInsertTest8.java | 7 +- .../sql/oracle/insert/OracleInsertTest9.java | 17 +- .../bvt/sql/oracle/issues/Issue5241.java | 4 - .../bvt/sql/oracle/issues/Issue5267.java | 2 - .../bvt/sql/oracle/issues/Issue5631.java | 2 - .../bvt/sql/oracle/issues/Issue5891.java | 6 +- .../bvt/sql/oracle/issues/Issue5966.java | 6 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_0.java | 3 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_1.java | 3 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_2.java | 3 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_3.java | 3 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_4.java | 7 +- .../druid/bvt/sql/oracle/pl/Oracle_pl_5.java | 3 +- .../sql/oracle/pl/Oracle_pl_basic_loop_0.java | 3 +- .../sql/oracle/pl/Oracle_pl_basic_loop_1.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_case_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_case_1.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_case_2.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_0.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_1.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_2.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_3.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_4.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_5.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_6.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_7.java | 3 +- .../sql/oracle/pl/Oracle_pl_exception_8.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_exit_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_exit_1.java | 3 +- .../sql/oracle/pl/Oracle_pl_external_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_for_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_for_1.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_for_2.java | 7 +- .../bvt/sql/oracle/pl/Oracle_pl_for_3.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_for_4.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_forall_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_if_0.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_if_1.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_if_2.java | 3 +- .../bvt/sql/oracle/pl/Oracle_pl_if_3.java | 3 +- .../sql/oracle/pl/Oracle_pl_open_for_0.java | 3 +- .../oracle/pl/Oracle_pl_param_inout_0.java | 3 +- .../sql/oracle/pl/Oracle_pl_while_loop.java | 3 +- .../bvt/sql/oracle/pl/oracle_pl_open_1.java | 3 +- .../select/OracleSelectForUpdateTest.java | 7 - .../sql/oracle/select/OracleSelectTest1.java | 2 - .../sql/oracle/select/OracleSelectTest10.java | 9 +- .../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 | 10 - .../oracle/select/OracleSelectTest108.java | 2 - .../oracle/select/OracleSelectTest109.java | 6 - .../sql/oracle/select/OracleSelectTest11.java | 35 ++- .../oracle/select/OracleSelectTest110.java | 5 - .../oracle/select/OracleSelectTest111.java | 2 - .../oracle/select/OracleSelectTest112.java | 2 - .../oracle/select/OracleSelectTest113.java | 2 - .../oracle/select/OracleSelectTest114.java | 2 - .../oracle/select/OracleSelectTest115.java | 2 - .../oracle/select/OracleSelectTest116.java | 5 +- .../select/OracleSelectTest117_bigunion.java | 4 +- .../oracle/select/OracleSelectTest118.java | 5 +- .../select/OracleSelectTest119_bigand.java | 4 +- .../sql/oracle/select/OracleSelectTest12.java | 12 +- .../oracle/select/OracleSelectTest120.java | 4 +- .../oracle/select/OracleSelectTest121.java | 4 +- .../oracle/select/OracleSelectTest122.java | 4 +- .../oracle/select/OracleSelectTest123.java | 4 +- .../oracle/select/OracleSelectTest124.java | 4 +- .../oracle/select/OracleSelectTest125.java | 4 +- .../oracle/select/OracleSelectTest126.java | 4 +- .../oracle/select/OracleSelectTest127.java | 4 +- .../oracle/select/OracleSelectTest128.java | 4 +- .../oracle/select/OracleSelectTest129.java | 4 +- .../sql/oracle/select/OracleSelectTest13.java | 3 +- .../oracle/select/OracleSelectTest130.java | 4 +- .../oracle/select/OracleSelectTest131.java | 4 +- .../oracle/select/OracleSelectTest132.java | 4 +- .../oracle/select/OracleSelectTest133.java | 4 +- .../oracle/select/OracleSelectTest134.java | 4 +- .../oracle/select/OracleSelectTest135.java | 4 +- .../sql/oracle/select/OracleSelectTest14.java | 3 +- .../sql/oracle/select/OracleSelectTest15.java | 3 +- .../sql/oracle/select/OracleSelectTest16.java | 3 +- .../sql/oracle/select/OracleSelectTest17.java | 3 +- .../sql/oracle/select/OracleSelectTest18.java | 27 +- .../sql/oracle/select/OracleSelectTest19.java | 23 +- .../sql/oracle/select/OracleSelectTest2.java | 26 +- .../sql/oracle/select/OracleSelectTest20.java | 11 +- .../sql/oracle/select/OracleSelectTest21.java | 33 ++- .../sql/oracle/select/OracleSelectTest22.java | 3 +- .../sql/oracle/select/OracleSelectTest23.java | 3 +- .../sql/oracle/select/OracleSelectTest24.java | 3 +- .../sql/oracle/select/OracleSelectTest25.java | 3 +- .../sql/oracle/select/OracleSelectTest26.java | 1 - .../sql/oracle/select/OracleSelectTest27.java | 5 +- .../sql/oracle/select/OracleSelectTest28.java | 1 - .../sql/oracle/select/OracleSelectTest29.java | 1 - .../sql/oracle/select/OracleSelectTest3.java | 12 +- .../sql/oracle/select/OracleSelectTest30.java | 13 +- .../sql/oracle/select/OracleSelectTest31.java | 13 +- .../sql/oracle/select/OracleSelectTest32.java | 3 +- .../sql/oracle/select/OracleSelectTest33.java | 7 +- .../sql/oracle/select/OracleSelectTest34.java | 28 +- .../sql/oracle/select/OracleSelectTest35.java | 13 +- .../sql/oracle/select/OracleSelectTest36.java | 3 +- .../sql/oracle/select/OracleSelectTest37.java | 3 +- .../sql/oracle/select/OracleSelectTest38.java | 3 +- .../sql/oracle/select/OracleSelectTest39.java | 3 +- .../sql/oracle/select/OracleSelectTest4.java | 10 +- .../sql/oracle/select/OracleSelectTest40.java | 41 ++- .../sql/oracle/select/OracleSelectTest41.java | 49 ++-- .../sql/oracle/select/OracleSelectTest42.java | 13 +- .../sql/oracle/select/OracleSelectTest43.java | 8 +- .../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 | 5 +- .../sql/oracle/select/OracleSelectTest51.java | 7 +- .../sql/oracle/select/OracleSelectTest52.java | 7 +- .../sql/oracle/select/OracleSelectTest53.java | 7 +- .../sql/oracle/select/OracleSelectTest54.java | 7 +- .../sql/oracle/select/OracleSelectTest55.java | 7 +- .../sql/oracle/select/OracleSelectTest56.java | 3 +- .../sql/oracle/select/OracleSelectTest57.java | 1 - .../sql/oracle/select/OracleSelectTest58.java | 3 +- .../sql/oracle/select/OracleSelectTest59.java | 3 +- .../sql/oracle/select/OracleSelectTest6.java | 11 +- .../sql/oracle/select/OracleSelectTest60.java | 3 +- .../sql/oracle/select/OracleSelectTest61.java | 3 +- .../sql/oracle/select/OracleSelectTest62.java | 3 +- .../OracleSelectTest63_with_recursive.java | 3 +- .../OracleSelectTest64_with_recursive.java | 3 +- .../select/OracleSelectTest65_error.java | 2 +- .../select/OracleSelectTest66_not_eq.java | 3 +- .../sql/oracle/select/OracleSelectTest67.java | 3 +- .../sql/oracle/select/OracleSelectTest68.java | 3 +- .../sql/oracle/select/OracleSelectTest69.java | 3 +- .../sql/oracle/select/OracleSelectTest7.java | 9 +- .../sql/oracle/select/OracleSelectTest70.java | 3 +- .../sql/oracle/select/OracleSelectTest71.java | 3 +- .../sql/oracle/select/OracleSelectTest72.java | 3 +- .../sql/oracle/select/OracleSelectTest73.java | 3 +- .../select/OracleSelectTest74_translate.java | 3 +- .../select/OracleSelectTest75_comment.java | 3 +- .../select/OracleSelectTest76_brace.java | 3 +- .../sql/oracle/select/OracleSelectTest77.java | 3 +- .../sql/oracle/select/OracleSelectTest78.java | 3 +- .../sql/oracle/select/OracleSelectTest79.java | 4 +- .../sql/oracle/select/OracleSelectTest8.java | 7 +- .../sql/oracle/select/OracleSelectTest80.java | 4 +- .../select/OracleSelectTest81_join_brace.java | 5 +- .../OracleSelectTest82_wmsysconcat.java | 4 +- .../OracleSelectTest83_number_negative.java | 4 +- .../oracle/select/OracleSelectTest84_as.java | 4 +- .../oracle/select/OracleSelectTest85_in.java | 4 +- .../select/OracleSelectTest86_comment.java | 3 +- .../OracleSelectTest86_wmsys_wmconat.java | 5 +- .../select/OracleSelectTest87_bindvar.java | 3 +- .../select/OracleSelectTest88_bindvar.java | 3 +- .../select/OracleSelectTest89_condition.java | 5 +- .../sql/oracle/select/OracleSelectTest9.java | 13 +- .../select/OracleSelectTest90_isof.java | 5 +- .../sql/oracle/select/OracleSelectTest91.java | 5 +- .../select/OracleSelectTest92_lexer.java | 5 +- .../select/OracleSelectTest93_model.java | 5 +- .../sql/oracle/select/OracleSelectTest94.java | 5 +- .../select/OracleSelectTest95_pivot.java | 5 +- .../select/OracleSelectTest96_pivot.java | 5 +- .../OracleSelectTest97_wmsys_wmconat.java | 5 +- .../sql/oracle/select/OracleSelectTest98.java | 3 - .../sql/oracle/select/OracleSelectTest99.java | 3 - .../OracleSelectTest_connect_by_root.java | 3 - ...tTest_hierarchical_CONNECT_BY_ISCYCLE.java | 3 +- .../select/OracleSelectTest_issue_5109.java | 1 - .../oracle/select/OracleSelectTest_param.java | 2 +- .../sql/oracle/select/OracleSysdateTest.java | 4 - .../tomysql/OracleToMySql_PageTest.java | 17 +- .../tomysql/OracleToMySql_PageTest1.java | 21 +- .../tomysql/OracleToMySql_PageTest2.java | 15 +- .../visitor/ExportParameterDotNumberTest.java | 12 +- .../visitor/OracleASTVisitorAdapterTest.java | 7 +- .../OracleOutputVisitorTest_Aggregate.java | 9 +- .../OracleOutputVisitorTest_PrettyFormat.java | 11 +- .../OracleOutputVisitorTest_dblink.java | 10 +- .../OracleOutputVisitorTest_delete.java | 9 +- .../OracleOutputVisitorTest_forupdate.java | 9 +- .../OracleOutputVisitorTest_orderBy.java | 9 +- .../OracleOutputVisitorTest_selectJoin.java | 9 +- ...acleParameterizedOutputVisitorTest_01.java | 1 - ...acleParameterizedOutputVisitorTest_02.java | 4 - .../oracle/visitor/OracleResourceTest.java | 25 +- .../visitor/OracleSchemaStatVisitorTest1.java | 10 +- .../visitor/OracleSchemaStatVisitorTest2.java | 11 +- .../visitor/OracleSchemaStatVisitorTest3.java | 10 +- .../visitor/OracleSchemaStatVisitorTest4.java | 10 +- .../visitor/OracleSchemaStatVisitorTest5.java | 9 +- .../visitor/OracleSchemaStatVisitorTest6.java | 13 +- .../visitor/OracleSchemaStatVisitorTest7.java | 11 +- ...acleSchemaStatVisitorTest8_merge_into.java | 2 - .../OracleSchemaStatVisitorTest_Delete.java | 10 +- .../OracleSchemaStatVisitorTest_Subquery.java | 10 +- ...OracleSchemaStatVisitorTest_Subquery2.java | 10 +- .../OracleSchemaStatVisitorTest_Update.java | 10 +- .../bvt/sql/phoenix/PhoenixUpsertTest.java | 3 - .../bvt/sql/phoenix/PhoenixUpsertTest_1.java | 1 - .../bvt/sql/phoenix/PhoenixUpsertTest_2.java | 1 - .../sql/phoenix/PhoenixUpsertTest_std.java | 1 - .../druid/bvt/sql/polardbx/PolarDBXTest.java | 6 +- .../postgresql/PGASTVisitorAdapterTest.java | 1 - .../bvt/sql/postgresql/PGCommentTest.java | 7 +- .../druid/bvt/sql/postgresql/PGDoSQLTest.java | 29 +- .../PGExportParameterVisitorTest.java | 10 +- .../PGExportParameterVisitorTest1.java | 8 +- .../postgresql/datatypes/BitStringTest.java | 3 - .../sql/postgresql/datatypes/BitsTest.java | 1 - .../sql/postgresql/datatypes/BooleanTest.java | 5 +- .../postgresql/datatypes/TimestampTest.java | 1 - .../sql/postgresql/expr/AliasTest_Type.java | 1 - .../bvt/sql/postgresql/expr/ArrayTest.java | 5 - .../bvt/sql/postgresql/expr/BoxTest.java | 4 - .../bvt/sql/postgresql/expr/CidrTest.java | 5 - .../bvt/sql/postgresql/expr/CircleTest.java | 5 - .../sql/postgresql/expr/ExtractTest_Year.java | 1 - .../bvt/sql/postgresql/expr/InetTest.java | 5 - .../sql/postgresql/expr/LineSegmentsTest.java | 3 - .../bvt/sql/postgresql/expr/MacAddrTest.java | 4 - .../bvt/sql/postgresql/expr/PolygonTest.java | 5 - .../bvt/sql/postgresql/expr/PolygonTest2.java | 5 - .../bvt/sql/postgresql/issues/Issue3538.java | 22 +- .../bvt/sql/postgresql/issues/Issue4442.java | 1 - .../bvt/sql/postgresql/issues/Issue5287.java | 10 - .../bvt/sql/postgresql/issues/Issue5366.java | 8 +- .../bvt/sql/postgresql/issues/Issue5412.java | 11 +- .../bvt/sql/postgresql/issues/Issue5444.java | 7 +- .../bvt/sql/postgresql/issues/Issue5474.java | 5 - .../bvt/sql/postgresql/issues/Issue5710.java | 6 +- .../bvt/sql/postgresql/issues/Issue5752.java | 7 +- .../bvt/sql/postgresql/issues/Issue5760.java | 8 +- .../bvt/sql/postgresql/issues/Issue5780.java | 7 +- .../bvt/sql/postgresql/issues/Issue5822.java | 6 +- .../bvt/sql/postgresql/issues/Issue5844.java | 11 +- .../bvt/sql/postgresql/issues/Issue5847.java | 6 +- .../bvt/sql/postgresql/issues/Issue5870.java | 6 +- .../bvt/sql/postgresql/issues/Issue5895.java | 6 +- .../bvt/sql/postgresql/issues/Issue5909.java | 6 +- .../bvt/sql/postgresql/issues/Issue5922.java | 6 +- .../pl/PGGetDiagnosticsStatementTest.java | 30 +-- .../sql/presto/PrestoAlterTableRename_0.java | 1 - .../druid/bvt/sql/presto/PrestoSelect_0.java | 5 +- .../bvt/sql/presto/TrinoResourceTest.java | 5 +- .../sql/redshift/RedshiftResourceTest.java | 1 - .../druid/bvt/sql/refactor/ClearSchema_0.java | 4 - .../sql/repository/OracleJoinResolveTest.java | 4 +- .../OracleJoinResolveTest_1_fk.java | 2 - .../OracleJoinResolveTest_2_join.java | 4 +- .../bvt/sql/schemaStat/SchemaStatTest.java | 2 - .../bvt/sql/schemaStat/SchemaStatTest10.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest12.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest2.java | 2 - .../SchemaStatTest21_issue3980.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest3.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest4.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest5.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest6.java | 2 - .../bvt/sql/schemaStat/SchemaStatTest7.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest8.java | 1 - .../bvt/sql/schemaStat/SchemaStatTest9.java | 1 - .../bvt/sql/spark/SparkKeywordsTest.java | 3 - .../bvt/sql/sqlite/SQLite_SelectTest_0.java | 3 - .../bvt/sql/sqlite/SQLite_SelectTest_1.java | 1 - .../bvt/sql/sqlite/SQLite_SelectTest_2.java | 1 - ...MSSQLServerExportParameterVisitorTest.java | 11 +- ...LServerParameterizedOutputVisitorTest.java | 19 +- ...erverParameterizedOutputVisitorTest_1.java | 6 +- ...erverParameterizedOutputVisitorTest_2.java | 3 - .../sql/starrocks/StarrocksKeywordsTest.java | 6 +- .../bvt/sql/starrocks/issues/Issue5905.java | 2 +- .../bvt/sql/starrocks/issues/Issue6029.java | 2 - .../sql/supersql/SuperSqlResourceTest.java | 1 - .../bvt/sql/synapse/SynapseResourceTest.java | 16 +- .../druid/bvt/stat/DruidStatServiceTest.java | 44 ++- .../druid/bvt/stat/DruidStatServiceTest2.java | 1 - .../druid/bvt/stat/JdbcTraceManagerTest.java | 3 +- .../DruidConnectionProviderTest.java | 10 +- .../http/StatViewSerlvetTest_allow.java | 7 +- .../http/StatViewServletTest_resetEnable.java | 9 +- .../http/UserAgentAndroid_4_0_3_Test.java | 5 +- .../http/UserAgentAndroid_4_0_3_Test_2.java | 5 +- .../http/UserAgentAndroid_4_0_4_Test.java | 5 +- .../http/UserAgentAndroid_4_1_Test.java | 5 +- .../http/UserAgentAndroid_4_2_Test_2.java | 5 +- .../http/UserAgentAndroid_4_3_Test_2.java | 5 +- .../bvt/support/http/UserAgentBotStat.java | 6 +- .../bvt/support/http/UserAgentMacTest.java | 6 +- .../druid/bvt/support/http/UserAgentTest.java | 5 +- .../support/http/UserAgentWin8ChromeTest.java | 6 +- .../bvt/support/http/UserAgentWin8IETest.java | 6 +- .../support/http/UserAgentWin8IETest_2.java | 6 +- .../bvt/support/http/UserAgentWindows.java | 5 +- .../bvt/support/http/WebStatFilterTest.java | 17 +- .../bvt/support/http/WebStatFilterTest2.java | 29 +- .../WebStatFilterTest3_WebURIStatNull.java | 21 +- .../bvt/support/http/util/IPRangeTest.java | 6 +- .../ibatis/DruidDataSourceFactoryTest.java | 6 +- .../bvt/support/json/JSONParserTest.java | 8 +- .../bvt/support/json/JSONParserTest2.java | 11 +- .../bvt/support/json/JSONParserTest3.java | 9 +- .../bvt/support/json/JSONParserTest5.java | 3 +- .../JakartaCommonsLoggingImplTest.java | 6 +- .../support/logging/Jdk14LoggingImplTest.java | 6 +- .../bvt/support/logging/Log4jImplTest.java | 6 +- .../support/logging/NoLoggingImplTest.java | 6 +- .../bvt/support/logging/SLF4JImplTest.java | 6 +- .../odps/udf/ExportConditionsTest.java | 4 - .../odps/udf/ExportConditionsTest2.java | 4 - .../odps/udf/ExportConditionsTest3.java | 4 - .../odps/udf/ExportConditionsTest4.java | 4 - .../odps/udf/ExportConditionsTest5.java | 4 - .../odps/udf/ExportConditionsTest6.java | 4 - .../bvt/support/profile/ProfilerTest.java | 5 +- .../support/spring/DruidLobCreatorTest.java | 10 +- .../support/spring/DruidLobHandlerTest.java | 9 +- .../bvt/utils/DaemonThreadFactoryTest.java | 7 +- .../druid/bvt/utils/DruidWebUtilsTest.java | 10 +- .../druid/bvt/utils/HistogramTest.java | 5 +- .../druid/bvt/utils/JSONWriterTest.java | 24 +- .../druid/bvt/utils/JdbcUtilsTest.java | 14 +- .../druid/bvt/utils/JdbcUtilsTest1.java | 10 +- .../druid/bvt/utils/JdbcUtilsTest2.java | 3 - .../bvt/utils/JdbcUtilsTest_for_odps.java | 4 - .../druid/bvt/utils/JdbcUtils_driver.java | 22 +- .../druid/bvt/utils/LocalResultSetTest.java | 8 +- .../demo/sql/CreateTableSetSchemaDemo.java | 5 - .../druid/demo/sql/Demo_for_issue_1815.java | 1 - .../druid/demo/sql/ExportParameters.java | 6 +- .../com/alibaba/druid/demo/sql/Issue2038.java | 2 - .../druid/demo/sql/MySqlVisitorDemo.java | 3 - .../druid/demo/sql/OracleVisitorDemo.java | 1 - .../alibaba/druid/demo/sql/PGVisitorDemo.java | 2 - .../druid/demo/sql/SchemaStatTest_odps.java | 3 - .../filter/config/ConfigFileGenerator.java | 15 +- .../druid/kylin/KylinDriverSupportTest.java | 1 - .../druid/mysql/MySqlBigTableTest.java | 7 +- .../com/alibaba/druid/mysql/MySqlHexTest.java | 12 +- .../alibaba/druid/mysql/MySqlInsertTest.java | 1 - .../druid/mysql/MySql_Connect_test.java | 6 - .../druid/mysql/MySql_Failover_test.java | 2 - .../mysql/MySql_getCreateTableScriptTest.java | 5 - .../alibaba/druid/mysql/MysqlLimitTest.java | 2 - .../druid/mysql/MysqlVarantRefTest.java | 8 - .../alibaba/druid/mysql/QueryTimeoutTest.java | 10 +- ...SelectTest_69_mysql8_windows_function.java | 1 - .../sql/sqlserver/AntlrSqlServerTest.java | 1 - .../oceanbase/OceanBaseOracleXATest.java | 8 +- .../druid/oracle/OracleKillSessionTest.java | 5 - .../druid/oracle/Oracle_PSCacheTest.java | 3 - .../druid/oracle/Oracle_PSCacheTest2.java | 9 +- .../Oracle_getCreateTableScriptTest.java | 3 - .../druid/polardb/PolarDBDataSourceTest.java | 16 +- .../druid/polardb/PolarDBWallFilterTest.java | 8 +- .../druid/polardb2/PolarDB2DbTypeTest.java | 6 +- .../polardb2/PolarDB2WallFilterTest.java | 8 +- .../java/com/alibaba/druid/pool/Case0.java | 9 +- .../java/com/alibaba/druid/pool/Case3.java | 6 +- .../pool/ClosePoolableStatementTest.java | 12 +- .../com/alibaba/druid/pool/CobarTest.java | 6 +- .../alibaba/druid/pool/ConcurrentTest.java | 7 +- .../alibaba/druid/pool/ConcurrentTest2.java | 4 +- .../java/com/alibaba/druid/pool/DBCPTest.java | 8 +- .../druid/pool/DruidDataSourceTest.java | 5 +- .../com/alibaba/druid/pool/DruidTest.java | 1 - .../druid/pool/ExeptionSorterTest.java | 1 - .../java/com/alibaba/druid/pool/MemTest.java | 14 +- .../druid/pool/MySqlValdConnectionTest.java | 5 +- .../OracleConnectionPoolDataSourceTest.java | 1 - .../alibaba/druid/pool/QueryTimeoutTest.java | 9 +- .../TestDruidOraclePreparedStatement.java | 8 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 9 +- ...tIdle3_Concurrent_Starvation_Longtime.java | 13 +- .../com/alibaba/druid/pool/TestMockPerf.java | 4 +- .../com/alibaba/druid/pool/TestMySql.java | 4 +- .../pool/TestOraclePreparedStatement.java | 19 +- .../pool/TestOracle_DruidDataSource.java | 11 +- .../alibaba/druid/pool/TestPoolStatement.java | 8 +- .../com/alibaba/druid/pool/TestRollBack.java | 10 +- .../java/com/alibaba/druid/pool/Test_C2.java | 7 +- .../com/alibaba/druid/pool/Test_kyline.java | 4 +- .../alibaba/druid/pool/bonecp/TestLRU.java | 17 +- .../druid/pool/bonecp/TestPSCache.java | 19 +- .../com/alibaba/druid/pool/dbcp/Test0.java | 6 +- .../druid/pool/dbcp/TestIdleForKylin.java | 11 +- .../com/alibaba/druid/pool/demo/Demo0.java | 7 +- .../pool/ha/HighAvailableDataSourceTest.java | 5 +- .../alibaba/druid/pool/ha/MockDataSource.java | 1 + .../pool/ha/node/FileNodeListenerTest.java | 2 +- .../druid/pool/ha/node/NodeEventTest.java | 2 +- .../druid/pool/ha/node/PoolUpdaterTest.java | 3 +- .../ha/node/ZookeeperNodeListenerTest.java | 1 - .../ha/node/ZookeeperNodeRegisterTest.java | 2 +- .../BaseRandomDataSourceSelectorTest.java | 1 + .../selector/NamedDataSourceSelectorTest.java | 5 +- ...ataSourceSelectorSingleDataSourceTest.java | 15 +- ...andomDataSourceSelectorWithFilterTest.java | 1 + .../alibaba/druid/pool/oceanbase/OBTest.java | 6 +- .../oracle/DruidDataSourceTest_oracle3.java | 15 +- .../druid/pool/oracle/QueryTimeoutTest.java | 10 +- .../pool/postgres/PG_500_connection_Test.java | 16 +- .../alibaba/druid/pool/qa/MySqlTestSuit.java | 10 +- .../pool/ui/DruidDataSourceUIManager.java | 19 +- .../druid/pool/ui/DruidDataStatusPanel.java | 19 +- .../alibaba/druid/postgresql/PGLimitTest.java | 4 +- .../druid/postgresql/PGUpsertTest.java | 1 - .../PG_getCreateTableScriptTest.java | 4 +- .../alibaba/druid/proxy/DruidDriverTest.java | 67 +++-- .../com/alibaba/druid/proxy/TestOracle.java | 13 +- .../com/alibaba/druid/proxy/demo/Demo1.java | 9 +- .../filter/wall/WallPerformanceTest_1.java | 32 ++- .../druid/pvt/pool/AsyncCloseTest.java | 13 +- .../druid/pvt/pool/AsyncCloseTest1.java | 23 +- .../druid/pvt/pool/AsyncCloseTest2.java | 28 +- .../druid/pvt/pool/AsyncCloseTest3.java | 29 +- .../alibaba/druid/pvt/pool/DiscardTest.java | 19 +- .../druid/pvt/pool/Large10ConcurrentTest.java | 16 +- .../alibaba/druid/pvt/pool/Large10KTest.java | 9 +- .../alibaba/druid/pvt/pool/PSCacheTest5.java | 12 +- .../alibaba/druid/pvt/pool/TestAbondon.java | 6 +- .../druid/pvt/pool/TestConcurrent.java | 15 +- .../druid/pvt/pool/TestIdle3_Concurrent.java | 14 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 15 +- .../pool/TestIdle3_Concurrent_Starvation.java | 15 +- .../monitor/MonitorDaoJdbcImplTest.java | 15 +- .../druid/spring/ISequenceService.java | 1 - .../com/alibaba/druid/spring/IUserDao.java | 1 - .../alibaba/druid/spring/IUserService.java | 1 - .../druid/spring/MBeanServerFactoryBean.java | 5 +- .../com/alibaba/druid/spring/SequenceDao.java | 4 +- .../alibaba/druid/spring/SequenceService.java | 7 +- .../druid/spring/SequenceServiceMBean.java | 1 - .../java/com/alibaba/druid/spring/User.java | 1 - .../com/alibaba/druid/spring/UserService.java | 1 - .../java/com/alibaba/druid/sql/DB2Test.java | 9 +- .../com/alibaba/druid/sql/DeleteTest.java | 7 +- .../alibaba/druid/sql/KeywordsMySqlTest.java | 7 +- .../java/com/alibaba/druid/sql/MysqlTest.java | 2 - .../alibaba/druid/sql/OnlineOracleTest3.java | 9 +- .../com/alibaba/druid/sql/OnlineSQLTest.java | 17 +- .../com/alibaba/druid/sql/OnlineSQLTest2.java | 13 +- .../com/alibaba/druid/sql/OracleTest.java | 9 +- .../java/com/alibaba/druid/sql/PGTest.java | 9 +- .../alibaba/druid/sql/SQLExprParserTest.java | 6 +- .../alibaba/druid/sql/SQLParseAssertUtil.java | 6 +- .../com/alibaba/druid/sql/TestMigrate.java | 35 ++- .../alibaba/druid/sql/TestOnlineSQLTest3.java | 7 +- .../com/alibaba/druid/sql/TestTransform.java | 42 ++- .../druid/sql/ast/SQLParameterTest.java | 3 +- .../sql/ast/expr/SQLMethodInvokeExprTest.java | 1 - .../ast/statement/SQLExprStatementTest.java | 5 +- .../ast/statement/SQLUpdateStatementTest.java | 4 +- .../db2/parser/DB2StatementParserTest.java | 1 - .../db2/visitor/DB2OutputVisitorTest.java | 2 - .../h2/visitor/H2OutputVisitorTest.java | 21 +- .../hive/parser/HiveStatementParserTest.java | 4 +- .../MySqlCreateTableStatementTest.java | 7 +- .../oracle/ast/expr/OracleAnalyticTest.java | 3 - .../oracle/parser/OracleCreateTypeTest.java | 16 +- .../parser/OracleParameterParserTest.java | 74 +++--- .../parser/OracleSelectParserUnpivotTest.java | 251 +++++++++--------- .../ast/expr/PGTypeCastExprTest.java | 5 +- .../StarRocksCreateTableParserTest.java | 1 - .../parser/StarRocksStatementParserTest.java | 2 +- .../visitor/StarRocksOutputVisitorTest.java | 4 - .../alibaba/druid/sql/issues/Issue3989.java | 9 +- .../alibaba/druid/sql/issues/Issue4610.java | 33 +-- .../alibaba/druid/sql/issues/Issue5317.java | 3 - .../alibaba/druid/sql/mysql/demo/Demo0.java | 9 +- .../com/alibaba/druid/sql/odps/Issue2102.java | 1 - .../alibaba/druid/sql/odps/OdpsFileTest.java | 20 +- .../alibaba/druid/sql/oracle/demo/Demo0.java | 9 +- .../alibaba/druid/sql/oracle/demo/Demo1.java | 14 +- .../alibaba/druid/sql/oracle/demo/Demo2.java | 16 +- .../alibaba/druid/sql/oracle/demo/Demo3.java | 18 +- .../druid/sql/oracle/demo/Demo_casewhen.java | 3 - .../druid/sql/oracle/demo/Demo_getTable.java | 1 - .../sql/oracle/demo/OracleResourceTest.java | 6 - .../sql/oracle/demo/OracleResourceTest2.java | 1 - .../alibaba/druid/sql/parser/CommentTest.java | 7 +- .../sql/parser/DeallocatePrepareTest.java | 5 +- .../druid/sql/parser/DialectFeatureTest.java | 4 +- ...ndParameterizedVisitor4OracleTestCase.java | 10 +- ...rtAndParameterizedVisitor4db2TestCase.java | 16 +- ...ExportAndParameterizedVisitorTestCase.java | 8 +- .../druid/sql/parser/LateralViewTest.java | 3 +- .../druid/sql/parser/LimitOffsetSQLTest.java | 8 - .../sql/parser/LoadDataSQLParserTest.java | 4 +- .../druid/sql/parser/MySQLCharSetTest.java | 3 - .../sql/parser/OraclePivotCloneTest.java | 5 - .../sql/parser/OracleSqlCommentTest.java | 11 +- .../alibaba/druid/sql/parser/PGAlterTest.java | 7 - .../druid/sql/parser/PGIntervalSQLTest.java | 3 - .../alibaba/druid/sql/parser/PerfTest.java | 15 +- .../druid/sql/parser/SQLCommentTest.java | 12 +- .../druid/sql/parser/SQLLexerTest2.java | 4 - .../druid/sql/parser/SQLMergeTest.java | 8 +- .../druid/sql/parser/SqlserverAlterTest.java | 8 +- .../sql/parser/SqlserverGroupByTest.java | 3 +- .../performance/TestSelectPerformance.java | 9 +- .../com/alibaba/druid/sql/test/TestUtils.java | 16 +- .../alibaba/druid/stat/AtomicMemoryTest.java | 4 +- .../alibaba/druid/stat/HashMapMemoryTest.java | 4 +- .../druid/stat/HistogramMemoryTest.java | 4 +- .../alibaba/druid/stat/JdbcSqlStatTest.java | 4 +- .../alibaba/druid/stat/JdbcSqlStatTest1.java | 4 +- .../com/alibaba/druid/stat/MemoryTest.java | 4 +- .../java/com/alibaba/druid/stat/PerfTest.java | 4 +- .../druid/stat/StatAnnotationTest.java | 13 +- .../com/alibaba/druid/stat/TestBeidou.java | 4 +- .../com/alibaba/druid/stat/TestOracle.java | 4 +- .../druid/stat/WebSessionStatTest.java | 40 ++- .../druid/stat/WebURIStatMemoryTest.java | 7 +- .../http/ResourceServletSsoTestCase.java | 3 +- .../support/http/ResourceServletTestCase.java | 1 - .../alibaba/druid/test/AlibDriverTest.java | 1 - .../java/com/alibaba/druid/test/AlibTest.java | 3 - .../druid/test/NutzTransactionTest.java | 9 +- .../alibaba/druid/test/OdpsSelectTest6.java | 14 +- .../com/alibaba/druid/test/QuartzTest.java | 9 +- .../druid/test/RaspberryPiMySqlTest.java | 6 - .../alibaba/druid/test/ThreadLocalCache.java | 3 +- .../druid/test/util/OracleMockConnection.java | 50 ++-- .../test/util/OracleMockConnectionJdbc3.java | 5 +- .../druid/test/util/OracleMockDriver.java | 7 +- .../util/OracleMockDriverConnectFailed.java | 1 - .../test/util/OracleMockDriverJdbc3.java | 7 +- .../util/OracleMockPreparedStatement.java | 46 +--- .../OracleMockPreparedStatementJdbc3.java | 1 - .../druid/test/util/OracleMockResultSet.java | 34 +-- .../test/util/OracleMockResultSetJdbc3.java | 1 - .../druid/test/util/OracleUtilsTest.java | 12 +- .../test/wall/MySqlResourceWallTest.java | 16 +- .../alibaba/druid/test/wall/ResourceTest.java | 10 +- .../druid/util/ConcurrentLruCacheTest.java | 6 - .../druid/util/DruidDataSourceUtilsTest.java | 14 +- .../alibaba/druid/util/MapComparatorTest.java | 8 +- .../alibaba/druid/util/MySqlUtilsTest.java | 3 +- .../druid/util/ServletPathMathcherTest.java | 5 +- .../alibaba/druid/util/StringUtilsTest.java | 1 - .../boot3/demo/configurer/InitConfigurer.java | 7 +- .../configurer/MultiDataSourceConfigurer.java | 4 +- .../druid/spring/boot3/demo/dao/UserDao.java | 5 +- .../boot3/demo/service/UserService.java | 1 - .../boot3/demo/web/DruidStatController.java | 2 +- .../spring/boot3/demo/web/UserController.java | 3 +- .../boot3/testcase/DruidFilterTestCase.java | 6 +- .../DruidMultiDataSourceTestCase.java | 1 + .../boot3/testcase/Issue1796TestCase.java | 1 - .../boot/demo/configurer/InitConfigurer.java | 2 +- .../configurer/MultiDataSourceConfigurer.java | 4 +- .../druid/spring/boot/demo/dao/UserDao.java | 2 - .../spring/boot/demo/service/UserService.java | 1 - .../boot/demo/service/UserServiceImpl.java | 5 +- .../boot/demo/web/DruidStatController.java | 2 +- .../spring/boot/demo/web/UserController.java | 3 +- .../boot/testcase/DruidFilterTestCase.java | 5 +- .../DruidMultiDataSourceTestCase.java | 1 + pom.xml | 2 +- 3176 files changed, 7794 insertions(+), 16606 deletions(-) diff --git a/core/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java b/core/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java index 19ff8db8a..6c458756c 100644 --- a/core/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java +++ b/core/src/main/java/com/alibaba/druid/mock/handler/MySqlMockExecuteHandlerImpl.java @@ -38,7 +38,7 @@ public class MySqlMockExecuteHandlerImpl implements MockExecuteHandler { @Override public ResultSet executeQuery(MockStatementBase statement, String sql) throws SQLException { SQLStatementParser parser = new MySqlStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); if (stmtList.size() > 1) { throw new SQLException("not support multi-statment. " + sql); diff --git a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index f73671133..a43c9bf96 100644 --- a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2868,7 +2868,7 @@ public class DruidDataSource extends DruidAbstractDataSource if (timeBetweenEvictionRunsMillis > 0) { Thread.sleep(timeBetweenEvictionRunsMillis); } else { - Thread.sleep(1000); // + Thread.sleep(1000); } if (Thread.interrupted()) { diff --git a/core/src/main/java/com/alibaba/druid/stat/TableStat.java b/core/src/main/java/com/alibaba/druid/stat/TableStat.java index b6c395e75..ba98ffe8b 100644 --- a/core/src/main/java/com/alibaba/druid/stat/TableStat.java +++ b/core/src/main/java/com/alibaba/druid/stat/TableStat.java @@ -444,7 +444,7 @@ public class TableStat { private boolean having; private boolean join; private boolean primaryKey; // for ddl - private boolean unique; // + private boolean unique; private boolean update; private Map attributes = new HashMap(); private transient String fullName; @@ -631,7 +631,7 @@ public class TableStat { DropIndex(256), // CreateIndex(512), // Replace(1024), - DESC(2048); // + DESC(2048); public final int mark; diff --git a/core/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java b/core/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java index 907d976f7..8bd5179c5 100644 --- a/core/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java +++ b/core/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java @@ -813,7 +813,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { public List listApp(String domain) throws SQLException { List list = new ArrayList(); - String sql = "select id, domain, app from druid_app " // + String sql = "select id, domain, app from druid_app " + " where domain = ?"; Connection conn = null; PreparedStatement stmt = null; @@ -838,7 +838,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { } public MonitorApp findApp(String domain, String app) throws SQLException { - String sql = "select id, domain, app from druid_app " // + String sql = "select id, domain, app from druid_app " + " where domain = ? and app = ?"; Connection conn = null; PreparedStatement stmt = null; @@ -876,7 +876,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { public List listCluster(String domain, String app) throws SQLException { List list = new ArrayList(); - String sql = "select id, domain, app, cluster from druid_cluster " // + String sql = "select id, domain, app, cluster from druid_cluster " + " where domain = ?"; if (app != null) { @@ -919,7 +919,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { } public MonitorCluster findCluster(String domain, String app, String cluster) throws SQLException { - String sql = "select id, domain, app, cluster from druid_cluster " // + String sql = "select id, domain, app, cluster from druid_cluster " + " where domain = ? and app = ? and cluster = ?"; Connection conn = null; PreparedStatement stmt = null; @@ -960,19 +960,19 @@ public class MonitorDaoJdbcImpl implements MonitorDao { Date startTime, long pid) throws SQLException { MonitorInstance monitorInst = findInst(domain, app, cluster, host); if (monitorInst == null) { - String sql = "insert into druid_inst (domain, app, cluster, host, ip, lastActiveTime, lastPID) " // + String sql = "insert into druid_inst (domain, app, cluster, host, ip, lastActiveTime, lastPID) " + " values (?, ?, ?, ?, ?, ?, ?)"; JdbcUtils.execute(dataSource, sql, domain, app, cluster, host, ip, startTime, pid); } else { - String sql = "update druid_inst set ip = ?, lastActiveTime = ?, lastPID = ? " // + String sql = "update druid_inst set ip = ?, lastActiveTime = ?, lastPID = ? " + " 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 = ? " // + String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " + + " where domain = ? and app = ? and cluster = ? and host = ? " + " limit 1"; Connection conn = null; PreparedStatement stmt = null; @@ -1002,7 +1002,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { public List listInst(String domain, String app, String cluster) throws SQLException { List list = new ArrayList(); - String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " // + String sql = "select id, domain, app, cluster, host, ip, lastActiveTime, lastPID from druid_inst " + "where domain = ?"; if (app != null) { diff --git a/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java index d9a3c2651..8ac79e1f8 100644 --- a/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -880,7 +880,7 @@ public final class JdbcUtils implements JdbcConstants { StringBuilder sql = new StringBuilder() // .append("insert into ") // .append(tableName) // - .append("("); // + .append("("); int nameCount = 0; for (String name : names) { diff --git a/core/src/test/java/com/alibaba/druid/Bug_for_alibank.java b/core/src/test/java/com/alibaba/druid/Bug_for_alibank.java index 2361fb9ca..3bcfe2cf0 100644 --- a/core/src/test/java/com/alibaba/druid/Bug_for_alibank.java +++ b/core/src/test/java/com/alibaba/druid/Bug_for_alibank.java @@ -15,10 +15,8 @@ */ package com.alibaba.druid; -import junit.framework.TestCase; - import com.alibaba.druid.support.json.JSONUtils; - +import junit.framework.TestCase; public class Bug_for_alibank extends TestCase { public void test_bug() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/DBCPTest.java b/core/src/test/java/com/alibaba/druid/DBCPTest.java index 81f3b6c02..01c881d19 100644 --- a/core/src/test/java/com/alibaba/druid/DBCPTest.java +++ b/core/src/test/java/com/alibaba/druid/DBCPTest.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid; -import java.sql.Connection; -import java.util.concurrent.CountDownLatch; - +import com.alibaba.druid.mock.MockDriver; import junit.framework.TestCase; - import org.apache.commons.dbcp.BasicDataSource; -import com.alibaba.druid.mock.MockDriver; +import java.sql.Connection; +import java.util.concurrent.CountDownLatch; public class DBCPTest extends TestCase { public void test_max() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java b/core/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java index f4ba3e3e2..bbc682c23 100644 --- a/core/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java +++ b/core/src/test/java/com/alibaba/druid/DragoonMetaInfTest.java @@ -15,6 +15,8 @@ */ package com.alibaba.druid; +import junit.framework.TestCase; + import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -23,8 +25,6 @@ import java.net.URL; import java.util.Enumeration; import java.util.Properties; -import junit.framework.TestCase; - public class DragoonMetaInfTest extends TestCase { public void test_0() throws Exception { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); diff --git a/core/src/test/java/com/alibaba/druid/LockTest.java b/core/src/test/java/com/alibaba/druid/LockTest.java index 3f51dbabc..435df0c75 100644 --- a/core/src/test/java/com/alibaba/druid/LockTest.java +++ b/core/src/test/java/com/alibaba/druid/LockTest.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid; +import junit.framework.TestCase; + import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import junit.framework.TestCase; - public class LockTest extends TestCase { public void test_0() throws Exception { Lock lock = new ReentrantLock(); diff --git a/core/src/test/java/com/alibaba/druid/TestForZY.java b/core/src/test/java/com/alibaba/druid/TestForZY.java index 7772b1488..90d705743 100644 --- a/core/src/test/java/com/alibaba/druid/TestForZY.java +++ b/core/src/test/java/com/alibaba/druid/TestForZY.java @@ -18,7 +18,6 @@ package com.alibaba.druid; import java.util.HashMap; import java.util.Map; - public class TestForZY { public void foo() throws Exception { Map> m = new HashMap>(); diff --git a/core/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java b/core/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java index c75265cd1..790831fe6 100644 --- a/core/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java +++ b/core/src/test/java/com/alibaba/druid/TestHibernateCRUDWithTransactional.java @@ -7,5 +7,4 @@ import junit.framework.TestCase; * date 2012-11-26 下午11:35 */ public class TestHibernateCRUDWithTransactional extends TestCase { - } diff --git a/core/src/test/java/com/alibaba/druid/TestIdel3.java b/core/src/test/java/com/alibaba/druid/TestIdel3.java index 427e928db..90ea16ce7 100644 --- a/core/src/test/java/com/alibaba/druid/TestIdel3.java +++ b/core/src/test/java/com/alibaba/druid/TestIdel3.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid; -import java.lang.management.ManagementFactory; -import java.sql.Connection; -import java.util.concurrent.CountDownLatch; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.junit.Assert; import javax.management.ObjectName; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; +import java.lang.management.ManagementFactory; +import java.sql.Connection; +import java.util.concurrent.CountDownLatch; public class TestIdel3 extends TestCase { public void test_idle2() throws Exception { @@ -113,7 +112,6 @@ public class TestIdel3 extends TestCase { Thread.sleep(1000 * 100); dataSource.close(); - } private void concurrent(final DruidDataSource dataSource, int threadCount, final int loopCount) diff --git a/core/src/test/java/com/alibaba/druid/TestLRU.java b/core/src/test/java/com/alibaba/druid/TestLRU.java index 817783e46..a6113782a 100644 --- a/core/src/test/java/com/alibaba/druid/TestLRU.java +++ b/core/src/test/java/com/alibaba/druid/TestLRU.java @@ -15,10 +15,10 @@ */ package com.alibaba.druid; -import java.util.LinkedHashMap; - import junit.framework.TestCase; +import java.util.LinkedHashMap; + public class TestLRU extends TestCase { public void test_lru() throws Exception { LinkedHashMap cache = new LinkedHashMap(100, 0.75f, true); @@ -33,6 +33,5 @@ public class TestLRU extends TestCase { System.out.println(cache); cache.get(3); System.out.println(cache); - } } diff --git a/core/src/test/java/com/alibaba/druid/TestLockCount.java b/core/src/test/java/com/alibaba/druid/TestLockCount.java index c42b9ea01..896444c3d 100644 --- a/core/src/test/java/com/alibaba/druid/TestLockCount.java +++ b/core/src/test/java/com/alibaba/druid/TestLockCount.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid; +import junit.framework.TestCase; +import org.junit.Assert; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.junit.Assert; -import junit.framework.TestCase; - public class TestLockCount extends TestCase { public void test_current() throws Exception { DataSource dataSource = new DataSource(); diff --git a/core/src/test/java/com/alibaba/druid/TestOracle.java b/core/src/test/java/com/alibaba/druid/TestOracle.java index d66062c1c..275f8eb69 100644 --- a/core/src/test/java/com/alibaba/druid/TestOracle.java +++ b/core/src/test/java/com/alibaba/druid/TestOracle.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - public class TestOracle extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/TestOraclePing.java b/core/src/test/java/com/alibaba/druid/TestOraclePing.java index cea60c79f..a6da658de 100644 --- a/core/src/test/java/com/alibaba/druid/TestOraclePing.java +++ b/core/src/test/java/com/alibaba/druid/TestOraclePing.java @@ -15,14 +15,14 @@ */ package com.alibaba.druid; +import junit.framework.TestCase; +import oracle.jdbc.OracleConnection; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; -import oracle.jdbc.OracleConnection; - public class TestOraclePing extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/TestReplaceLicense.java b/core/src/test/java/com/alibaba/druid/TestReplaceLicense.java index b94866942..258dd1ddc 100644 --- a/core/src/test/java/com/alibaba/druid/TestReplaceLicense.java +++ b/core/src/test/java/com/alibaba/druid/TestReplaceLicense.java @@ -15,18 +15,10 @@ */ package com.alibaba.druid; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; - +import com.alibaba.druid.util.Utils; import junit.framework.TestCase; -import com.alibaba.druid.util.Utils; +import java.io.*; public class TestReplaceLicense extends TestCase { private String license; @@ -46,7 +38,6 @@ public class TestReplaceLicense extends TestCase { public void test_0() throws Exception { File file = new File("/usr/alibaba/workspace/druid"); listFile(file); - } public void listFile(File file) throws Exception { @@ -79,7 +70,6 @@ public class TestReplaceLicense extends TestCase { Writer writer = new OutputStreamWriter(out, "utf-8"); writer.write(newContent); writer.close(); - } else { } } } diff --git a/core/src/test/java/com/alibaba/druid/TestRollBack.java b/core/src/test/java/com/alibaba/druid/TestRollBack.java index 55f9b1421..653f89ec7 100644 --- a/core/src/test/java/com/alibaba/druid/TestRollBack.java +++ b/core/src/test/java/com/alibaba/druid/TestRollBack.java @@ -39,10 +39,10 @@ public class TestRollBack { 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: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"; @@ -121,5 +121,4 @@ public class TestRollBack { // abc插了进去,没有回滚 Assert.assertNotNull(dao_druid.fetch("msg", Cnd.where("message", "=", "abc"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/TestSqlServer.java b/core/src/test/java/com/alibaba/druid/TestSqlServer.java index 22fbcf7ac..43dd3cd14 100644 --- a/core/src/test/java/com/alibaba/druid/TestSqlServer.java +++ b/core/src/test/java/com/alibaba/druid/TestSqlServer.java @@ -15,11 +15,10 @@ */ package com.alibaba.druid; -import java.sql.Connection; -import java.sql.DriverManager; - import junit.framework.TestCase; +import java.sql.Connection; +import java.sql.DriverManager; public class TestSqlServer extends TestCase { private String jdbcUrl; diff --git a/core/src/test/java/com/alibaba/druid/TestTraceFilter.java b/core/src/test/java/com/alibaba/druid/TestTraceFilter.java index 01194d2bc..53722595d 100644 --- a/core/src/test/java/com/alibaba/druid/TestTraceFilter.java +++ b/core/src/test/java/com/alibaba/druid/TestTraceFilter.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcTraceManager; import com.alibaba.druid.util.JMXUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; @SuppressWarnings("deprecation") public class TestTraceFilter extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/TestUtil.java b/core/src/test/java/com/alibaba/druid/TestUtil.java index 072161ed1..886104d61 100644 --- a/core/src/test/java/com/alibaba/druid/TestUtil.java +++ b/core/src/test/java/com/alibaba/druid/TestUtil.java @@ -15,18 +15,16 @@ */ package com.alibaba.druid; -import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.lang.management.ManagementFactory; - import javax.management.MBeanServer; import javax.management.ObjectName; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.lang.management.ManagementFactory; + public class TestUtil { public static long getYoungGC() { try { diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java index d56640165..b2d878f2b 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/AsyncClose.java @@ -3,6 +3,7 @@ package com.alibaba.druid.benckmark.pool; import com.alibaba.druid.pool.DruidDataSource; import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -31,6 +32,7 @@ public class AsyncClose { ResultSet rs = ps.executeQuery(); while (rs.next()) { + // Intentionally empty loop } rs.close(); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java index 3b9f51db0..c6bff4d90 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.benckmark.pool; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.text.NumberFormat; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - import com.alibaba.druid.TestUtil; import com.alibaba.druid.pool.DruidDataSource; import com.jolbox.bonecp.BoneCPDataSource; import com.mchange.v2.c3p0.ComboPooledDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.text.NumberFormat; public class Case0 extends TestCase { private String jdbcUrl; @@ -41,7 +39,7 @@ public class Case0 extends TestCase { private int maxIdle = 8; private int maxActive = 8; private String validationQuery = "SELECT 1"; - private boolean testOnBorrow = false; + private boolean testOnBorrow; private long minEvictableIdleTimeMillis = 3000; public final int LOOP_COUNT = 5; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java index 750457bb0..95bfee230 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java @@ -15,6 +15,16 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.jolbox.bonecp.BoneCPDataSource; +import com.mchange.v2.c3p0.ComboPooledDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.sql.Connection; @@ -25,18 +35,6 @@ import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.jolbox.bonecp.BoneCPDataSource; -import com.mchange.v2.c3p0.ComboPooledDataSource; - /** * TestOnBo 类Case1.java的实现描述：TODO 类实现描述 * @@ -261,6 +259,5 @@ public class Case1 extends TestCase { + NumberFormat.getInstance().format(blockedCount) // + " waited " + NumberFormat.getInstance().format(waitedCount) + " physicalConn " + physicalConnStat.get()); - } } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java index 89cf5fc0a..82785cc6f 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case2.java @@ -15,6 +15,14 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.jolbox.bonecp.BoneCPDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.sql.Connection; @@ -22,16 +30,6 @@ import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; -import com.jolbox.bonecp.BoneCPDataSource; - /** * TestOnBo 类Case1.java的实现描述：TODO 类实现描述 * diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java index a866a6864..ee8505906 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java @@ -15,6 +15,15 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.jolbox.bonecp.BoneCPDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; +import org.junit.Assert; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; @@ -23,17 +32,6 @@ import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import javax.sql.DataSource; - -import org.junit.Assert; -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; -import com.jolbox.bonecp.BoneCPDataSource; - public class Case3 extends TestCase { private String jdbcUrl; private String user; @@ -48,7 +46,7 @@ public class Case3 extends TestCase { private int threadCount = 10; private int TEST_COUNT = 3; final int LOOP_COUNT = 1000 * 100; - private boolean testOnBorrow = false; + private boolean testOnBorrow; private String connectionProperties = ""; // "bigStringTryClob=true;clientEncoding=GBK;defaultRowPrefetch=50;serverEncoding=ISO-8859-1"; private String sql = "SELECT 1"; private long timeBetweenEvictionRunsMillis = 60000; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java index 41fec8e6a..5b1cb2df8 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; - public class CaseKylin_Oracle extends TestCase { private String jdbcUrl; private String user; @@ -40,20 +38,20 @@ public class CaseKylin_Oracle extends TestCase { private int maxIdle = 14; private int maxActive = 14; private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; + private String validationQuery; // "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 testOnReturn; 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 validateQuery; private String oracleDriverClass = "com.alibaba.china.jdbc.SimpleDriver"; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java index 3999f218f..8d7047c07 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; - public class CaseKylin_mysql extends TestCase { private String jdbcUrl; private String user; @@ -40,13 +38,13 @@ public class CaseKylin_mysql extends TestCase { private int maxIdle = 20; private int maxActive = 20; private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; + private String validationQuery; // "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 testOnBorrow; + private boolean testOnReturn; private boolean removeAbandoned = true; private int removeAbandonedTimeout = 180; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java index 25e8fb560..98fe89bb3 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java @@ -15,19 +15,18 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; - public class CaseKylin_mysql_idle_1 extends TestCase { private String jdbcUrl; private String user; @@ -38,13 +37,13 @@ public class CaseKylin_mysql_idle_1 extends TestCase { private int maxIdle = 20; private int maxActive = 20; private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; + private String validationQuery; // "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 testOnBorrow; + private boolean testOnReturn; private boolean removeAbandoned = true; private int removeAbandonedTimeout = 180; @@ -71,7 +70,6 @@ public class CaseKylin_mysql_idle_1 extends TestCase { public void test_perf() throws Exception { druid(); - } public void druid() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java index 272c88353..2adfe431e 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java @@ -15,20 +15,19 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; - public class CaseKylin_mysql_idle_2 extends TestCase { private String jdbcUrl; private String user; @@ -39,13 +38,13 @@ public class CaseKylin_mysql_idle_2 extends TestCase { private int maxIdle = 20; private int maxActive = 20; private int maxWait = 60000; - private String validationQuery = null; // "SELECT 1"; + private String validationQuery; // "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 testOnBorrow; + private boolean testOnReturn; private boolean removeAbandoned = true; private int removeAbandonedTimeout = 180; @@ -74,7 +73,6 @@ public class CaseKylin_mysql_idle_2 extends TestCase { public void test_perf() throws Exception { druid(); - } public void druid() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java index 740c7fbed..b3065d638 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Case_Concurrent_50.java @@ -15,32 +15,30 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -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 initialSize; private int minIdle = 3; private int maxIdle = 5; private int maxActive = 10; private String validationQuery = "SELECT 1"; - private boolean testOnBorrow = false; + private boolean testOnBorrow; private long minEvictableIdleTimeMillis = 3000; public final int LOOP_COUNT = 5; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java index b43af24ce..1d4dfe131 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java @@ -15,22 +15,20 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.jolbox.bonecp.BoneCPDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.text.NumberFormat; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; -import com.jolbox.bonecp.BoneCPDataSource; - public class Oracle_Case0 extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java index ee0724429..272de324d 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java @@ -15,22 +15,20 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; +import org.springframework.util.Assert; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; -import org.springframework.util.Assert; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; - public class Oracle_Case3 extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java index 1f1c90766..d5cc895c9 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java @@ -15,6 +15,15 @@ */ package com.alibaba.druid.benckmark.pool; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; +import org.springframework.util.Assert; + +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -23,17 +32,6 @@ import java.sql.Statement; import java.text.NumberFormat; import java.util.concurrent.CountDownLatch; -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; -import org.springframework.util.Assert; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class Oracle_Case4 extends TestCase { private String jdbcUrl; private String user; @@ -46,7 +44,7 @@ public class Oracle_Case4 extends TestCase { private int threadCount = 1; private int loopCount = 5; final int LOOP_COUNT = 1000 * 1; - private boolean testOnBorrow = false; + private boolean testOnBorrow; private boolean preparedStatementCache = true; private int preparedStatementCacheSize = 50; private String properties = "defaultRowPrefetch=50"; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java index de23e8846..66b13e8c8 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/druid/DruidCase0.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.benckmark.pool.druid; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.Statement; - -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; public class DruidCase0 extends TestCase { private DruidDataSource dataSource; @@ -72,5 +70,4 @@ public class DruidCase0 extends TestCase { conn.close(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java b/core/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java index 4183c3400..897bd964c 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/pool/model/TableOperator.java @@ -1,12 +1,12 @@ package com.alibaba.druid.benckmark.pool.model; +import javax.sql.DataSource; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import javax.sql.DataSource; - public class TableOperator { private DataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java index fa65aeb3e..bb8411ef3 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/BenchmarkExecutor.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.benckmark.proxy; +import javax.management.MBeanServer; +import javax.management.ObjectName; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; import java.util.ArrayList; @@ -22,9 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.management.MBeanServer; -import javax.management.ObjectName; - public class BenchmarkExecutor { private int loopCount = 1000; private int executeCount = 10; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java index ec59b0ddd..d12c4b1a2 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/DirectSQLExecutor.java @@ -64,5 +64,4 @@ public class DirectSQLExecutor extends SQLExecutor { public Connection getConnection() throws SQLException { return DriverManager.getConnection(jdbcUrl, user, password); } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java index 92583174e..3318a9773 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java @@ -15,9 +15,8 @@ */ package com.alibaba.druid.benckmark.proxy; -import junit.framework.TestCase; - import com.alibaba.druid.benckmark.proxy.sqlcase.SelectNow; +import junit.framework.TestCase; public class DruidBenchmarkTest extends TestCase { public void test_druid_benchmark() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java index 894c30caa..c507b4ea2 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/TestAtomicPerformance.java @@ -15,10 +15,10 @@ */ package com.alibaba.druid.benckmark.proxy; -import java.util.concurrent.atomic.AtomicInteger; - import junit.framework.TestCase; +import java.util.concurrent.atomic.AtomicInteger; + public class TestAtomicPerformance extends TestCase { public void test_0() throws Exception { AtomicInteger count = new AtomicInteger(); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java index 3078d2f91..01f089231 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.benckmark.proxy.sqlcase; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import org.junit.Assert; - -import com.alibaba.druid.benckmark.proxy.BenchmarkCase; -import com.alibaba.druid.benckmark.proxy.SQLExecutor; - public class Select1 extends BenchmarkCase { private String sql; private Connection conn; @@ -60,5 +59,4 @@ public class Select1 extends BenchmarkCase { conn.close(); conn = null; } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java index 556a11b6b..24047e1df 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.benckmark.proxy.sqlcase; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; - -import org.junit.Assert; - import com.alibaba.druid.benckmark.proxy.BenchmarkCase; import com.alibaba.druid.benckmark.proxy.SQLExecutor; import com.alibaba.druid.util.JdbcUtils; +import org.junit.Assert; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; public class SelectEmptyTable extends BenchmarkCase { private String sql; @@ -86,5 +85,4 @@ public class SelectEmptyTable extends BenchmarkCase { conn.close(); conn = null; } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java index 6d2bd2fab..54b74b9a2 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.benckmark.proxy.sqlcase; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.util.Date; -import org.junit.Assert; - -import com.alibaba.druid.benckmark.proxy.BenchmarkCase; -import com.alibaba.druid.benckmark.proxy.SQLExecutor; - public class SelectNow extends BenchmarkCase { private String sql; private Connection conn; @@ -61,5 +60,4 @@ public class SelectNow extends BenchmarkCase { conn.close(); conn = null; } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java index f143db601..e855444ec 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.benckmark.proxy.sqlcase; +import com.alibaba.druid.benckmark.proxy.BenchmarkCase; +import com.alibaba.druid.benckmark.proxy.SQLExecutor; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import org.junit.Assert; - -import com.alibaba.druid.benckmark.proxy.BenchmarkCase; -import com.alibaba.druid.benckmark.proxy.SQLExecutor; - public class SelectSysUser extends BenchmarkCase { private String sql; private Connection conn; @@ -60,5 +59,4 @@ public class SelectSysUser extends BenchmarkCase { conn.close(); conn = null; } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java index e781ad6eb..330633e07 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import org.apache.ibatis.jdbc.SQL; import java.util.List; @@ -14,7 +13,6 @@ public class MySqlInsertBenchmark extends TestCase { protected void setUp() throws Exception { stmtList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); - } public void test_perf() throws Exception { @@ -42,6 +40,4 @@ public class MySqlInsertBenchmark extends TestCase { long millis = System.currentTimeMillis() - startMillis; System.out.println("millis : " + millis); } - - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java index ba511538b..5836a558c 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlInsertBenchmark_2.java @@ -37,7 +37,6 @@ public class MySqlInsertBenchmark_2 extends TestCase { 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/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java index 93db805b9..808034a94 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain.java @@ -15,15 +15,15 @@ */ package com.alibaba.druid.benckmark.sql; -import java.lang.management.ManagementFactory; -import java.util.List; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.test.TestUtils; import com.alibaba.druid.util.Utils; +import java.lang.management.ManagementFactory; +import java.util.List; + public class MySqlPerfMain { public static void main(String[] args) throws Exception { System.out.println(System.getProperty("java.vm.name") + " " + System.getProperty("java.runtime.version")); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java index 75a6de9a4..168db321e 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_schemaStat.java @@ -17,12 +17,9 @@ package com.alibaba.druid.benckmark.sql; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.test.TestUtils; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.Utils; import java.lang.management.ManagementFactory; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java index c87b0d70b..8215319c0 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_select.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.benckmark.sql; -import java.lang.management.ManagementFactory; -import java.util.List; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.test.TestUtils; +import java.lang.management.ManagementFactory; +import java.util.List; + 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")); @@ -30,10 +29,10 @@ public class MySqlPerfMain_select { System.out.println(arguments); String sql = "SELECT ID, NAME, AGE FROM USER WHERE ID = ?"; -// String sql = "SELECT student_name, " // -// + "GROUP_CONCAT(DISTINCT test_score " // -// + " ORDER BY test_score DESC SEPARATOR ' ') " // -// + "FROM student " // +// String sql = "SELECT student_name, " +// + "GROUP_CONCAT(DISTINCT test_score " +// + " ORDER BY test_score DESC SEPARATOR ' ') " +// + "FROM student " // + "GROUP BY student_name"; for (int i = 0; i < 10; ++i) { diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java index eea16784e..05e04ac7a 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfMain_visitor.java @@ -15,15 +15,15 @@ */ package com.alibaba.druid.benckmark.sql; -import java.lang.management.ManagementFactory; -import java.util.List; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; +import java.lang.management.ManagementFactory; +import java.util.List; + 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")); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java index 2cb360bdd..d31df4449 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/MySqlPerfTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.benckmark.sql; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.test.TestUtils; -import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.util.List; public class MySqlPerfTest extends TestCase { private String sql; diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java index 8cd98770e..c1d57951b 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/SqlHolder.java @@ -2,28 +2,27 @@ package com.alibaba.druid.benckmark.sql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.SQLStatement; -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.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlSelectParser; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.sql.parser.*; +import com.alibaba.druid.sql.parser.ParserException; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.parser.SQLSelectListCache; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * Created by kaiwang.ckw on 15/05/2017. @@ -122,9 +121,9 @@ public class SqlHolder { if (isParam) { features = new SQLParserFeature[]{SQLParserFeature.EnableSQLBinaryOpExprGroup, SQLParserFeature.OptimizedForParameterized}; } else { - features = new SQLParserFeature[]{SQLParserFeature.EnableSQLBinaryOpExprGroup - , SQLParserFeature.OptimizedForParameterized - , SQLParserFeature.UseInsertColumnsCache + features = new SQLParserFeature[]{SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.OptimizedForParameterized, + SQLParserFeature.UseInsertColumnsCache }; } @@ -179,7 +178,6 @@ public class SqlHolder { return Templates.parameterize(ast, physicalNames, params); } - public String getParams() { ensureParsed(); StringBuilder out = new StringBuilder(); @@ -214,8 +212,9 @@ public class SqlHolder { } } catch (Exception ex) { } - if (itemMap.isEmpty()) + if (itemMap.isEmpty()) { return null; + } StringBuilder resSb = new StringBuilder(); for (Map.Entry> entry : itemMap.entrySet()) { resSb.append(StringUtils.join(entry.getValue(), ",")).append(","); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java b/core/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java index 7c633b8f7..41c91f297 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/sql/Templates.java @@ -45,5 +45,4 @@ public class Templates { String sqlTemplate = out.toString(); return sqlTemplate; } - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java index 4da280c96..43db1301b 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.benckmark.wall; -import junit.framework.TestCase; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.OracleWallProvider; +import junit.framework.TestCase; public class WallBenchmarkTest extends TestCase { WallProvider provider = new OracleWallProvider(); @@ -26,8 +25,8 @@ public class WallBenchmarkTest extends TestCase { 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" + // + String sql = "SELECT t1.department_id, t2.*\n" + + "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(); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java index 49850b3a3..2f7f7ae78 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest1.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.benckmark.wall; -import java.util.Random; - -import junit.framework.TestCase; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.util.Random; public class WallBenchmarkTest1 extends TestCase { static Random r = new Random(); @@ -29,8 +28,8 @@ public class WallBenchmarkTest1 extends TestCase { 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" + // + String sql = "SELECT t1.department_id, t2.*\n" + + "FROM hr_info t1, x2 t2\n" + "WHERE t2.department_id = t1.department_id"; for (int i = 0; i < 10; ++i) { provider.clearCache(); @@ -63,6 +62,4 @@ public class WallBenchmarkTest1 extends TestCase { sb.append(" from sqlinject"); return sb.toString(); } - - } diff --git a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java index 1977448cc..cd8bc6253 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.benckmark.wall; -import junit.framework.TestCase; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallBenchmarkTest_mysql extends TestCase { WallProvider provider = new MySqlWallProvider(); @@ -26,8 +25,8 @@ public class WallBenchmarkTest_mysql extends TestCase { 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" + // + String sql = "SELECT t1.department_id, t2.*\n" + + "FROM hr_info t1, x2 t2\n" + "WHERE t2.department_id = t1.department_id"; for (int i = 0; i < 10; ++i) { provider.clearCache(); diff --git a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java index df5a9b035..64a28cf06 100644 --- a/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java +++ b/core/src/test/java/com/alibaba/druid/benckmark/wall/WallBenchmarkTest_mysql_concurrent.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.benckmark.wall; -import java.util.concurrent.CountDownLatch; - -import junit.framework.TestCase; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.util.concurrent.CountDownLatch; public class WallBenchmarkTest_mysql_concurrent extends TestCase { WallProvider provider = new MySqlWallProvider(); @@ -28,8 +27,8 @@ public class WallBenchmarkTest_mysql_concurrent extends TestCase { public static final int COUNT = 1000 * 10; public void test_0() throws Exception { - String sql = "SELECT t1.department_id, t2.*\n" + // - "FROM hr_info t1, x2 t2\n" + // + String sql = "SELECT t1.department_id, t2.*\n" + + "FROM hr_info t1, x2 t2\n" + "WHERE t2.department_id = t1.department_id"; for (int i = 0; i < 10; ++i) { provider.clearCache(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/AlipayUseCaseTest.java b/core/src/test/java/com/alibaba/druid/bvt/AlipayUseCaseTest.java index a234cbb0d..4992c2d02 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/AlipayUseCaseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/AlipayUseCaseTest.java @@ -45,5 +45,4 @@ public class AlipayUseCaseTest { public void test() { // TODO } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/OrTest.java b/core/src/test/java/com/alibaba/druid/bvt/OrTest.java index c2783d7fc..2e5dba5fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/OrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/OrTest.java @@ -1,17 +1,15 @@ package com.alibaba.druid.bvt; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import junit.framework.TestCase; + import java.util.List; -import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; - - public class OrTest extends TestCase { public void test_xx() throws Exception { - String sql = "select * from t where not match('', '') or (c > 0 and d >0)"; + String sql = "select * from t where not match('', '') or (c > 0 and d > 0)"; List stmtList = SQLUtils.parseStatements(sql, (DbType) null); SQLStatement stmt = stmtList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/BugSqlParserIllegalWhere.java b/core/src/test/java/com/alibaba/druid/bvt/bug/BugSqlParserIllegalWhere.java index 1db42885c..4f4cb0365 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/BugSqlParserIllegalWhere.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/BugSqlParserIllegalWhere.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.bug; -import java.util.List; -import java.util.regex.Pattern; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor; @@ -11,19 +9,22 @@ import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; +import java.util.List; +import java.util.regex.Pattern; + /** * 此测试类用于检测试sql中where拼错导致SQL无效， 但经SQLStatementParser解析却丢失where的严复问题. - * + * * @author qxo */ public class BugSqlParserIllegalWhere extends TestCase { public void test4deleteWhere() throws Exception { Object[][] samples = { - { "update test_tab1 set b= 1 swhere a=1", false }, - { "select * from test_tab1 swhere a=1", false }, - { "delete from test_tab1 \n swhere a=1", false }, - { "delete from test_tab1 where a=1", true }, - { "delete from test_tab1 \n where a=1 \n", true } + {"update test_tab1 set b= 1 swhere a=1", false}, + {"select * from test_tab1 swhere a=1", false}, + {"delete from test_tab1 \n swhere a=1", false}, + {"delete from test_tab1 where a=1", true}, + {"delete from test_tab1 \n where a=1 \n", true} }; for (final Object[] arr : samples) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java index efdc39274..797695103 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java @@ -15,25 +15,21 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; + public class Bug_for_happyday517 extends PoolTestCase { private DruidDataSource dataSource; private MockDriver driver; - private int originalDataSourceCount = 0; + private int originalDataSourceCount; protected void setUp() throws Exception { super.setUp(); @@ -44,7 +40,6 @@ public class Bug_for_happyday517 extends PoolTestCase { dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("stat,trace,log4j,encoding"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java index c732a0cc1..3267b98ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java @@ -15,8 +15,12 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.mock.MockPreparedStatement; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.DataTruncation; @@ -24,21 +28,13 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Properties; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockPreparedStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class Bug_for_happyday517_2 extends TestCase { private DruidDataSource dataSource; private MockDriver driver; final DataTruncation exception = new java.sql.DataTruncation(0, true, true, 0, 0); - private int originalDataSourceCount = 0; + private int originalDataSourceCount; protected void setUp() throws Exception { originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); @@ -63,7 +59,6 @@ public class Bug_for_happyday517_2 extends TestCase { dataSource.setDriver(driver); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("stat,trace,log4j,encoding"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java index 776b3de00..865ca7033 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java @@ -15,21 +15,18 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class Bug_for_happyday517_3 extends TestCase { private DruidDataSource dataSource; private MockDriver driver; - private int originalDataSourceCount = 0; + private int originalDataSourceCount; protected void setUp() throws Exception { originalDataSourceCount = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java index b0d504e8c..ddbc336dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java index f94aeecee..ebd34a672 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.util.List; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class Bug_for_qianbi extends TestCase { public void test_for_issue() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java index 362d5eef2..bc32c08a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class Bug_for_ruiyi extends TestCase { public void test_for_issue() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java index ff75a763e..84ef3f747 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_wdw1206.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.bug; -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; public class Bug_for_wdw1206 extends TestCase { private ClassLoader ctxClassLoader; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java index 5a5b124cb..903b00a3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java @@ -15,18 +15,9 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; - 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/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java index c1695263a..0ed9a5900 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java @@ -15,18 +15,15 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertNull; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class Bug_for_xuershan extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java index 13525da6e..6430adaeb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1576.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.bug; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java index 5cb269013..dae223357 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1759.java @@ -14,7 +14,7 @@ public class Issue1759 extends TestCase { String sql = "COMMENT ON COLUMN \"TB_CRM_MATERIAL\".\"INVALID_TIME\" IS '生效时间'"; OracleStatementParser parser = new OracleStatementParser(sql); - SQLStatement statement = parser.parseStatement();// 分号之后多语句忽略 + SQLStatement statement = parser.parseStatement(); // 分号之后多语句忽略 OracleWallProvider provider = new OracleWallProvider(); WallCheckResult result1 = provider.check(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1762.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1762.java index 9cd877257..509aff751 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1762.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1762.java @@ -4,7 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1865.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1865.java index cb01216fd..360ff10c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1865.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1865.java @@ -1,8 +1,6 @@ package com.alibaba.druid.bvt.bug; 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.SQLDeleteStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; @@ -13,8 +11,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import java.util.List; - public class Issue1865 extends TestCase { public void test_for_select() throws Exception { final DbType dbType = JdbcConstants.MYSQL; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1898.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1898.java index 00ae3e962..665025cca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1898.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1898.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.bug; import junit.framework.TestCase; -import org.junit.Test; /** * Created by wenshao on 14/08/2017. diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java index 22f305b81..0aad7e229 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1912.java @@ -4,13 +4,11 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import junit.framework.TestCase; import java.util.HashMap; -import java.util.List; import java.util.Map; public class Issue1912 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java index 8d8441ffe..d571160e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1935.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.bug; 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.SQLCreateViewStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; @@ -45,6 +44,7 @@ public class Issue1935 extends TestCase { Collection cc = visitor.getColumns(); //column 存储了表名，列名，以及列是出现的位置，where，select，groupby ，order for (TableStat.Column column : cc) { + // Intentionally left empty } System.out.println("conditions : " + visitor.getConditions()); List conditions = visitor.getConditions(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java index be091fed8..5bbe5c564 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue1994.java @@ -5,8 +5,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleInsertStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; -import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue2049.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue2049.java index 6bd547447..0f751cea3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue2049.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue2049.java @@ -5,10 +5,7 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.wall.WallCheckResult; -import com.alibaba.druid.wall.spi.OracleWallProvider; import junit.framework.TestCase; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue3952.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue3952.java index e8f71943c..a0d4dfe03 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue3952.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue3952.java @@ -2,14 +2,8 @@ package com.alibaba.druid.bvt.bug; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import java.util.List; - public class Issue3952 extends TestCase { public void test_0() throws Exception { String sql = "select\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue4067.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue4067.java index 26eda698a..dfc808689 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue4067.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue4067.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.bug; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import junit.framework.TestCase; +import java.util.List; + public class Issue4067 extends TestCase { public void test_for_issue() throws Exception { List stmtList = SQLUtils.parseStatements("desc bi.aaa", DbType.hive); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5763.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5763.java index 58827e43a..35e30b03e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5763.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5763.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.bug; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.SQLParserUtils; -import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; /** @@ -14,7 +9,6 @@ import junit.framework.TestCase; * @see ... */ public class Issue5763 extends TestCase { - public void test_for_clone() throws Exception { String sql = "select user.col from user use index(a)"; SQLStatement origin = SQLUtils.parseSingleMysqlStatement(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5845.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5845.java index 6d7bf14c2..a5c4b0d30 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5845.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5845.java @@ -1,18 +1,16 @@ package com.alibaba.druid.bvt.bug; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; - import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.List; + /** * */ public class Issue5845 extends TestCase { - public void test_for_issue() throws Exception { String sql = "delete from table01 t where t.id=1"; List dbTypes = new ArrayList<>(); @@ -41,7 +39,7 @@ public class Issue5845 extends TestCase { DbType.greenplum, DbType.gaussdb, DbType.tidb, - DbType.goldendb,}) { + DbType.goldendb, }) { String mergeSql = ParameterizedOutputVisitorUtils.parameterize(sql, dbType); System.out.println(dbType + "==" + mergeSql); dbTypes.add(dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5847.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5847.java index 32bdd83ac..5d0faadbb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5847.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue5847.java @@ -1,30 +1,25 @@ package com.alibaba.druid.bvt.bug; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; - import junit.framework.TestCase; +import java.util.List; /** * */ public class Issue5847 extends TestCase { - public void test_for_issue() throws Exception { String sql = "-- 执行SQLUtils.format(sql, DbType.dm)结果，外层括号被剔除，该sql在dm库执行失败\n" + "SELECT *\n" + "FROM tb_test\n" + "LIMIT 10 OFFSET ( (2 - 1) * 1 *( 3 + 5) )"; - sql="select a.*, (a.swanav-lead(a.swanav,1,null::numeric) over w)/lead(a.swanav,1,null::numeric) over w as roe_lag\n"; - sql="select a.*, ((a.swanav-lead(a.swanav,1,null::numeric) over w)/lead(a.swanav,1,null::numeric) over w) as roe_lag\n"; - sql="select * from aaa " + sql = "select a.*, (a.swanav-lead(a.swanav,1,null::numeric) over w)/lead(a.swanav,1,null::numeric) over w as roe_lag\n"; + sql = "select a.*, ((a.swanav-lead(a.swanav,1,null::numeric) over w)/lead(a.swanav,1,null::numeric) over w) as roe_lag\n"; + sql = "select * from aaa " + "group by to_char((CreateDate || ' ' || cast(HourArgment as VARCHAR) || ':00:00')::TIMESTAMP, 'YYYY-MM-DD HH24')"; @@ -44,7 +39,6 @@ public class Issue5847 extends TestCase { // DbType.tidb, // DbType.goldendb, //DbType.dm, - }) { try { // String mergeSql = SQLUtils.format(sql, dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java index 678c56843..2f52df7c5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java @@ -17,9 +17,6 @@ package com.alibaba.druid.bvt.bug; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.wall.WallConfig; -import com.alibaba.druid.wall.WallUtils; - import junit.framework.TestCase; /** @@ -39,4 +36,4 @@ public class Issue_4094 extends TestCase { + "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/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4190.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4190.java index 97e92de58..c6665364f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4190.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4190.java @@ -1,12 +1,10 @@ package com.alibaba.druid.bvt.bug; -import org.junit.Test; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - import junit.framework.TestCase; +import org.junit.Test; public class Issue_4190 extends TestCase { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java index 43dd702fd..7ccd5934a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_685.java @@ -1,9 +1,8 @@ package com.alibaba.druid.bvt.bug; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import junit.framework.TestCase; public class Issue_685 extends TestCase { public void test_for_issue() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java index a9782193d..1691fba74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java @@ -1,16 +1,8 @@ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertEquals; - -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; - 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" diff --git a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java index 8e7f0cc48..992edcd2f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java +++ b/core/src/test/java/com/alibaba/druid/bvt/bug/Issue_728.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.bug; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class Issue_728 extends TestCase { public void test1() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java index b3d00236c..894210ead 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/ClearFilterTest.java @@ -1,18 +1,10 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.filter.encoding.EncodingConvertFilter; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; - public class ClearFilterTest extends PoolTestCase { public void test_filters() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java index 9098eeb05..5384c826e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java @@ -15,17 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.encoding.EncodingConvertFilter; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; @@ -35,6 +24,12 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; public class EncodingConvertFilterTest extends TestCase { private DruidDataSource dataSource; @@ -101,7 +96,6 @@ public class EncodingConvertFilterTest extends TestCase { stmt.close(); conn.close(); - } public static class MyResultSet extends MockResultSet { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java index 5687bfbb0..c1bb89144 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest2.java @@ -15,23 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.Reader; -import java.io.StringReader; -import java.sql.CallableStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; -import java.util.Collections; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.encoding.EncodingConvertFilter; import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockDriver; @@ -42,9 +25,20 @@ import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; +import junit.framework.TestCase; + +import java.io.Reader; +import java.io.StringReader; +import java.sql.CallableStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Types; +import java.util.Collections; public class EncodingConvertFilterTest2 extends TestCase { private DruidDataSource dataSource; @@ -143,7 +137,6 @@ public class EncodingConvertFilterTest2 extends TestCase { raw.getOutParameters().add(param1); raw.getOutParameters().add(param1); - assertEquals(C_TEXT, stmt.getString(4)); assertEquals(C_TEXT, stmt.getString("4")); assertEquals(C_TEXT, stmt.getObject(4)); @@ -239,7 +232,6 @@ public class EncodingConvertFilterTest2 extends TestCase { stmt.close(); conn.close(); - } public static class MyResultSet extends MockResultSet { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java index a058e2c1b..52b41f122 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java @@ -1,21 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Statement; -import java.sql.Types; - -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl; -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockNClob; @@ -23,6 +7,14 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Clob; +import java.sql.Connection; +import java.sql.NClob; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Types; public class FilterChainImplTest extends TestCase { private DruidDataSource dataSource; @@ -91,7 +83,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getUnicodeStream_1() throws Exception { @@ -106,7 +97,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getRef() throws Exception { @@ -121,7 +111,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getRef_1() throws Exception { @@ -136,7 +125,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getArray() throws Exception { @@ -151,7 +139,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getArray_1() throws Exception { @@ -166,7 +153,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getURL() throws Exception { @@ -181,7 +167,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getURL_1() throws Exception { @@ -196,7 +181,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getRowId() throws Exception { @@ -211,7 +195,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getRowId_1() throws Exception { @@ -226,7 +209,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNClob() throws Exception { @@ -241,7 +223,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNClob_1() throws Exception { @@ -256,7 +237,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getSQLXML() throws Exception { @@ -271,7 +251,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getSQLXML_1() throws Exception { @@ -286,7 +265,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNString() throws Exception { @@ -301,7 +279,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNString_1() throws Exception { @@ -316,7 +293,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNCharacterStream() throws Exception { @@ -331,7 +307,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getNCharacterStream_1() throws Exception { @@ -346,7 +321,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getObject() throws Exception { @@ -361,7 +335,6 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } public void test_getObject_1() throws Exception { @@ -376,6 +349,5 @@ public class FilterChainImplTest extends TestCase { rs.close(); stmt.close(); conn.close(); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java index b217e51ee..de4c377a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java @@ -1,21 +1,15 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.Types; import java.util.Collections; -import junit.framework.TestCase; - -import com.alibaba.druid.filter.FilterAdapter; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class FilterChainImplTest2 extends TestCase { private DruidDataSource dataSource; @@ -101,7 +95,6 @@ public class FilterChainImplTest2 extends TestCase { conn.close(); } - public void test_getByte() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); @@ -234,7 +227,6 @@ public class FilterChainImplTest2 extends TestCase { conn.close(); } - public void test_getBytes() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); @@ -257,7 +249,6 @@ public class FilterChainImplTest2 extends TestCase { conn.close(); } - public void test_getDate() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("select ?"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java index a77cd4c1e..171a18a0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java @@ -1,16 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertNull; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; @@ -18,6 +7,14 @@ import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Types; public class FilterChainImplTest3 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java index 3cf813c32..c794161fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockClob; import com.alibaba.druid.mock.MockResultSet; @@ -40,7 +37,7 @@ public class FilterChainTest_Clob extends TestCase { private StatementProxy statement; private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java index 44434c60b..e6f6da0ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob_2.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.Clob; -import java.sql.SQLException; -import java.util.Collections; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockClob; @@ -34,12 +24,17 @@ import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl; import com.alibaba.druid.proxy.jdbc.ClobProxy; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Clob; +import java.sql.SQLException; +import java.util.Collections; public class FilterChainTest_Clob_2 extends TestCase { private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -53,7 +48,6 @@ public class FilterChainTest_Clob_2 extends TestCase { }; statement = new CallableStatementProxyImpl(new ConnectionProxyImpl(null, null, null, 0), mockStmt, "", 1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java index dd8a75b86..49602cd27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob.java @@ -15,17 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.Clob; -import java.sql.SQLException; -import java.util.Collections; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockNClob; import com.alibaba.druid.mock.MockResultSet; @@ -36,13 +25,19 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Clob; +import java.sql.SQLException; +import java.util.Collections; +import java.util.Properties; public class FilterChainTest_NClob extends TestCase { private DruidDataSource dataSource; private StatementProxy statement; private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java index d7e6c9aef..8c5572652 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_NClob_2.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.Clob; -import java.sql.SQLException; -import java.util.Collections; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockNClob; @@ -34,12 +24,17 @@ import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.proxy.jdbc.NClobProxy; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Clob; +import java.sql.SQLException; +import java.util.Collections; public class FilterChainTest_NClob_2 extends TestCase { private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -53,7 +48,6 @@ public class FilterChainTest_NClob_2 extends TestCase { }; statement = new CallableStatementProxyImpl(new ConnectionProxyImpl(null, null, null, 0), mockStmt, "", 1); - } protected void tearDown() throws Exception { @@ -80,7 +74,6 @@ public class FilterChainTest_NClob_2 extends TestCase { assertEquals(1, invokeCount); } - public void test_getObject() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java index 73bc778f7..dbb470926 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidDataSource; @@ -33,13 +23,18 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collections; public class FilterChainTest_ResultSet extends TestCase { private DruidDataSource dataSource; private StatementProxy statement; private MockResultSet mockResultSet; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java index 003ab5aae..3b850d70e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_ResultSet_2.java @@ -15,17 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockResultSet; @@ -35,12 +24,18 @@ import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collections; +import java.util.Properties; public class FilterChainTest_ResultSet_2 extends TestCase { private DruidDataSource dataSource; private CallableStatementProxy statement; - private int invokeCount = 0; + private int invokeCount; protected void setUp() throws Exception { dataSource = new DruidDataSource(); @@ -54,7 +49,6 @@ public class FilterChainTest_ResultSet_2 extends TestCase { }; statement = new CallableStatementProxyImpl(conn, mockStmt, "", 1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java index 106e9ca31..f2f639fc8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java @@ -15,7 +15,12 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.SQLException; @@ -23,14 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.TestCase; - -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.filter.FilterAdapter; -import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; - public class FilterDatasourceConnectAndRecycleFilterTest extends TestCase { TestFilter filter = new TestFilter(); List filterList = new ArrayList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java index 4babb2d95..791553e19 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/FilterManagerTest.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertNotNull; - -import java.sql.SQLException; -import java.util.ArrayList; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterManager; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.ArrayList; public class FilterManagerTest extends TestCase { static { @@ -50,7 +46,6 @@ public class FilterManagerTest extends TestCase { assertNotNull(error); } - public static class ErrorFilter extends FilterAdapter { public ErrorFilter() { throw new RuntimeException(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/MySQL8DateTimeSqlTypeFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/MySQL8DateTimeSqlTypeFilterTest.java index e41758b86..fd5170bf0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/MySQL8DateTimeSqlTypeFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/MySQL8DateTimeSqlTypeFilterTest.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.time.LocalDateTime; - import com.alibaba.druid.filter.mysql8datetime.MySQL8DateTimeSqlTypeFilter; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; @@ -32,15 +23,19 @@ import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.sql.Timestamp; +import java.time.LocalDateTime; /** * lizongbo */ public class MySQL8DateTimeSqlTypeFilterTest extends TestCase { - private DruidDataSource dataSource; protected void setUp() throws Exception { @@ -92,11 +87,9 @@ public class MySQL8DateTimeSqlTypeFilterTest extends TestCase { stmt.close(); conn.close(); - } public static class MyResultSet extends MockResultSet { - public MyResultSet(Statement statement) { super(statement); } @@ -110,7 +103,5 @@ public class MySQL8DateTimeSqlTypeFilterTest extends TestCase { public Object getObject(String columnLabel) throws SQLException { return LocalDateTime.now(); } - - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java index 083af04db..6a558afda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/ReuseStatFilterTest.java @@ -1,10 +1,9 @@ package com.alibaba.druid.bvt.filter; -import junit.framework.TestCase; - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class ReuseStatFilterTest extends TestCase { private DruidDataSource dataSourceA; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java index 6a5700989..5288f2819 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/Slf4jFilterTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertNotNull; - -import java.sql.Connection; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.logging.Slf4jLogFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; public class Slf4jFilterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java index 7ac5ceb75..99567358c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java @@ -15,23 +15,15 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class StatFilterAfterResetTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java index e45fe81c3..4e86332ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterBuildSlowParameterTest.java @@ -15,8 +15,18 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.alibaba.druid.mock.MockBlob; +import com.alibaba.druid.mock.MockClob; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.mock.MockNClob; +import com.alibaba.druid.mock.MockRowId; +import com.alibaba.druid.mock.MockStatementBase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.JdbcSqlStat; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.nutz.lang.util.ByteInputStream; import java.math.BigDecimal; import java.sql.Connection; @@ -29,21 +39,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import junit.framework.TestCase; - -import org.nutz.lang.util.ByteInputStream; - -import com.alibaba.druid.mock.MockBlob; -import com.alibaba.druid.mock.MockClob; -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockNClob; -import com.alibaba.druid.mock.MockRowId; -import com.alibaba.druid.mock.MockStatementBase; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.JdbcSqlStat; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.util.JdbcUtils; - public class StatFilterBuildSlowParameterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java index 8d3762eed..9bf614f36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockClob; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ClobProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class StatFilterClobTest extends TestCase { private DruidDataSource dataSource; @@ -74,5 +69,4 @@ public class StatFilterClobTest extends TestCase { sqlStat.reset(); assertEquals(0, sqlStat.getClobOpenCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java index ba4486044..762080f5e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecErrorTest.java @@ -1,14 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; @@ -17,6 +8,11 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class StatFilterExecErrorTest extends TestCase { private DruidDataSource dataSource; @@ -71,5 +67,4 @@ public class StatFilterExecErrorTest extends TestCase { sqlStat.reset(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java index 1c4a86392..a8b921b51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java @@ -15,22 +15,18 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterExecuteFirstResultSetTest extends TestCase { private DruidDataSource dataSource; @@ -79,7 +75,6 @@ public class StatFilterExecuteFirstResultSetTest extends TestCase { assertEquals(1, sqlStat.getHistogramSum()); - assertEquals(1, sqlStat.getExecuteAndResultHoldTimeHistogramSum()); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java index 61b06beeb..4ae3d2573 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java @@ -15,22 +15,17 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class StatFilterExecuteTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java index 7845163cc..6fce476c5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Blob; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockBlob; @@ -17,6 +7,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Blob; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterOpenBlobCountTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java index 3b28260e9..4456b15b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockBlob; @@ -17,6 +7,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collections; public class StatFilterOpenBlobCountTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java index 9a0c5e80c..698aaeec9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Clob; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockClob; @@ -18,6 +8,13 @@ import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Clob; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterOpenClobCountTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java index 5e32ac28b..c9ae3b30b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Collections; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockClob; @@ -18,6 +8,13 @@ import com.alibaba.druid.proxy.jdbc.ClobProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Collections; public class StatFilterOpenClobCountTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java index 2ae34fa5f..515a0347c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java @@ -1,21 +1,18 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.io.ByteArrayInputStream; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.ByteArrayInputStream; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterOpenInputStreamCountTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java index fbab8b2cd..8d00592fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java @@ -1,21 +1,18 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.io.ByteArrayInputStream; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.ByteArrayInputStream; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterOpenInputStreamCountTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java index e73ec3550..816e0f56f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java @@ -1,22 +1,18 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - -import org.nutz.lang.stream.StringReader; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.nutz.lang.stream.StringReader; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterOpenReaderCountTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java index e4342f244..f2b6e815e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java @@ -1,20 +1,17 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterReadBytesLengthTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java index afce91d4c..770d0a403 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java @@ -1,20 +1,17 @@ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class StatFilterReadStringLengthTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java index caa547e55..b5a9933e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java @@ -15,22 +15,15 @@ */ package com.alibaba.druid.bvt.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.JdbcSqlStat; +import com.alibaba.druid.util.JdbcUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.JdbcSqlStat; -import com.alibaba.druid.util.JdbcUtils; - public class StatFilterResultSetMultiCloseTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java index 0f6216d4b..3ef8757b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest.java @@ -1,17 +1,16 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.SQLException; - -import org.junit.Test; - import com.alibaba.druid.filter.config.ConfigFileGenerator; import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import org.junit.Test; + +import java.sql.SQLException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Jonas Yang diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java index d5f2b3f1e..a6ee82630 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java @@ -1,14 +1,10 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.filter.config.ConfigTools; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class ConfigFilterTest1 extends TestCase { private DruidDataSource dataSource; @@ -36,5 +32,4 @@ public class ConfigFilterTest1 extends TestCase { assertEquals(plainPassword, dataSource.getPassword()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java index 94de2cf78..d6ce1b41a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class ConfigFilterTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java index 9cfab12f6..57afb59da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.filter.config.ConfigTools; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.Properties; public class ConfigFilterTest3 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java index fb9c24709..b446961eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; - -import java.io.File; -import java.io.FileOutputStream; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.filter.config.ConfigTools; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileOutputStream; +import java.util.Properties; public class ConfigFilterTest4 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java index 88ede4a09..6566a7c3a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertNotNull; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.config.ConfigFilter; - +import junit.framework.TestCase; public class ConfigFilterTest5 extends TestCase { public void test_loadClassPath() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest6.java index 9f8a9b13a..1df0379b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest6.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.config.ConfigFilter; import com.alibaba.druid.proxy.jdbc.DataSourceProxy; @@ -13,6 +10,7 @@ import java.sql.Driver; import java.util.List; import java.util.Properties; +import static org.junit.Assert.assertThrows; public class ConfigFilterTest6 extends TestCase { public void testInitFastFail() { @@ -22,9 +20,7 @@ public class ConfigFilterTest6 extends TestCase { assertEquals("ConfigLoader only support DruidDataSource", exception.getMessage()); } - static class DataSourceProxyImpl implements DataSourceProxy { - @Override public JdbcDataSourceStat getDataSourceStat() { return null; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java index 134bc9465..7e2b8edbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.filter.config; -import static org.junit.Assert.assertEquals; - -import java.util.Random; - +import com.alibaba.druid.filter.config.ConfigTools; import junit.framework.TestCase; -import com.alibaba.druid.filter.config.ConfigTools; +import java.util.Random; public class ConfigToolsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java index 72edb8471..189064e7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.filter.log; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class LogFilterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java index 4b4d749c6..83e9729eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest2.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.filter.log; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class LogFilterTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java index bbd7f072f..1ab5ee4e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest3.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.filter.log; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class LogFilterTest3 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java index a5472a6ac..918bbb174 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest4.java @@ -1,14 +1,10 @@ package com.alibaba.druid.bvt.filter.log; -import static org.junit.Assert.assertEquals; - -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.logging.Log4jFilter; import com.alibaba.druid.filter.logging.LogFilter; +import junit.framework.TestCase; + +import java.util.Properties; public class LogFilterTest4 extends TestCase { public void test_properties() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java index daa58d864..827a43495 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/LogFilterTest5.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.filter.log; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class LogFilterTest5 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java index 104fc50a7..30a400e6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/log/Slf4jLogFilterTest.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.filter.log; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - -import org.slf4j.LoggerFactory; - import com.alibaba.druid.filter.logging.Slf4jLogFilter; - +import junit.framework.TestCase; +import org.slf4j.LoggerFactory; public class Slf4jLogFilterTest extends TestCase { public void test_slf4j() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java index f18228906..edbab824f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BigSqlTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BigSqlTest extends TestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java index a0ec32bd5..9dc6a6f3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BitwiseAndTest extends TestCase { public void test_true() throws Exception { 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.setConditionOpBitwiseAllow(false); assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) & 2", config)); // + "SELECT * from t where (id = 1) & 2", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java index 8739b31a0..45d86d702 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BitwiseInvertTest extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "SELECT * from t where ~2")); // + "SELECT * from t where ~2")); } public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setConditionOpBitwiseAllow(false); assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where ~2", config)); // + "SELECT * from t where ~2", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java index 919fa4b8f..3a418940b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BitwiseOrTest extends TestCase { public void test_true() throws Exception { 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.setConditionOpBitwiseAllow(false); assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) | 2", config)); // + "SELECT * from t where (id = 1) | 2", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java index 5430f031e..ad973f397 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BitwiseXorTest extends TestCase { public void test_true() throws Exception { 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.setConditionOpBitwiseAllow(false); assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where (id = 1) ^ (1=1)", config)); // + "SELECT * from t where (id = 1) ^ (1=1)", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java index 999e383b3..5e0fd629b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/BooleanXorTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class BooleanXorTest extends TestCase { public void test_false() throws Exception { 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); 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java index 0e42ebaa6..80ca27e99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/ConstantArithmeticCheckTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class ConstantArithmeticCheckTest extends TestCase { public void test_true() throws Exception { 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); assertFalse(WallUtils.isValidateMySql(// - "SELECT * from t where 3 - 1", config)); // + "SELECT * from t where 3 - 1", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java index 23153a596..3a4547980 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/CountTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.wall.spi.WallVisitorUtils; +import junit.framework.TestCase; public class CountTest extends TestCase { public void test_isTrue() throws Exception { @@ -35,5 +31,4 @@ public class CountTest extends TestCase { // } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java index 7e03bea7d..e09fdd5b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.security.PrivilegedAction; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; + +import java.security.PrivilegedAction; public class DoPrivilegedTest extends TestCase { public void test_0() throws Exception { @@ -47,6 +42,5 @@ public class DoPrivilegedTest extends TestCase { return null; } }); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java index aa346123c..a9925262f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class IdentEqualsTest extends TestCase { private String sql = "select * from t where FID = 1 OR id = id"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java index c14243fd5..ecbe80141 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IdentEqualsTest1.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class IdentEqualsTest1 extends TestCase { private String sql = "select * from t where FID = 1 OR not (id != id)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java index 60f3bfacb..7f2269c44 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/IntersectTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class IntersectTest extends TestCase { public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setMinusAllow(false); 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 { assertTrue(WallUtils.isValidateOracle(// - "SELECT * FROM A MINUS SELECT * FROM B")); // + "SELECT * FROM A MINUS SELECT * FROM B")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java index b18327789..566d8bb93 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/LikeTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.wall.spi.WallVisitorUtils; +import junit.framework.TestCase; public class LikeTest extends TestCase { public void test_isTrue() throws Exception { @@ -29,6 +25,5 @@ public class LikeTest extends TestCase { assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("f1 like '%%'"))); assertEquals(null, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("a1 = b1 AND f1 like '%%'"))); assertEquals(Boolean.TRUE, WallVisitorUtils.getValue(SQLUtils.toSQLExpr("a1 = b1 OR f1 like '%%'"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java index 4a45322ec..39e5de0a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MinusTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MinusTest extends TestCase { public void test_false() throws Exception { WallConfig config = new WallConfig(); config.setIntersectAllow(false); 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 { assertTrue(WallUtils.isValidateOracle(// - "SELECT * FROM A Intersect SELECT * FROM B")); // + "SELECT * FROM A Intersect SELECT * FROM B")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java index a0a5dba63..266d5d8a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MustParameterizedTest extends TestCase { private String sql = "select * from t where id = 3"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java index 05efa9ecc..07146c77b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest1.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MustParameterizedTest1 extends TestCase { private String sql = "select * from t where id = 3 + 5"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java index f86c6286e..dc8ffa829 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest2.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MustParameterizedTest2 extends TestCase { private String sql = "select * from t where id in (3, 5)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java index 41dcf413c..f7507c858 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest3.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MustParameterizedTest3 extends TestCase { private WallConfig config = new WallConfig(); @@ -44,5 +39,4 @@ public class MustParameterizedTest3 extends TestCase { assertFalse(WallUtils.isValidateMySql("select 1, 2, 3 from t where id = ? union select * from t fid = fid", config)); assertFalse(WallUtils.isValidateMySql("select 1, 2, 3 from t where id = ? union select * from t fid > 5", config)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java index ea92fe0d5..991988c3a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/MustParameterizedTest4.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MustParameterizedTest4 extends TestCase { private String sql = "select * from t where id not in (3, 5)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java index e5179d9b8..89c762719 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGDenyFunctionTest.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class PGDenyFunctionTest extends TestCase { public void test_false() throws Exception { 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); assertTrue(WallUtils.isValidatePostgres(// - "SELECT current_catalog() from t where id = ?", config)); // + "SELECT current_catalog() from t where id = ?", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java index 8c8b92eb6..a9fb6e62c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/PGWallTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class PGWallTest extends TestCase { public void test_false() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java index 6502315c0..1b3c62a45 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/StrictSyntaxCheckTest.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class StrictSyntaxCheckTest extends TestCase { public void test_syntax() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java index 7776bcaa7..d2e493b95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TAEWallTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -33,11 +28,11 @@ import com.alibaba.druid.wall.WallUtils; public class TAEWallTest extends TestCase { public void test_true() throws Exception { 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 { assertFalse(WallUtils.isValidateMySql(// - "select * from t where status = 1 OR 1=1")); // + "select * from t where status = 1 OR 1=1")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java index 86386af9b..1e2377804 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantDeleteTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class TenantDeleteTest extends TestCase { private String sql = "DELETE FROM orders WHERE FID = ?"; @@ -46,7 +42,7 @@ public class TenantDeleteTest extends TestCase { assertEquals(0, checkResult.getViolations().size()); String resultSql = SQLUtils.toSQLString(checkResult.getStatementList(), JdbcConstants.MYSQL); - assertEquals("DELETE FROM orders" + // + assertEquals("DELETE FROM orders" + "\nWHERE FID = ?", resultSql); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java index 0343ddfb5..dfed1e7cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantInsertTest.java @@ -18,17 +18,13 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * @author kiki @@ -98,9 +94,9 @@ public class TenantInsertTest extends TestCase { 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" + // + String expect_sql = "INSERT INTO orders (ID, NAME, tenant)" + + "\nSELECT ID, NAME, 123" + + "\nFROM temp" + "\nWHERE age = 18"; { @@ -155,5 +151,4 @@ public class TenantInsertTest extends TestCase { assertEquals(expect_sql, resultSql); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java index 352ced370..b492cc162 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest.java @@ -15,22 +15,18 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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" + // + private String expect_sql = "SELECT ID, NAME, tenant" + + "\nFROM orders" + "\nWHERE FID = ?"; private WallConfig config = new WallConfig(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java index 9b0cf4c0d..b5c00c7e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest2.java @@ -15,23 +15,19 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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 = ?" + // + private String expect_sql = "SELECT ID, NAME, tenant" + + "\nFROM orders" + + "\nWHERE FID = ?" + "\n\tOR FID = ?"; private WallConfig config = new WallConfig(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java index 54d7e74b4..83387174c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest3.java @@ -15,26 +15,22 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class TenantSelectTest3 extends TestCase { - private String sql = "SELECT ID, NAME " + // - "FROM orders o inner join users u ON o.userid = u.id " + // + 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 = ?" + // + 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 = ?"; protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java index c9bda0b6c..f5a5de6ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantSelectTest4.java @@ -15,26 +15,22 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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 " + // + 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" + // + 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java index c8af2d602..abb613032 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/TenantUpdateTest.java @@ -15,22 +15,18 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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" + // + private String expect_sql = "UPDATE T_USER" + + "\nSET FNAME = ?, tenant = 123" + "\nWHERE FID = ?"; private WallConfig config = new WallConfig(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test01WallProviderCreator.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test01WallProviderCreator.java index 5b118d4de..59fcd24ce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test01WallProviderCreator.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test01WallProviderCreator.java @@ -2,24 +2,19 @@ package com.alibaba.druid.bvt.filter.wall; import com.alibaba.druid.DbType; import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.wall.WallConfig; -import com.alibaba.druid.wall.WallFilter; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallProviderCreator; -import com.alibaba.druid.wall.WallVisitor; public class Test01WallProviderCreator implements WallProviderCreator { - private static final Log LOG = LogFactory.getLog(Test01WallProviderCreator.class); @Override public WallProvider createWallConfig(DataSourceProxy dataSource, WallConfig config, DbType dbType) { if (dbType == null) { - NullWallProvider nullWallProvider= new NullWallProvider(config); - LOG.warn("dbType is null so return NullWallProvider|"+nullWallProvider); + NullWallProvider nullWallProvider = new NullWallProvider(config); + LOG.warn("dbType is null so return NullWallProvider|" + nullWallProvider); return nullWallProvider; } return null; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test02WallProviderCreator.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test02WallProviderCreator.java index 1483b6377..2d427da63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test02WallProviderCreator.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/Test02WallProviderCreator.java @@ -10,7 +10,6 @@ import com.alibaba.druid.wall.WallProviderCreator; import com.alibaba.druid.wall.spi.MySqlWallProvider; public class Test02WallProviderCreator implements WallProviderCreator { - private static final Log LOG = LogFactory.getLog(Test02WallProviderCreator.class); @Override diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java index 40a97604e..f8e58fba1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnDefaultTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java index d8e9e447b..75717ed95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java index c1fdb3546..0b1732012 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest1.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java index 3fc1ec72f..798897601 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallAllowSelectAllColumnTest2.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java index 9ad4e1661..f032ae0d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCallTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java index 2dbce26fb..736a27be7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallCommentTest.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.spi.MySqlWallProvider; import com.alibaba.druid.wall.spi.OracleWallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * @author wenshao diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java index 7287dd0b3..7be88ca00 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallConfigTest.java @@ -1,15 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.wall.WallConfig; +import junit.framework.TestCase; import java.util.Properties; - -import com.alibaba.druid.wall.WallConfig; - -import junit.framework.TestCase; - public class WallConfigTest extends TestCase { public void test_selectAllow() throws Exception { Properties properties = new Properties(); @@ -65,7 +60,6 @@ public class WallConfigTest extends TestCase { assertFalse(config.isUpdateAllow()); } - public void test_insertAllow() throws Exception { Properties properties = new Properties(); properties.setProperty("druid.wall.insertAllow", "true"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java index 93177989c..39d10c47f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java index 917bdc64c..427f39a7d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java index 22b355a82..1e49d97b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java index 625c9c9fe..404942761 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDeleteWhereTest2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java index eed553b13..ab835526e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenySchemaTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.spi.OracleWallProvider; +import junit.framework.TestCase; /** * @author wenshao @@ -31,6 +27,5 @@ public class WallDenySchemaTest extends TestCase { OracleWallProvider provider = new OracleWallProvider(); assertFalse(provider.checkValid(sql)); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java index b3ecfc866..1be5c287f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDenyTableTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.spi.OracleWallProvider; +import junit.framework.TestCase; /** * @author wenshao @@ -31,6 +27,5 @@ public class WallDenyTableTest extends TestCase { OracleWallProvider provider = new OracleWallProvider(); assertFalse(provider.checkValid(sql)); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java index d34212273..bab397709 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java index 80583ae12..8ce231b6b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; - +import junit.framework.TestCase; public class WallDropTest1 extends TestCase { private String sql = "DROP TABLE T1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java index b194feb6f..93fe95c98 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallDropTest2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; - +import junit.framework.TestCase; public class WallDropTest2 extends TestCase { private String sql = "DROP PROCEDURE IF EXISTS CP_PayCalc1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNoMatchDbTypeTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNoMatchDbTypeTest.java index 81f412d7d..2e232aab8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNoMatchDbTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNoMatchDbTypeTest.java @@ -2,11 +2,9 @@ package com.alibaba.druid.bvt.filter.wall; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallFilter; - import junit.framework.TestCase; public class WallFilterConfigSpiForNoMatchDbTypeTest extends TestCase { - private DruidDataSource dataSource; private WallFilter wallFilter; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNullDbTypeTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNullDbTypeTest.java index d3b2ab995..d97ed577f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNullDbTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterConfigSpiForNullDbTypeTest.java @@ -2,11 +2,9 @@ package com.alibaba.druid.bvt.filter.wall; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallFilter; - import junit.framework.TestCase; public class WallFilterConfigSpiForNullDbTypeTest extends TestCase { - private DruidDataSource dataSource; private WallFilter wallFilter; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java index c844e04a8..1db2c30c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest.java @@ -1,18 +1,14 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.wall.WallFilter; - public class WallFilterTest extends TestCase { private DruidDataSource dataSource; private WallFilter wallFilter; @@ -57,6 +53,7 @@ public class WallFilterTest extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java index 8f50ded68..536d3ea59 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest2.java @@ -1,21 +1,15 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.wall.WallFilter; - public class WallFilterTest2 extends TestCase { private DruidDataSource dataSource; private WallFilter wallFilter; @@ -116,6 +110,7 @@ public class WallFilterTest2 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -132,6 +127,7 @@ public class WallFilterTest2 extends TestCase { ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -146,6 +142,7 @@ public class WallFilterTest2 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, new int[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -160,6 +157,7 @@ public class WallFilterTest2 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, new String[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -174,6 +172,7 @@ public class WallFilterTest2 extends TestCase { PreparedStatement stmt = conn.prepareCall(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -188,6 +187,7 @@ public class WallFilterTest2 extends TestCase { PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -203,6 +203,7 @@ public class WallFilterTest2 extends TestCase { ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -218,6 +219,7 @@ public class WallFilterTest2 extends TestCase { stmt.execute(sql, Statement.NO_GENERATED_KEYS); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -234,6 +236,7 @@ public class WallFilterTest2 extends TestCase { stmt.execute(sql, new int[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -250,6 +253,7 @@ public class WallFilterTest2 extends TestCase { stmt.execute(sql, new String[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java index 4fb284f33..8c1b04485 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallFilterTest3.java @@ -1,8 +1,11 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.wall.WallConfig; +import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,15 +14,6 @@ import java.sql.Statement; import java.util.LinkedList; import java.util.List; -import junit.framework.TestCase; - - -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.wall.WallConfig; -import com.alibaba.druid.wall.WallFilter; - public class WallFilterTest3 extends TestCase { private DruidDataSource dataSource; private WallFilter wallFilter; @@ -42,7 +36,6 @@ public class WallFilterTest3 extends TestCase { dataSource.setProxyFilters(filters); dataSource.init(); - } protected void tearDown() throws Exception { @@ -130,6 +123,7 @@ public class WallFilterTest3 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -146,6 +140,7 @@ public class WallFilterTest3 extends TestCase { ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -160,6 +155,7 @@ public class WallFilterTest3 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, new int[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -174,6 +170,7 @@ public class WallFilterTest3 extends TestCase { PreparedStatement stmt = conn.prepareStatement(sql, new String[0]); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -188,6 +185,7 @@ public class WallFilterTest3 extends TestCase { PreparedStatement stmt = conn.prepareCall(sql); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -202,6 +200,7 @@ public class WallFilterTest3 extends TestCase { PreparedStatement stmt = conn.prepareCall(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -217,6 +216,7 @@ public class WallFilterTest3 extends TestCase { ResultSet.HOLD_CURSORS_OVER_COMMIT); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -232,6 +232,7 @@ public class WallFilterTest3 extends TestCase { stmt.execute(sql, Statement.NO_GENERATED_KEYS); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -248,6 +249,7 @@ public class WallFilterTest3 extends TestCase { stmt.execute(sql, new int[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); @@ -264,6 +266,7 @@ public class WallFilterTest3 extends TestCase { stmt.execute(sql, new String[0]); ResultSet rs = stmt.getResultSet(); while (rs.next()) { + // intentionally empty - just iterating through results } rs.close(); stmt.close(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java index 38ef0a627..0777cdc30 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java index f1284365d..338a6e4df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallHavingTest6.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao @@ -51,6 +46,4 @@ public class WallHavingTest6 extends TestCase { assertTrue(WallUtils.isValidateMySql(sql, config)); assertTrue(WallUtils.isValidateMySql(sql1, config)); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java index 110abfc25..6f3a047a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallInsertTest extends TestCase { private String sql = "INSERT INTO T (F1, F2) VALUES (1, 2)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java index 6d28c9bd5..1817774f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallInsertTest2.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallInsertTest2 extends TestCase { private String sql = "INSERT INTO T (F1, F2) VALUES (1, 2)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java index e24c20c91..b2f2c0fe4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallLineCommentTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; - +import junit.framework.TestCase; public class WallLineCommentTest extends TestCase { private String sql = "select f1 from t -- "; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java index 6bc1384db..f170c218f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiLineCommentTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallMultiLineCommentTest extends TestCase { private String sql = "select f1 from t where a=1 /* and b=1 */"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java index 3c5174b93..bfa5f64e6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallMultiStatementTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 测试禁止多条语句执行的场景 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java index 7414fafa3..2aa33c03f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallProviderTest.java @@ -1,18 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProviderStatValue; import com.alibaba.druid.wall.WallSqlStat; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallProviderTest extends TestCase { public void test_getSqlStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java index 8e18383d7..93d9bdae3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java index 57d962b4e..e8c4ed21b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallReadOnlyTest2.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.spi.MySqlWallProvider; import com.alibaba.druid.wall.spi.OracleWallProvider; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 @@ -49,7 +44,6 @@ public class WallReadOnlyTest2 extends TestCase { assertFalse(provider.checkValid(insert_sql)); assertFalse(provider.checkValid(update_sql)); assertFalse(provider.checkValid(delete_sql)); - } public void testORACLE() throws Exception { @@ -59,6 +53,5 @@ public class WallReadOnlyTest2 extends TestCase { assertFalse(provider.checkValid(insert_sql)); assertFalse(provider.checkValid(update_sql)); assertFalse(provider.checkValid(delete_sql)); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSQLExceptionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSQLExceptionTest.java index 6ce9a2e10..ee0bb6c1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSQLExceptionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSQLExceptionTest.java @@ -1,13 +1,7 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallSQLException; - +import junit.framework.TestCase; public class WallSQLExceptionTest extends TestCase { public void test_wall() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java index ad86d3993..21b88c537 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java index 03dca5791..a6d3f44da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectIntoTest1.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallSelectIntoTest1 extends TestCase { private String sql = "SELECT F1, F2 INTO T2 FROM T1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java index 88e09bc16..ef968ff6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest.java @@ -18,8 +18,11 @@ package com.alibaba.druid.bvt.filter.wall; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; -import com.alibaba.druid.wall.WallUtils; -import com.alibaba.druid.wall.spi.*; +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 junit.framework.TestCase; public class WallSelectLimitTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java index 922130ae7..516bcc792 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java @@ -20,7 +20,11 @@ import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; -import com.alibaba.druid.wall.spi.*; +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 junit.framework.TestCase; public class WallSelectLimitTest_2 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java index 6a0796f86..5f616c1d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java index f2e32764d..c6e410776 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest0.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java index 59d50100b..8c21f9ea4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest1.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java index 41f90212c..e93facf7b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest2.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java index d392f86c2..3369b7eac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest3.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java index 1a9ae2810..bd3ded764 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest4.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Where条件 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java index e572b9400..8ff4c36f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest5.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java index 4ffbcad2a..4e2bc9b42 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectWhereTest6.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao @@ -54,6 +49,4 @@ public class WallSelectWhereTest6 extends TestCase { assertTrue(WallUtils.isValidateMySql(sql, config)); assertTrue(WallUtils.isValidateMySql(sql1, config)); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTestWhereAlwaysTrue.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTestWhereAlwaysTrue.java index c3a66509f..3d9590f69 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTestWhereAlwaysTrue.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTestWhereAlwaysTrue.java @@ -1,13 +1,14 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; -import com.alibaba.druid.wall.spi.*; +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 junit.framework.TestCase; public class WallStatTestWhereAlwaysTrue extends TestCase { @@ -35,7 +36,6 @@ public class WallStatTestWhereAlwaysTrue extends TestCase { "select * from T where a=1 ", }; - protected void setUp() throws Exception { WallContext.clearContext(); } @@ -44,7 +44,6 @@ public class WallStatTestWhereAlwaysTrue extends TestCase { WallContext.clearContext(); } - protected void doTest(final WallProvider provider) { final WallConfig config = provider.getConfig(); config.setDeleteWhereAlwayTrueCheck(true); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java index 9d0c8b1c1..84422cf73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList.java @@ -1,15 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_WhiteList extends TestCase { protected void setUp() throws Exception { @@ -35,5 +30,4 @@ public class WallStatTest_WhiteList extends TestCase { assertEquals(1, provider.getWhiteList().size()); assertEquals(3001, provider.getCheckCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java index 69fbb1537..2c89d6412 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_WhiteList_disable.java @@ -1,16 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_WhiteList_disable extends TestCase { protected void setUp() throws Exception { @@ -43,5 +37,4 @@ public class WallStatTest_WhiteList_disable extends TestCase { assertEquals(0, provider.getWhiteList().size()); assertEquals(602, provider.getCheckCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java index 3c3fa55f0..56b20859f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_alter_table.java @@ -1,18 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; 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 junit.framework.TestCase; public class WallStatTest_alter_table extends TestCase { public void testMySql() throws Exception { @@ -38,19 +30,18 @@ public class WallStatTest_alter_table extends TestCase { // public void testPG() throws Exception { // WallProvider provider = new PGWallProvider(); // provider.getConfig().setAlterTableAllow(true); -// +// // assertTrue(provider.checkValid(sql)); -// WallTableStat tableStat = provider.getTableStat("t"); +// WallTableStat tableStat = provider.getTableStat("t"); // assertEquals(1, tableStat.getAlterCount()); // } -// +// // public void testSQLServer() throws Exception { // WallProvider provider = new SQLServerWallProvider(); // provider.getConfig().setAlterTableAllow(true); -// +// // assertTrue(provider.checkValid(sql)); -// WallTableStat tableStat = provider.getTableStat("t"); +// WallTableStat tableStat = provider.getTableStat("t"); // assertEquals(1, tableStat.getAlterCount()); // } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java index e129da433..8ef8d53b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_1.java @@ -1,15 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_blackList_1 extends TestCase { protected void setUp() throws Exception { @@ -37,7 +32,6 @@ public class WallStatTest_blackList_1 extends TestCase { assertEquals(1001, provider.getCheckCount()); } - public void testMysql2() { WallProvider provider = new MySqlWallProvider(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java index 189f6781d..ef010a351 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blackList_syntaxError.java @@ -1,15 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_blackList_syntaxError extends TestCase { protected void setUp() throws Exception { @@ -50,5 +45,4 @@ public class WallStatTest_blackList_syntaxError extends TestCase { assertEquals(1, provider.getHardCheckCount()); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java index 24f31b334..7e584b9ee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_blacklist.java @@ -1,16 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_blacklist extends TestCase { private String sql = "select * from t where id = ? and 1 = 1"; @@ -34,7 +28,7 @@ public class WallStatTest_blacklist extends TestCase { assertEquals(9, provider.getWhiteListHitCount()); assertEquals(0, provider.getBlackListHitCount()); - provider.reset();; + provider.reset(); provider.getConfig().setConditionAndAlwayTrueAllow(false); for (int i = 0; i < 10; ++i) { assertFalse(provider.checkValid(sql)); @@ -43,7 +37,5 @@ public class WallStatTest_blacklist extends TestCase { assertEquals(10, tableStat.getSelectCount()); assertEquals(0, provider.getWhiteListHitCount()); assertEquals(9, provider.getBlackListHitCount()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java index ba3b29a6e..6c8e72457 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_create_table.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; 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 junit.framework.TestCase; public class WallStatTest_create_table extends TestCase { private String sql = "create table t (fid int, fname varchar(50))"; @@ -52,5 +46,4 @@ public class WallStatTest_create_table extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java index 3a84a1e4e..94278e07d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_delete.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,6 +7,7 @@ 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 junit.framework.TestCase; public class WallStatTest_delete extends TestCase { private String sql = "delete from T where fid = ?"; @@ -52,5 +47,4 @@ public class WallStatTest_delete extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getDeleteCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java index b19f87d97..0ac0360f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_drop_table.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,6 +7,7 @@ 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 junit.framework.TestCase; public class WallStatTest_drop_table extends TestCase { private String sql = "drop table t"; @@ -60,5 +55,4 @@ public class WallStatTest_drop_table extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getDropCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java index 7c50af040..c71d8d796 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_function_stats.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallFunctionStat; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_function_stats extends TestCase { private String sql = "select len(fname), len(fdesc) from t"; @@ -44,6 +39,4 @@ public class WallStatTest_function_stats extends TestCase { assertEquals(4, functionStat.getInvokeCount()); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java index 0aaaa350d..32cf0d38a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_insert.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; 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 junit.framework.TestCase; public class WallStatTest_insert extends TestCase { private String sql = "insert into t (fid, fname) values (?, ?)"; @@ -44,5 +38,4 @@ public class WallStatTest_insert extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getInsertCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java index ab1caabd4..7c7308e99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,6 +7,7 @@ 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 junit.framework.TestCase; public class WallStatTest_select extends TestCase { private String sql = "select * from t where id = ?"; @@ -52,5 +47,4 @@ public class WallStatTest_select extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getSelectCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java index 713779ed5..f950708fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_1.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,6 +7,7 @@ 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 junit.framework.TestCase; 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"; @@ -76,5 +71,4 @@ public class WallStatTest_select_1 extends TestCase { assertEquals(1, tableStat.getSelectCount()); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java index 1a2bbf5a6..ce09e678a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_2.java @@ -43,5 +43,4 @@ public class WallStatTest_select_2 WallProvider provider = new SQLServerWallProvider(); assertTrue(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java index 262e8e094..8771bca82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_select_into.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,6 +7,7 @@ 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 junit.framework.TestCase; public class WallStatTest_select_into extends TestCase { private String sql = "select * into x from t where id = ?"; @@ -61,5 +56,4 @@ public class WallStatTest_select_into extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getSelectCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java index ba892d18f..266b82a78 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_statMap.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import java.util.Collection; -import java.util.Map; - -import junit.framework.TestCase; - - import com.alibaba.druid.stat.DruidStatManagerFacade; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.util.Collection; +import java.util.Map; public class WallStatTest_statMap extends TestCase { protected void setUp() throws Exception { @@ -68,5 +63,4 @@ public class WallStatTest_statMap extends TestCase { assertEquals(2, ((Collection>) statMapMerged.get("blackList")).size()); assertEquals(33L, statMapMerged.get("violationEffectRowCount")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java index c762e5ccb..d4bf0a4ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_update.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; @@ -13,7 +7,7 @@ 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 junit.framework.TestCase; public class WallStatTest_update extends TestCase { private String sql = "update t set fname = ? where fid = ?"; @@ -53,5 +47,4 @@ public class WallStatTest_update extends TestCase { WallTableStat tableStat = provider.getTableStat("t"); assertEquals(1, tableStat.getUpdateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java index 5bf085875..afa12058f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallStatTest_whiteList_syntaxError.java @@ -1,15 +1,10 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallContext; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.WallTableStat; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class WallStatTest_whiteList_syntaxError extends TestCase { protected void setUp() throws Exception { @@ -51,5 +46,4 @@ public class WallStatTest_whiteList_syntaxError extends TestCase { assertEquals(2, provider.getHardCheckCount()); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java index e3ceeeed3..9b1a6ed3a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest.java @@ -15,19 +15,13 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallTruncateTest extends TestCase { private String sql = "TRUNCATE TABLE T1"; - protected void setUp() throws Exception { //config.setTruncateAllow(true); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java index 7121a5824..83355094a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallTruncateTest1.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallTruncateTest1 extends TestCase { private String sql = "TRUNCATE TABLE T1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java index 1fea5c55d..624565c0c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java index 8fcfeddec..d4dad056f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 @@ -30,7 +25,6 @@ import com.alibaba.druid.wall.WallUtils; * @author wenshao */ public class WallUnionTest2 extends TestCase { - public static final String UNION_SQL1 = "select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1"; public static final String UNION_SQL2 = "select f1, f2 from t where f1 = 1 union select 1, 2 where 1 = 1 --"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java index 65792ebf7..ea69037b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest3.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，被攻击者用于测试当前SQL拥有多少字段 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java index 478fab47e..58d0794ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUnionTest4.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; @@ -28,7 +25,6 @@ import junit.framework.TestCase; * @author wenshao */ public class WallUnionTest4 extends TestCase { - public static final String UNION_SQL1 = "SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X)"; public static final String UNION_SQL2 = "SELECT id, product FROM T1 t where id=1 UNION (SELECT * FROM (SELECT 1,'x') X) -- "; @@ -43,7 +39,6 @@ public class WallUnionTest4 extends TestCase { config.setCommentAllow(true); assertTrue(WallUtils.isValidateMySql(UNION_SQL1, config)); assertTrue(WallUtils.isValidateMySql(UNION_SQL2, config)); - } public void testORACLE() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java index 9fb702b87..9ef939650 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateCheckTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.filter.wall; import com.alibaba.druid.wall.WallCheckResult; -import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUpdateCheckHandler; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java index b1c0012c0..fedc15e8c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallUpdateTest extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java index 6fbaea757..1d8ac286c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; - +import junit.framework.TestCase; public class WallUpdateTest1 extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ?"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java index f50d0ab25..6e1a2e8ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallUpdateTest2 extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ?"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java index 57231f228..e719dfcf7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest3.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java index 247900ea5..950dd99fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateTest4.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class WallUpdateTest4 extends TestCase { private String sql = "UPDATE T_USER SET FNAME = ? WHERE FID = ? OR 1 = 1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java index a112a0a00..f61f6d976 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallConfig; -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景，检测可疑的Having条件 @@ -62,5 +57,4 @@ public class WallUpdateWhereTest extends TestCase { assertTrue(WallUtils.isValidateOracle(sql, config)); assertFalse(WallUtils.isValidateOracle(sql2, config)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java index db0b5be60..e2daa00fd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallUpdateWhereTest1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * @author wenshao diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java index 31a486154..629f661d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.wall.spi.WallVisitorUtils; +import junit.framework.TestCase; public class WallVisitorUtilsLargeOrTest extends TestCase { public void test_largeOr() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java index 37d26a273..ba58c6f52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java @@ -15,12 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.wall.spi.WallVisitorUtils; +import junit.framework.TestCase; public class WallVisitorUtilsTest extends TestCase { public void test_isTrue() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java index 981a834b0..13cb1e2a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallDescribteTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java index cc68197dc..d5126f165 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLimitTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问MySql系统函数 @@ -32,5 +28,4 @@ public class MySqlWallLimitTest extends TestCase { assertFalse(WallUtils.isValidateMySql("SELECT * FROM T LIMIT 0")); assertFalse(WallUtils.isValidateMySql("SELECT * FROM T LIMIT 10, 0")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java index 78da1effb..15e95fde3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallLoadDataInfileTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问MySql系统函数 @@ -31,5 +27,4 @@ public class MySqlWallLoadDataInfileTest extends TestCase { public void test_permit_stmt() throws Exception { assertFalse(WallUtils.isValidateMySql("load data infile 'c:/boot.ini' into table foo")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java index 5175242a5..f549904d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitFunctionTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MySqlWallPermitFunctionTest extends TestCase { public void test_permitTable() throws Exception { @@ -37,5 +32,4 @@ public class MySqlWallPermitFunctionTest extends TestCase { assertTrue(WallUtils.isValidateMySql("select * from(SELECT User,Password FROM \"mysql\".\"user\") a")); assertTrue(WallUtils.isValidateMySql("select * from(SELECT User,Password FROM MYSQL.USER) a")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java index fb755a765..1843318af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitTableTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MySqlWallPermitTableTest extends TestCase { public void test_default_true() throws Exception { @@ -33,12 +28,10 @@ public class MySqlWallPermitTableTest extends TestCase { 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); assertTrue(WallUtils.isValidateMySql("select benchmark( 500000, sha1( 'test' ) ) FROM X", config)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java index faafdc3c6..9e74c6b09 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallPermitVariantTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java index b95fec83d..f2b6de6ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MySqlWallTest extends TestCase { public void testWall() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java index f9bf2dee0..f6c6614aa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest1.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java index 0d397a38b..677e7b694 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest10.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java index b53a6fcbb..82e9a3e51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest100.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest100 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest100 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java index 9d03f7db1..a18ece7f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest101.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest101 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest101 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java index 868035ba8..d24f7c3b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest102.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest102 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest102 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java index a6b6099d1..ca48bd9e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest103.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest103 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest103 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java index f161cbce5..c4a6ab252 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest104.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest104 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest104 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java index b6ecda8f6..85a2d48b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest105.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest105 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest105 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java index 73e93071a..c61e0029a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest106.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest106 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest106 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java index 8491b7550..1360ff622 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest107.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest107 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest107 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java index 15ade5d01..4629a42f9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest108.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest108 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest108 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java index 4ca0f153d..d7b1452e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest109.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest109 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest109 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java index 1095fe069..8480662fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest11.java @@ -15,10 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -30,11 +28,11 @@ import com.alibaba.druid.wall.WallUtils; 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java index c81c9bc02..eb746a247 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest110.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest110 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest110 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java index 492ad226d..34467d498 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest111.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest111 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest111 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java index 182455643..dc625642b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest112.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest112 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest112 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java index 4dee76cdb..aafa498cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest113.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest113 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest113 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java index 796375351..fc514a2c9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest114.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest114 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest114 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java index e6ae8fbbd..a39ded8ee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest115.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest115 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest115 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java index 9ee264d10..a239e4b47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest116.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest116 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest116 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java index 2f964121c..559c71287 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest117.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest117 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest117 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java index deffe34c9..7d0f3623f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest118.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest118 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest118 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java index c40187a7d..e9f54bf1a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest119.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest119 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest119 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java index 057e3f2c8..3c25d2139 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest12.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,8 +28,8 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest12 extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java index 8e5e34250..d35d9a6f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest120.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest120 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest120 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java index 39f83ec20..a57aaafc0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest121.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest121 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest121 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java index e99baf342..f983254fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest122.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest122 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest122 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java index 47ead27d0..e69ee84af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest123.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest123 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest123 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java index f6aff46bf..ac6af9d0f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest124.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest124 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest124 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java index 7d4b0364e..95f1e5a55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest125.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest125 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest125 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java index 8790f4b6e..69954e0d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest126.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest126 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest126 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java index 02dfd5fd5..e7a906db1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest127.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest127 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest127 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java index edf38d673..361677688 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest128.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest128 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest128 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java index d0cb5e4a5..f2f4f85d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest129.java @@ -15,16 +15,11 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.net.URLDecoder; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.net.URLDecoder; public class MySqlWallTest129 extends TestCase { public void test_false() throws Exception { @@ -38,7 +33,5 @@ public class MySqlWallTest129 extends TestCase { System.out.println(sql); assertFalse(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java index d6ddabe33..fcda0090c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest13.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,9 +28,9 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest13 extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java index 48a35b593..7e3cf5e22 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest130.java @@ -15,16 +15,11 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.net.URLDecoder; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.net.URLDecoder; public class MySqlWallTest130 extends TestCase { public void test_false() throws Exception { @@ -38,7 +33,5 @@ public class MySqlWallTest130 extends TestCase { System.out.println(sql); assertFalse(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java index 8e0c9d6be..2a6024716 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest131.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest131 extends TestCase { public void test_false() throws Exception { @@ -30,5 +26,4 @@ public class MySqlWallTest131 extends TestCase { assertFalse(provider.checkValid("select * from t where id = 1 /*!30000union all select 2*/")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java index 531b36ffc..05e7b2a98 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest132.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest132 extends TestCase { public void test_false() throws Exception { @@ -30,5 +26,4 @@ public class MySqlWallTest132 extends TestCase { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java index 3444b0388..d1367ba7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest133.java @@ -15,20 +15,15 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest133 extends TestCase { public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - assertFalse(provider.checkValid("select * from t where id = 1 " // + assertFalse(provider.checkValid("select * from t where id = 1 " + "UNION SELECT @ from t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java index f186061cc..3b5887a88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest134.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest134 extends TestCase { public void test_false() throws Exception { @@ -31,5 +26,4 @@ public class MySqlWallTest134 extends TestCase { assertTrue(provider.checkValid("SELECT 1 FROM dual WHERE 1 = '1'''''''''''''UNION SELECT '2';")); assertFalse(provider.checkValid("SELECT 1 FROM t WHERE 1 = '1'''''''''''''UNION SELECT '2' --;")); //end of comment --> false } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java index a9927f935..b2f1a1197 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest135.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest135 extends TestCase { public void test_false() throws Exception { @@ -29,5 +25,4 @@ public class MySqlWallTest135 extends TestCase { assertFalse(provider.checkValid("SELECT * FROM Users WHERE id = '1' AND MID(VERSION(),1,1) = '5';")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java index 058731058..07c4ecad6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest136.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest136 extends TestCase { public void test_false() throws Exception { @@ -29,5 +25,4 @@ public class MySqlWallTest136 extends TestCase { assertFalse(provider.checkValid("SELECT * FROM Users WHERE id = '1' AND MID(@@VERSION,1,1) = '5';")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java index fa7b1b8ee..74c9b8b8a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest137.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest137 extends TestCase { public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - assertTrue(provider.checkValid("select bi.title from bbt_item_chd_3 bi " // + 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 = '营店'")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java index 838ac9e98..46b32143c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest138.java @@ -15,29 +15,24 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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) " // + 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 " // + + "from dual " + "where not exists ("// - + " select EMAIL" // - + " from T01_CHECKIN_CUSTOMER" // - + " where WEB_USER_ID=2 and EMAIL='1223@123.com'" // + + " select EMAIL" + + " from T01_CHECKIN_CUSTOMER" + + " where WEB_USER_ID=2 and EMAIL='1223@123.com'" + ")"; assertTrue(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java index 89ee5d8d6..967aeae63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest139.java @@ -15,37 +15,33 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; 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 " // + + " from (" + + " select '' buyer_nick from dual " + " where 1=0 "// - + " union " // + + " union " + " select distinct buyer_nick "// + " from sys_info.orders "// - + " where 1=1 and receiver_district in ('平谷区')" // - + ") a " // - + "inner join (" // + + " where 1=1 and receiver_district in ('平谷区')" + + ") a " + + "inner join (" + " select buyer_nick from ("// + " select distinct buyer_nick "// - + " from sys_info.orders " // + + " 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 ('创维官方旗舰店') " // + + " ) 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)"; assertTrue(provider.checkValid(sql)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java index 1d659f173..ed4c1aaad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest14.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,8 +28,8 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest14 extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java index 1d01bf0ff..14c254431 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest140.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest140 extends TestCase { public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - String sql = "SELECT name, '******' password, createTime from user " // + 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 '%'=''"; assertFalse(provider.checkValid(sql)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java index c02eeea7b..92a99c5cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest141.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest141 extends TestCase { public void test_false() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java index c045e32c6..1487d9591 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest142.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest142 extends TestCase { public void test_false() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java index 223e19157..87c79c132 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest143.java @@ -15,31 +15,27 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest143 extends TestCase { public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); - String sql = "SELECT" // - + " `Extent1`.`ID`, " // - + " `Extent1`.`State`, " // - + " `Extent1`.`CreateTime`, " // - + " `Extent1`.`UpdateTime`, " // - + " `Extent1`.`OpeningBank`, " // - + " `Extent1`.`BankAccount`, " // - + " `Extent1`.`BankAccountName`, " // - + " `Extent1`.`Zone`, " // - + " `Extent1`.`AccountantMobile`, " // - + " `Extent1`.`IsPublic`" // - + " FROM `paybank` AS `Extent1`" // - + " WHERE (`Extent1`.`State` > -1)" // + String sql = "SELECT" + + " `Extent1`.`ID`, " + + " `Extent1`.`State`, " + + " `Extent1`.`CreateTime`, " + + " `Extent1`.`UpdateTime`, " + + " `Extent1`.`OpeningBank`, " + + " `Extent1`.`BankAccount`, " + + " `Extent1`.`BankAccountName`, " + + " `Extent1`.`Zone`, " + + " `Extent1`.`AccountantMobile`, " + + " `Extent1`.`IsPublic`" + + " FROM `paybank` AS `Extent1`" + + " WHERE (`Extent1`.`State` > -1)" + " AND ((`Extent1`.`Zone`) = (CASE WHEN (1 IS NULL) THEN (1) ELSE (1) END))"; assertTrue(provider.checkValid(sql)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java index 5e2cf252b..3527b2c7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest144.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest144 extends TestCase { public void test_false() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java index 9933792a4..a9fb8497b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest145.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest145 extends TestCase { public void test_false() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java index a9bbfd9e6..e9a38eaec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest146.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java index a8ec2fade..756aff89b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest147_optimize.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java index 45ef25a8c..2f6cffc5c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest148.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java index 90f7fdf07..f2ef97654 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest15.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,15 +28,15 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest15 extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java index bbb9fe3f9..5c05f0b55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest16.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,6 +28,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest16 extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java index 6e1227d6f..f696a03ee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest17.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,6 +28,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest17 extends TestCase { public void test_true() throws Exception { 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 { 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 { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java index 12c3cedcf..9e767d828 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest33.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -34,13 +29,13 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest33 extends TestCase { public void test_false() throws Exception { 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); assertTrue(WallUtils.isValidateMySql(// - "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?", config)); // + "DELETE FROM lhwdesign_data WHERE data_id IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?", config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java index 2185b4f6c..f080e3edc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest34.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,6 +28,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest34 extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "SELECT @@sql_big_selects")); // + "SELECT @@sql_big_selects")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java index bc1caa3bd..c9206df5e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest35.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,8 +32,8 @@ public class MySqlWallTest35 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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');")); assertEquals(1, provider.getTableStat("test2tb").getReplaceCount()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java index e7cd1caa4..eef0da681 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest36.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,7 +32,7 @@ public class MySqlWallTest36 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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")); assertEquals(1, provider.getTableStat("13452845947").getSelectCount()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java index 719bb857b..0ba3ef37a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest37.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,7 +32,7 @@ public class MySqlWallTest37 extends TestCase { WallProvider provider = new MySqlWallProvider(); assertTrue(provider.checkValid(// - "call partnerAttribute(3061975048797781,105385028,5,@ret)")); // + "call partnerAttribute(3061975048797781,105385028,5,@ret)")); assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java index 84905e82f..d0b94fa85 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest38.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,7 +32,7 @@ public class MySqlWallTest38 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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")); assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java index 304545cd9..491bec189 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest39.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,7 +32,7 @@ public class MySqlWallTest39 extends TestCase { WallProvider provider = new MySqlWallProvider(); assertTrue(provider.checkValid(// - "COMMIT")); // + "COMMIT")); assertEquals(0, provider.getTableStats().size()); System.out.println(JSONUtils.toJSONString(provider.getStatsMap())); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java index 2925a2264..2a290ed95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest4.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java index ef40c6885..862ab14b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest40.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -38,7 +32,7 @@ public class MySqlWallTest40 extends TestCase { provider.getConfig().setUseAllow(false); assertFalse(provider.checkValid(// - "use huaianapp")); // + "use huaianapp")); assertEquals(0, provider.getTableStats().size()); } @@ -47,7 +41,7 @@ public class MySqlWallTest40 extends TestCase { WallProvider provider = new MySqlWallProvider(); assertTrue(provider.checkValid(// - "use huaianapp")); // + "use huaianapp")); assertEquals(0, provider.getTableStats().size()); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java index 0a99cc328..170ed4d96 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest41.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,7 +31,7 @@ public class MySqlWallTest41 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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")); assertEquals(1, provider.getTableStats().size()); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java index 16d8de25b..a6cc9b45d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest42.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,9 +31,9 @@ public class MySqlWallTest42 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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)")); assertEquals(1, provider.getTableStats().size()); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java index 486ac20e0..b54dd4740 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest43.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; @@ -35,7 +31,7 @@ public class MySqlWallTest43 extends TestCase { WallProvider provider = new MySqlWallProvider(); provider.getConfig().setConditionAndAlwayTrueAllow(false); assertFalse(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // + "SELECT COUNT(1) AS count FROM `team` " + "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); assertEquals(1, provider.getTableStats().size()); @@ -46,7 +42,7 @@ public class MySqlWallTest43 extends TestCase { provider.getConfig().setConditionAndAlwayTrueAllow(true); assertTrue(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // + "SELECT COUNT(1) AS count FROM `team` " + "WHERE `team_type` = 'normal' AND 1 = 1 AND `city_id` IN (0,10)")); assertEquals(1, provider.getTableStats().size()); @@ -56,7 +52,7 @@ public class MySqlWallTest43 extends TestCase { WallProvider provider = new MySqlWallProvider(); assertFalse(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // + "SELECT COUNT(1) AS count FROM `team` " + "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); assertEquals(1, provider.getTableStats().size()); @@ -67,7 +63,7 @@ public class MySqlWallTest43 extends TestCase { provider.getConfig().setConditionAndAlwayFalseAllow(true); assertTrue(provider.checkValid(// - "SELECT COUNT(1) AS count FROM `team` " + // + "SELECT COUNT(1) AS count FROM `team` " + "WHERE `team_type` = 'normal' AND 1 = 2 AND `city_id` IN (0,10)")); assertEquals(1, provider.getTableStats().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java index f07df8c72..14aca48b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest44.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java index aa7f04490..04b4c2ecc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest45.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java index 2cbc9e7f8..89ff43244 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest46.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java index f8d92e788..0ebcecda7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest47.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,11 +31,11 @@ public class MySqlWallTest47 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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 " + // + "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")); assertEquals(1, provider.getTableStats().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java index 2a04b197d..33922b11b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest48.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,10 +31,10 @@ public class MySqlWallTest48 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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 " + // + "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())")); assertEquals(3, provider.getTableStats().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java index c1c544aef..9918d3887 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest49.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,29 +31,29 @@ public class MySqlWallTest49 extends TestCase { WallProvider provider = new MySqlWallProvider(); 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 " + // + "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")); assertEquals(4, provider.getTableStats().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java index e5cab708c..a642c7fbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest5.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java index 35e805057..499765372 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest50.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java index 4b30ff7b5..3d12b0eee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest51.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java index 09c491526..160596f4b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest52.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java index afc445098..1826057d9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest53.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java index 151c8245e..43d281c0b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest54.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java index a6199f8e7..7c3e5076c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest55.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -65,6 +59,5 @@ public class MySqlWallTest55 extends TestCase { assertFalse(provider.checkValid(// "select * from t where fid = 1 union SELECT USER() FROM X")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java index 8743410ce..0716cc406 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest56.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java index 1cd076056..42feaaa66 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest57.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java index c883fe87e..bdd2d5b23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest58.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,11 +32,10 @@ public class MySqlWallTest58 extends TestCase { provider.getConfig().setSchemaCheck(false); assertTrue(provider.checkValid(// - "SELECT COUNT(*) FROM information_schema.processlist " + // - "WHERE user <> 'replication' AND id <> CONNECTION_ID() " + // + "SELECT COUNT(*) FROM information_schema.processlist " + + "WHERE user <> 'replication' AND id <> CONNECTION_ID() " + "AND time > 60 AND command <> 'Sleep'")); assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java index 190cbe7be..6237dbdc6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest59.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,11 +32,10 @@ public class MySqlWallTest59 extends TestCase { provider.getConfig().setSchemaCheck(true); assertTrue(provider.checkValid(// - "SELECT * FROM mysql.proc " + // - "WHERE 1=1 AND db LIKE 'dsmessagedb001'" + // + "SELECT * FROM mysql.proc " + + "WHERE 1=1 AND db LIKE 'dsmessagedb001'" + " AND name LIKE 'Proc_getRemindinfoByRemindFlag'")); assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java index b7b9b97fe..eb67ef530 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest6.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java index 673037d20..8bd1d93eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest60.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest60 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java index 44826576d..9a064999b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest61.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -48,11 +42,10 @@ public class MySqlWallTest61 extends TestCase { provider.getConfig().setSchemaCheck(true); assertFalse(provider.checkValid(// - "SELECT * FROM T " + // - "UNION " + // + "SELECT * FROM T " + + "UNION " + "SELECT * FROM `information_schema`.`columns` WHERE TABLE_NAME='aaaa' AND TABLE_SCHEMA='xxxx'")); assertEquals(2, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java index f16f456d0..e8cc4b95f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest62.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -38,16 +32,16 @@ public class MySqlWallTest62 extends TestCase { provider.getConfig().setSchemaCheck(true); 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 " + // + "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")); assertEquals(4, provider.getTableStats().size()); @@ -57,14 +51,12 @@ public class MySqlWallTest62 extends TestCase { 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" + // + String sql = "SELECT 1, 2, 3" + + " UNION ALL SELECT a from tt where c=1" + " UNION ALL SELECT 2 FROM dual --"; assertFalse(provider.checkValid(sql)); sql = "SELECT a from t where c=1 UNION ALL SELECT 2 FROM dual --"; assertFalse(provider.checkValid(sql)); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java index 45f1b8444..7669babb4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest63.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -55,5 +49,4 @@ public class MySqlWallTest63 extends TestCase { assertTrue(provider.checkValid(sql2)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java index 50a29e741..0083ffcfa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest64.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -43,6 +38,4 @@ public class MySqlWallTest64 extends TestCase { assertEquals(2, provider.getTableStats().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java index 7aa2c1842..9fda9c793 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest65.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java index 5348ac069..d3c0663e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest66.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,19 +32,18 @@ public class MySqlWallTest66 extends TestCase { provider.getConfig().setSchemaCheck(true); 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 " + // + "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")); assertEquals(2, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java index 608c87ec3..a67298361 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest67.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,19 +32,18 @@ public class MySqlWallTest67 extends TestCase { provider.getConfig().setSchemaCheck(true); 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')) " + // + "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")); assertEquals(2, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java index 3dab43e39..eaf19c8e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest68.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,10 +32,9 @@ public class MySqlWallTest68 extends TestCase { provider.getConfig().setSchemaCheck(true); assertTrue(provider.checkValid(// - "SELECT * FROM `information_schema`.`ROUTINES` " + // + "SELECT * FROM `information_schema`.`ROUTINES` " + "WHERE `information_schema`.`ROUTINES`.`ROUTINE_SCHEMA` = 'mzsg_g001'")); assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java index 389dd81cd..afe2c7659 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest69.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest69 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java index 39e5c1427..10aaf10e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest7.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java index 6ae69e905..6b7d2b93f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest70.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -42,5 +37,4 @@ public class MySqlWallTest70 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java index 81f759f28..e29c01dbc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest71.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -54,5 +48,4 @@ public class MySqlWallTest71 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java index fdc1d0b17..c9c1f9117 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest72.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -49,5 +43,4 @@ public class MySqlWallTest72 extends TestCase { "select * from t /**/ where fid = 123 AND 1=1 --")); //FIXME /**/ } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java index d7bc75bee..ab06046eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest73.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -38,16 +33,15 @@ public class MySqlWallTest73 extends TestCase { provider.getConfig().setCommentAllow(true); 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 " + // + "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")); assertEquals(3, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java index aa446c406..e637de42f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest74.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,15 +32,15 @@ public class MySqlWallTest74 extends TestCase { provider.getConfig().setCommentAllow(true); - final String sql = "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 " + // + final String sql = "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"; provider.getConfig().setSelectWhereAlwayTrueCheck(true); assertFalse(provider.checkValid(sql)); @@ -55,5 +50,4 @@ public class MySqlWallTest74 extends TestCase { provider.getConfig().setSelectWhereAlwayTrueCheck(false); assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java index 693c7ff23..a6d514380 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest75.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -39,10 +34,9 @@ public class MySqlWallTest75 extends TestCase { 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\\'" // + + ",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")); assertEquals(0, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java index caf69a1e6..b50e0969d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest76.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest76 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java index a7121a222..f576da9b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest77.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest77 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java index ad296569b..b0fab6a3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest78.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest78 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java index 24160d9d6..03bbde8c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest79.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest79 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java index eacf342ef..ca91fef46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest8.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java index 05e436083..49f05afb4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest80.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -51,5 +46,4 @@ public class MySqlWallTest80 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java index 9f405aa0c..ad1bfc32c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest81.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest81 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java index 639008aad..c9811ff14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest82.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest82 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java index cce0690ca..c60680a80 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest83.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest83 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java index 83c941870..0b8b4b7bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest84.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest84 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java index baaf0ac2d..dbd8bb046 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest85.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest85 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java index 2b99cfdd5..5650a9157 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest86.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest86 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("lookup")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java index b9bd707e6..92bfe7abc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest87.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest87 extends TestCase { assertEquals(2, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java index 20e9c78b7..856ab04e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest88.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -41,5 +36,4 @@ public class MySqlWallTest88 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java index eb2fece66..733ed2f96 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest89.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -43,5 +38,4 @@ public class MySqlWallTest89 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("accounts")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java index 498f740af..4c67ede33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest9.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,8 +28,8 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest9 extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "REPLACE INTO lhwonline_guest (`ip`, `created_time`, `modify_time`, `fid`, `tid`, `request`)" + // - "\nVALUES ('1', '1364366764', '1364368276', '0', '3436'" + // + "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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java index 023e02c40..88e31ac30 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest90.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,12 +34,11 @@ public class MySqlWallTest90 extends TestCase { //FIXME 不知此测试用例的真实意图 assertFalse(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\" " + // + "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")); assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t10006_men_xing_jia_ge_fen_lei")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java index 2071e1950..822f57edf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest91.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.wall.WallProvider; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java index 58b7e46de..27e18b14c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest92.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -42,5 +36,4 @@ public class MySqlWallTest92 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java index b8c48c3ce..4883cc13f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest93.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest93 extends TestCase { assertEquals(0, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java index c58028b5a..8bb091e5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest94.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -46,5 +40,4 @@ public class MySqlWallTest94 extends TestCase { assertTrue(provider.checkValid(// "select * from test having 1=1")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java index 934fc3b0d..b7f61c519 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest95.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -38,5 +34,4 @@ public class MySqlWallTest95 extends TestCase { assertFalse(provider.checkValid(// "select * from test /*!40101fff*/")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java index a4a698245..23c8dd991 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest96.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +36,4 @@ public class MySqlWallTest96 extends TestCase { assertTrue(provider.checkValid(// sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java index aded0b9ea..4a19755e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest97.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest97 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest97 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java index a726b6487..5009249a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest98.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest98 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest98 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java index 6838da4ec..0a66c15f9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest99.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest99 extends TestCase { public void test_false() throws Exception { @@ -32,5 +28,4 @@ public class MySqlWallTest99 extends TestCase { assertFalse(provider.checkValid(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java index 7b8834432..cbe4896e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_comment.java @@ -15,11 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -64,5 +62,4 @@ public class MySqlWallTest_comment extends TestCase { assertFalse(provider.checkValid("SELECT * FROM t where a=1 -- and c=1")); assertFalse(provider.checkValid("SELECT * FROM t where a=1 /* and c=1 */")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java index 7a6354fd8..2231237d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_concat.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; public class MySqlWallTest_concat extends TestCase { public void test_true() throws Exception { @@ -36,5 +31,4 @@ public class MySqlWallTest_concat extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("tb_product_word")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java index b2f0f3e9e..cde2bd36f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_having.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java index a39e38956..fbe00e7f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_hint.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; @@ -12,7 +9,7 @@ public class MySqlWallTest_hint extends TestCase { WallConfig config = new WallConfig(); config.setHintAllow(false); String sql = "select * from person where id = '3'/**/union select 0,1,v from (select 1,2,user/*!() as v*/) a where '1'<>''"; - assertFalse(WallUtils.isValidateMySql(sql, config)); // + assertFalse(WallUtils.isValidateMySql(sql, config)); } public void test_false_1() throws Exception { @@ -20,22 +17,22 @@ public class MySqlWallTest_hint extends TestCase { config.setHintAllow(false); config.setMultiStatementAllow(true); String sql = "select * from person where id = '3'/**/union select 0,1,v from (select 1,2,user/*!() as v*/) a where '1'<>''"; - assertFalse(WallUtils.isValidateMySql(sql, config)); // + assertFalse(WallUtils.isValidateMySql(sql, config)); } public void test_true() throws Exception { String sql = "SELECT /*! STRAIGHT_JOIN */ col1 FROM table1,table2"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_1() throws Exception { String sql = "/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_2() throws Exception { String sql = "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_3() throws Exception { @@ -60,7 +57,7 @@ public class MySqlWallTest_hint extends TestCase { config.setHintAllow(true); config.setMultiStatementAllow(true); String sql = "LOCK TABLES `m_rpt_adgroupeffect` READ /*!32311 LOCAL */"; - assertTrue(WallUtils.isValidateMySql(sql, config)); // + assertTrue(WallUtils.isValidateMySql(sql, config)); } public void test_true_5() throws Exception { @@ -69,29 +66,29 @@ public class MySqlWallTest_hint extends TestCase { config.setMultiStatementAllow(true); String sql = "DROP TABLE IF EXISTS `item_similarity`;"// + "\n/*!40101 SET @saved_cs_client = @@character_set_client */;"// - + "\n/*!40101 SET character_set_client = utf8 */;" // + + "\n/*!40101 SET character_set_client = utf8 */;" + "\nCREATE TABLE `item_similarity` ("// + " `id` bigint(20) unsigned NOT NULL, "// + " `sellerId` bigint(20) DEFAULT NULL,"// - + " PRIMARY KEY (`id`)" // + + " PRIMARY KEY (`id`)" + " ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"// + " \n/*!40101 SET character_set_client = @saved_cs_client */;"; - assertTrue(WallUtils.isValidateMySql(sql, config)); // + assertTrue(WallUtils.isValidateMySql(sql, config)); } public void test_true_6() throws Exception { String sql = "START TRANSACTION /*!40100 WITH CONSISTENT SNAPSHOT */"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_7() throws Exception { String sql = "LOCK TABLES `m_rpt_adgroupeffect` READ /*!32311 LOCAL */"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_8() throws Exception { String sql = "SET SQL_QUOTE_SHOW_CREATE=1/*!40102 ,SQL_MODE=concat(@@sql_mode, _utf8 ',NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS') */"; - assertTrue(WallUtils.isValidateMySql(sql)); // + assertTrue(WallUtils.isValidateMySql(sql)); } public void test_true_9() throws Exception { @@ -107,7 +104,7 @@ public class MySqlWallTest_hint extends TestCase { + " PRIMARY KEY(`sess_id`),"// + " INDEX `changed_index` (`changed`)"// + ") /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */ "; - assertTrue(WallUtils.isValidateMySql(sql, config)); // + assertTrue(WallUtils.isValidateMySql(sql, config)); } public void test_true_10() throws Exception { @@ -116,7 +113,7 @@ public class MySqlWallTest_hint extends TestCase { config.setMultiStatementAllow(true); config.setNoneBaseStatementAllow(true); String sql = "CREATE DATABASE `newsfocus` /*!40100 COLLATE 'big5_chinese_ci' */ "; - assertTrue(WallUtils.isValidateMySql(sql, config)); // + assertTrue(WallUtils.isValidateMySql(sql, config)); } public void test_true_11() throws Exception { @@ -125,6 +122,6 @@ public class MySqlWallTest_hint extends TestCase { config.setMultiStatementAllow(true); config.setNoneBaseStatementAllow(true); String sql = "EXPLAIN /*!40100 EXTENDED */ SELECT * FROM trade_order_header WHERE id = ?"; - assertTrue(WallUtils.isValidateMySql(sql, config)); // + assertTrue(WallUtils.isValidateMySql(sql, config)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java index 563321df4..c23788044 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_if.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest_if extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java index 1b8b169f2..569ee5d0e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest_ifnull_1 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java index 23d7afeb1..a3e9595b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_ifnull_2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest_ifnull_2 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java index f624aad23..3101dbb3b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_like_1.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -40,5 +35,4 @@ public class MySqlWallTest_like_1 extends TestCase { assertEquals(1, provider.getTableStats().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java index ab0e245ce..f3228a2f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_sqlmap.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -43,6 +38,4 @@ public class MySqlWallTest_sqlmap extends TestCase { assertEquals(1, provider.getTableStats().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java index a0cd4ccd5..fd30ae80d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_union.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class MySqlWallTest_union extends TestCase { public void testUnion() throws Exception { @@ -58,7 +53,5 @@ public class MySqlWallTest_union extends TestCase { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java index 394da4945..e108c768c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -33,26 +28,26 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest_var extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "SELECT @@GLOBAL.sql_mode")); // + "SELECT @@GLOBAL.sql_mode")); } public void test_true_1() throws Exception { assertTrue(WallUtils.isValidateMySql(// - "SELECT @@SESSION.sql_mode;")); // + "SELECT @@SESSION.sql_mode;")); } public void test_false() throws Exception { 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 { assertTrue(WallUtils.isValidateMySql(// - "SELECT * FROM T WHERE @@sql_mode = 'ANSI'")); // + "SELECT * FROM T WHERE @@sql_mode = 'ANSI'")); } public void test_false_1() throws Exception { assertFalse(WallUtils.isValidateMySql(// - "SELECT * FROM T WHERE @@basedir = 'ANSI'")); // + "SELECT * FROM T WHERE @@basedir = 'ANSI'")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java index 9071ee375..0d9ae6a3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MySqlWallTest_var_autoincrement.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,6 +28,6 @@ import com.alibaba.druid.wall.WallUtils; public class MySqlWallTest_var_autoincrement extends TestCase { public void test_true() throws Exception { 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java index 27ccc5096..84c1f5b38 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/mysql/MysqlWallTest_rename_table.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.filter.wall.mysql; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; - import junit.framework.TestCase; public class MysqlWallTest_rename_table extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java index c574ca48c..037a8300b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitFunctionTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 @@ -39,5 +34,4 @@ public class OracleWallPermitFunctionTest extends TestCase { config.setFunctionCheck(false); assertTrue(WallUtils.isValidateOracle("select SYS_CONTEXT ('USERENV', 'CURRENT_USER') from X", config)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java index 39b435266..26cfb7698 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitObjectTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java index c8e11075b..3219ceeb9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitSchemaTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallPermitSchemaTest extends TestCase { public void test_true() throws Exception { @@ -33,5 +28,4 @@ public class OracleWallPermitSchemaTest extends TestCase { assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select banner from sys.v_$version where rownum=1")); assertFalse(WallUtils.isValidateOracle("SELECT * FROM T UNION select banner from sys.v where rownum=1")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java index 928b66eaa..51e565c76 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitTableTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallPermitTableTest extends TestCase { public void test_permitTable() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java index d9d16378a..34586c454 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 @@ -37,5 +33,4 @@ public class OracleWallPermitVariantTest extends TestCase { assertTrue(WallUtils.isValidateOracle("select USER from dual", config)); assertTrue(WallUtils.isValidateOracle("select user from dual", config)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java index ea5edbce6..5814f077d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallPermitVariantTest2.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问Oracle系统对象 @@ -32,5 +28,4 @@ public class OracleWallPermitVariantTest2 extends TestCase { assertFalse(WallUtils.isValidateOracle("select UID from dual")); assertFalse(WallUtils.isValidateOracle("select USER from dual")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallResourceTest.java index adce6e513..0f45f6114 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallResourceTest.java @@ -42,5 +42,4 @@ public class OracleWallResourceTest extends PGTest { fail(violations.get(0).getMessage()); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java index bc8111c87..74e579656 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest.java @@ -15,11 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest extends TestCase { public void testWall() throws Exception { @@ -34,7 +32,6 @@ public class OracleWallTest extends TestCase { assertTrue(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 * 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)")); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java index 5c157e102..895659c7c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest1.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest1 extends TestCase { public void test_true() throws Exception { 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")); 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/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java index 5650002f5..a86f260ed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest10.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java index e16af134d..4ef5dbdda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest2.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest2 extends TestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java index 06409cf59..c368e520b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest3.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest3 extends TestCase { public void test_true() throws Exception { String sql = // - "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // + "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " + "BEFORE INSERT"// + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// + "BEGIN"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java index f56a34d03..7366b367e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest4.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; 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"; assertTrue(WallUtils.isValidateOracle(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java index aedf34189..b7d0ea022 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest5.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest5 extends TestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java index 1ac758211..5cd90d563 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest6.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; public class OracleWallTest6 extends TestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java index 17ac33c8d..ae94d046e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest7.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java index 88f4871b1..f2d84a51a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest8_alter_rebuild.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java index 10570c9c1..be58718a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/oracle/OracleWallTest9_exists.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.oracle; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java index 862a4bfa2..6f24225ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/pg/PGWallTest1.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.filter.wall.pg; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.wall.WallUtils; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java index 4f88b1f6a..c64676532 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitFunctionTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallPermitFunctionTest @@ -101,5 +96,4 @@ public class SQLServerWallPermitFunctionTest extends TestCase { assertFalse(WallUtils.isValidateSqlServer("select * from t where fid = 1 UNION SELECT is_srvrolemember(‘sysadmin’) FROM X; ")); assertFalse(WallUtils.isValidateSqlServer("select * from t where fid = 1 UNION SELECT is_srvrolemember(‘sysadmin’, ‘sa’) FROM X; ")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java index 3381f401e..b72877623 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitObjectTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallPermitObjectTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java index 2f9950110..d1d579320 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitSchemaTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallPermitSchemaTest @@ -51,7 +47,6 @@ public class SQLServerWallPermitSchemaTest extends TestCase { super.tearDown(); } - public void test_master() throws Exception { assertFalse(WallUtils.isValidateSqlServer("SELECT *FROM T UNION SELECT name, password FROM master..sysxlogins")); assertFalse(WallUtils.isValidateSqlServer("SELECT *FROM T UNION SELECT permission_name FROM master..fn_my_permissions(null, ‘DATABASE’); ")); diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java index d0740d74b..d5e683b3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallPermitTableTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * 这个场景测试访问SQLServer系统表 @@ -39,5 +35,4 @@ public class SQLServerWallPermitTableTest extends TestCase { assertFalse(WallUtils.isValidateSqlServer("SELECT * FROM T UNION SELECT sysobjects.name as tablename, syscolumns.name as columnname FROM sysobjects JOIN syscolumns ON sysobjects.id = syscolumns.id WHERE sysobjects.xtype = ‘U’ AND syscolumns.name LIKE ‘%PASSWORD%’ ")); assertFalse(WallUtils.isValidateSqlServer("SELECT * FROM T UNION SELECT name FROM syscolumns WHERE id = (SELECT id FROM sysobjects WHERE name = ‘mytable’);")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java index 161950876..1a51570f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java index e63f32427..128326695 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_0.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -71,17 +66,17 @@ public class SQLServerWallTest_0 extends TestCase { 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" // + 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)" // + + "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"; assertFalse(provider.checkValid(sql)); } @@ -91,10 +86,10 @@ public class SQLServerWallTest_0 extends TestCase { WallProvider provider = initWallProvider(); { - String sql = "SELECT rpid, columnname, chnname, type, textfield" // + String sql = "SELECT rpid, columnname, chnname, type, textfield" + " , valuefield, ddlbtable, ddlbwhere, ddlbsort, datatype "// + "FROM characteristic "// - + "WHERE (closed = 0)" // + + "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"; assertFalse(provider.checkValid(sql)); } @@ -122,7 +117,7 @@ public class SQLServerWallTest_0 extends TestCase { 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 " // + + "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 "; assertTrue(provider.checkValid(sql)); } @@ -227,5 +222,4 @@ public class SQLServerWallTest_0 extends TestCase { assertTrue(provider.checkValid(sql)); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java index 923556612..976081780 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_1.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -33,4 +29,4 @@ public class SQLServerWallTest_1 extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateSqlServer("SELECT @ret")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java index 263dd8773..934629c01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_10.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -35,7 +31,5 @@ public class SQLServerWallTest_10 extends TestCase { String sql = "select top 50 * FROM [V_Goods_WithAvailableStockQuantity] where Status='����' and (Code like '%mu%' ESCAPE '\' or Model like '%mu%' ESCAPE '\' or Spec like '%mu%' ESCAPE '\' or BarCode like '%mu%' ESCAPE '\' or ProductName like '%mu%' ESCAPE '\' or dbo.F_GetPY(ProductName) like '%mu%' ESCAPE '\') "; assertTrue(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java index 522d55a38..36fd48d01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_11.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -33,14 +29,12 @@ public class SQLServerWallTest_11 extends TestCase { WallProvider provider = new SQLServerWallProvider(); provider.getConfig().setCommentAllow(true); - String sql = "SELECT KL_ArticleContent,KL_ArticleTitle " // - + "FROM dbo.KL_Article " // + 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-- "; assertFalse(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java index 1a53d0e31..6b8052e5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_12.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -36,7 +32,5 @@ public class SQLServerWallTest_12 extends TestCase { String sql = "EXEC master..xp_msver"; assertTrue(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java index 25532a68a..011a3759e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_2.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallUtils; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -33,4 +29,4 @@ public class SQLServerWallTest_2 extends TestCase { public void test_true() throws Exception { assertTrue(WallUtils.isValidateSqlServer("rollback")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java index 9ef2e15b1..a8dfc7802 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_3.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -44,5 +38,4 @@ public class SQLServerWallTest_3 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java index 7c37133d7..f2db84919 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_4.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -43,5 +38,4 @@ public class SQLServerWallTest_4 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java index 4ecdd0663..f0c350a89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_5.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -44,5 +38,4 @@ public class SQLServerWallTest_5 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java index 1d8562d7f..54bf9ec37 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_6.java @@ -15,15 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -44,5 +38,4 @@ public class SQLServerWallTest_6 extends TestCase { assertEquals(1, provider.getTableStats().size()); assertTrue(provider.getTableStats().containsKey("t")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java index e47eec052..3a0ba6bdd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_7.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -43,5 +38,4 @@ public class SQLServerWallTest_7 extends TestCase { // assertEquals(12, provider.getTableStats().size()); // assertTrue(provider.getTableStats().containsKey("jl_OrderList")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java index 39974862c..5446a375a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_8.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertFalse; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -37,7 +33,5 @@ public class SQLServerWallTest_8 extends TestCase { provider.getConfig().setMustParameterized(true); assertFalse(provider.checkValid("select * from t where fid = 1")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java index 9d296d4e5..b25e19764 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/filter/wall/sqlserver/SQLServerWallTest_9.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.filter.wall.sqlserver; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * SQLServerWallTest @@ -32,15 +28,13 @@ public class SQLServerWallTest_9 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - String sql = "SELECT s.id FROM snapshots s " // + 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 status='P'" + + " AND islast=0" + " AND NOT EXISTS (select m.id from project_measures m WHERE m.snapshot_id=s.id)"; assertTrue(provider.checkValid(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java b/core/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java index 07d8bce20..4023f2c52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/hibernate/HibernateCRUDTest.java @@ -1,11 +1,9 @@ package com.alibaba.druid.bvt.hibernate; -import java.io.IOException; -import java.util.Date; -import java.util.Properties; - +import com.alibaba.druid.bvt.hibernate.entity.Sample; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; - import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.Transaction; @@ -13,9 +11,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.orm.hibernate4.LocalSessionFactoryBean; -import com.alibaba.druid.bvt.hibernate.entity.Sample; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; +import java.io.IOException; +import java.util.Date; +import java.util.Properties; /** * @author yinheli [yinheli@gmail.com] @@ -197,5 +195,4 @@ public class HibernateCRUDTest extends TestCase { } } } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java b/core/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java index 8961946d1..b6c8891d9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java +++ b/core/src/test/java/com/alibaba/druid/bvt/hibernate/entity/Sample.java @@ -1,12 +1,12 @@ package com.alibaba.druid.bvt.hibernate.entity; -import java.io.Serializable; -import java.util.Date; - import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; +import java.io.Serializable; +import java.util.Date; + /** * @author yinheli [yinheli@gmail.com] */ diff --git a/core/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java b/core/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java index a328f078c..dd33c2ceb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/jmx/DupRegisterTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.jmx; -import static org.junit.Assert.assertTrue; - -import java.lang.management.ManagementFactory; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import javax.management.MBeanServer; - -import com.alibaba.druid.pool.DruidDataSource; - -import junit.framework.TestCase; +import java.lang.management.ManagementFactory; public class DupRegisterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java b/core/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java index 34c540eea..400c7b5c9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.jmx; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.lang.management.ManagementFactory; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; import javax.management.ObjectName; -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; +import java.lang.management.ManagementFactory; public class JMXExporterTest extends TestCase { public void test_export() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java index e19687b06..d852b216a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/log/LoggerTest.java @@ -1,5 +1,11 @@ package com.alibaba.druid.bvt.log; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -9,13 +15,6 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.util.Utils; -import com.alibaba.druid.util.JdbcUtils; - public class LoggerTest extends TestCase { private static java.security.ProtectionDomain DOMAIN; diff --git a/core/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java b/core/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java index 60fffdf15..5b1f83d25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/mock/MockExecuteTest.java @@ -15,8 +15,7 @@ */ package com.alibaba.druid.bvt.mock; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.PoolTestCase; import java.sql.Connection; import java.sql.DriverManager; @@ -24,10 +23,6 @@ import java.sql.ResultSet; import java.sql.Statement; import java.sql.Timestamp; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - public class MockExecuteTest extends PoolTestCase { public void test_0() throws Exception { Connection conn = DriverManager.getConnection("jdbc:mock:"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java b/core/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java index 858f0670e..2122a79fd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java @@ -15,20 +15,15 @@ */ package com.alibaba.druid.bvt.mock; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.mock.MockResultSetMetaData; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; +import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; +import junit.framework.TestCase; import java.math.BigDecimal; import java.sql.Date; import java.sql.ResultSetMetaData; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockResultSetMetaData; -import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase; -import com.alibaba.druid.util.jdbc.ResultSetMetaDataBase.ColumnMetaData; - public class MockResultSetMetaDataTest extends TestCase { public void test_resultSet_metadata() throws Exception { MockResultSetMetaData meta = new MockResultSetMetaData(); @@ -63,6 +58,5 @@ public class MockResultSetMetaDataTest extends TestCase { meta.isWritable(1); meta.isDefinitelyWritable(1); meta.getColumnClassName(1); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java index c69f40314..5275c6d27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.pool; import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.DruidDataSource; -import junit.framework.TestCase; public class AsyncInitTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java index d2f0a2e9c..6ad8ee8bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - import com.alibaba.druid.PoolTestCase; -import com.alibaba.druid.util.JdbcUtils; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockConnectionClosedException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DataSourceMonitorable; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import com.alibaba.druid.util.JdbcUtils; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class Bug_for_dupCloseStmtError extends PoolTestCase { protected DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java index 83da33adb..8aeb332d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java @@ -15,22 +15,18 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidDataSource; +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; + public class CallableStatmentTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index c9200f253..fd453a577 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -15,21 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class Case0 extends PoolTestCase { public void test_0() throws Exception { final DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index a92c5d077..00966d6c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -15,22 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DataSourceDisableException; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class Case1 extends PoolTestCase { public void test_f() throws Exception { final DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index 16cd810d1..8bb14f96f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidDataSourceFactory; +import com.alibaba.druid.util.JMXUtils; import java.sql.Connection; import java.util.Properties; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidDataSourceFactory; -import com.alibaba.druid.stat.DruidDataSourceStatManager; -import com.alibaba.druid.util.JMXUtils; - /** * 类Case2.java的实现描述：TODO 类实现描述 * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index 0002cf5cb..3078ebad0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -15,8 +15,8 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,12 +24,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class Case3 extends PoolTestCase { // public void test_0() throws Exception { // DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java index 6510006be..b4482305e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.pool.DataSourceClosedException; import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; + public class ClosedTest extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java index 3e7124e72..d62a2dd0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java @@ -15,18 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.logging.Log; import java.lang.reflect.Field; import java.sql.Connection; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.logging.Log; - public class ConfigErrorTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java index bcb391721..97ff065ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import java.lang.reflect.Field; -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; +import java.sql.Connection; + public class ConfigErrorTest2 extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java index c538b52ca..302bda7a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java @@ -15,18 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; + public class ConfigErrorTest3 extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java index abbf40ecd..2c8868b11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; + public class ConfigErrorTestMysql extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java index 972d5df55..bb271025f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class CreateSchedulerTest extends PoolTestCase { private DruidDataSource dataSource; private ScheduledExecutorService createScheduler; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java b/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java index 0949f9e23..21984631a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest_directCreate.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java index d3d88f2e3..c4ce03ace 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java @@ -1,11 +1,6 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.pool.DataSourceDisableException; public class DataSourceDisableExceptionTest extends PoolTestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java index cbc8e5d85..9a10586e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DestorySchedulerTest extends PoolTestCase { private DruidDataSource dataSource; private ScheduledExecutorService destroyScheduler; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java index 10a4adf88..80096dfb5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.mysql.jdbc.Driver; -import junit.framework.TestCase; import java.sql.SQLException; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java index ae6907da6..ebaa2d337 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import java.sql.SQLException; + public class DruidConnectionHolderTest2 extends PoolTestCase { private DruidDataSource dataSource; @@ -30,7 +25,6 @@ public class DruidConnectionHolderTest2 extends PoolTestCase { throw new SQLException(); } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java index 96cc35e4e..3be8e7584 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import java.sql.SQLException; + public class DruidConnectionHolderTest3 extends PoolTestCase { private DruidDataSource dataSource; @@ -30,7 +25,6 @@ public class DruidConnectionHolderTest3 extends PoolTestCase { throw new MySQLException(); } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java index 11acf7d33..68db36134 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.PreparedStatement; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidConnectionHolder; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import java.lang.reflect.Field; +import java.sql.PreparedStatement; + public class DruidConnectionHolderTest4 extends PoolTestCase { private DruidDataSource dataSource; @@ -24,7 +18,6 @@ public class DruidConnectionHolderTest4 extends PoolTestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.setPoolPreparedStatements(true); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceAsyncCloseTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceAsyncCloseTest.java index 28d8b3ffe..fbbf66a31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceAsyncCloseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceAsyncCloseTest.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.mock.MockConnectionClosedException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -16,6 +13,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import static org.junit.Assert.assertEquals; + public class DruidDataSourceAsyncCloseTest { protected DruidDataSource dataSource; protected ExecutorService executor; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java index 63ec39a23..29e690633 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceC3P0AdapterTest.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLFeatureNotSupportedException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLFeatureNotSupportedException; public class DruidDataSourceC3P0AdapterTest extends TestCase { private DruidDataSourceC3P0Adapter dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java index 3f6c54a4a..04863740c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceConverterTest.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.osjava.sj.SimpleContext; import java.sql.Connection; import java.util.Properties; -import junit.framework.TestCase; - -import org.osjava.sj.SimpleContext; - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceConverterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java index af298ce94..6ab0294a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceDecryptTest.java @@ -1,14 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - -import org.junit.Test; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import org.junit.Test; + +import java.sql.SQLException; + +import static org.junit.Assert.assertEquals; /** * @author Jonas Yang diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java index 34dc78bd9..def1be47c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.util.Hashtable; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidDataSourceFactory; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import javax.naming.Reference; import javax.naming.StringRefAddr; import javax.sql.DataSource; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidDataSourceFactory; -import com.alibaba.druid.util.JdbcUtils; +import java.util.Hashtable; public class DruidDataSourceFactoryTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java index 44bddd41c..a4102c96b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest0.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSourceFactory; +import junit.framework.TestCase; public class DruidDataSourceFactoryTest0 extends TestCase { public void test_factory_null() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java index f910f0a68..a4dc65582 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.util.Properties; public class DruidDataSourceFactoryTest1 extends TestCase { public void test_NONE() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java index f34ece206..4240cddb9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest2.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.util.Properties; public class DruidDataSourceFactoryTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index 27aefbfa0..eaf1de89c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcDataSourceStat; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class DruidDataSourceFilterTest extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceShrinkTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceShrinkTest.java index 031110424..51f5260be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceShrinkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceShrinkTest.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; import org.junit.After; @@ -11,6 +9,8 @@ import org.junit.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import static org.junit.Assert.assertEquals; + public class DruidDataSourceShrinkTest { protected DruidDataSource dataSource; protected ExecutorService executor; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java index 61f92c87d..b87a07d35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.SQLException; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java index dfe09292b..511995836 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest1.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest1 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest10.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest10.java index 70f74db71..89a498fd7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest10.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; @@ -11,6 +9,8 @@ import org.junit.Test; import java.util.Properties; +import static org.junit.Assert.assertEquals; + public class DruidDataSourceTest10 { DruidDataSource ds; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java index 1525637f8..b84adaa39 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试minIdle > maxActive @@ -22,7 +18,6 @@ public class DruidDataSourceTest2 extends TestCase { dataSource.setFilters("stat"); dataSource.setMinIdle(100); dataSource.setMaxActive(1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java index 30b119cfd..d18c2d547 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest3.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; -import java.util.concurrent.CountDownLatch; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; +import java.util.concurrent.CountDownLatch; /** * 这个场景测试并发初始化 @@ -41,7 +36,6 @@ public class DruidDataSourceTest3 extends TestCase { return null; } }); - } protected void tearDown() throws Exception { @@ -102,6 +96,5 @@ public class DruidDataSourceTest3 extends TestCase { assertNotNull(error); assertEquals(1, dataSource.getCreateErrorCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java index 59abc742f..7e68b6a1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest4.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ExceptionSorter; import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; public class DruidDataSourceTest4 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java index e6efb3952..bf68c2e56 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest5.java @@ -1,25 +1,18 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.TestCase; -import org.junit.After; -import org.junit.Before; -import com.alibaba.druid.pool.DataSourceClosedException; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; - public class DruidDataSourceTest5 extends TestCase { private DruidDataSource dataSource; private final AtomicBoolean validate = new AtomicBoolean(true); - protected void setUp() throws Exception { validate.set(true); @@ -36,7 +29,6 @@ public class DruidDataSourceTest5 extends TestCase { }); } - public void tearDown() throws Exception { dataSource.close(); } @@ -91,5 +83,4 @@ public class DruidDataSourceTest5 extends TestCase { Connection conn = dataSource.getConnection(); conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java index 6e05c994f..16cd647d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest6.java @@ -1,19 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.security.auth.callback.NameCallback; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockResultSet; @@ -23,6 +9,15 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.util.DruidPasswordCallback; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.security.auth.callback.NameCallback; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.concurrent.atomic.AtomicInteger; public class DruidDataSourceTest6 extends TestCase { private DruidDataSource dataSource; @@ -105,7 +100,7 @@ public class DruidDataSourceTest6 extends TestCase { conn.close(); } assertNotNull(error); - + { returnEmptyCount.set(1); Connection conn = dataSource.getConnection(); @@ -132,5 +127,4 @@ public class DruidDataSourceTest6 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java index 6c1c8f839..364c3455b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest7.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; public class DruidDataSourceTest7 extends TestCase { private DruidDataSource dataSource; @@ -46,5 +41,4 @@ public class DruidDataSourceTest7 extends TestCase { dataSource.getCompositeData(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java index b9977bd75..9c98b8795 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest8.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; public class DruidDataSourceTest8 extends TestCase { private DruidDataSource dataSource; @@ -46,5 +41,4 @@ public class DruidDataSourceTest8 extends TestCase { dataSource.getCompositeData(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java index af8a6c770..a8b990517 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest9_phyMaxUseCount.java @@ -49,5 +49,4 @@ public class DruidDataSourceTest9_phyMaxUseCount extends TestCase { // System.out.println(i); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java index 2c97a7a82..115df32bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTestValidConnectionChecker.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ValidConnectionChecker; @@ -10,6 +7,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * 给对象 {@link DruidDataSource} 已经设置了自定义的 validConnectionChecker的情况下, * 使用MySQL等已知的Driver的时候, 会用内置的checker覆盖自定义的checker. diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java index fb11d5263..0af44a620 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试defaultAutoCommit @@ -36,7 +31,6 @@ public class DruidDataSourceTest_autocommit extends TestCase { return conn; } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java index 56ea0de77..e92342330 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit2.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试defaultAutoCommit @@ -36,7 +31,6 @@ public class DruidDataSourceTest_autocommit2 extends TestCase { return conn; } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java index d84dbcc48..ed8088290 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit3.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试defaultAutoCommit @@ -36,7 +31,6 @@ public class DruidDataSourceTest_autocommit3 extends TestCase { return conn; } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java index 67a2bef08..5edb71302 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_autocommit4.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试defaultAutoCommit @@ -36,7 +31,6 @@ public class DruidDataSourceTest_autocommit4 extends TestCase { return conn; } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java index c8d3493b3..f59ea282e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - /** * 这个场景测试minIdle > maxActive * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java index 8be5beb52..42c35a8a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_closeError.java @@ -1,13 +1,12 @@ package com.alibaba.druid.bvt.pool; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; /** * 这个场景测试initialSize > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java index 743c7e41e..61cefd5f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_createError.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试createError @@ -33,7 +28,6 @@ public class DruidDataSourceTest_createError extends TestCase { throw new SQLException(); } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java index 9770b4530..960682c13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java @@ -1,14 +1,10 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import java.sql.Connection; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java index ec2937842..e2c7a909e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter.java @@ -1,7 +1,10 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.mock.MockStatementBase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.ExceptionSorter; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,14 +12,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockStatementBase; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.ExceptionSorter; - /** * 这个场景测试defaultAutoCommit * @@ -45,7 +40,6 @@ public class DruidDataSourceTest_exceptionSorter extends TestCase { public void configFromProperties(Properties properties) { } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java index 25e289ea6..604c65eca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_exceptionSorter_extend.java @@ -1,18 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.ExceptionSorter; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; import com.alibaba.druid.util.JdbcUtils; -import com.mysql.jdbc.Driver; import junit.framework.TestCase; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverPropertyInfo; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; import java.util.logging.Logger; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java index a6aeaf9df..3155527d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; public class DruidDataSourceTest_fill extends TestCase { private DruidDataSource dataSource; @@ -53,5 +48,4 @@ public class DruidDataSourceTest_fill extends TestCase { } assertNotNull(error); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java index 2a8d3d507..a1840ffe5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_fill2.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest_fill2 extends TestCase { private DruidDataSource dataSource; @@ -85,6 +80,5 @@ public class DruidDataSourceTest_fill2 extends TestCase { } assertTrue("not full", dataSource.isFull()); // assertTrue("fillCount zero", fillCount.get() > 0); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java index 931633d0b..cdad50082 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection.java @@ -1,14 +1,9 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; /** * 这个场景测试defaultAutoCommit @@ -22,7 +17,6 @@ public class DruidDataSourceTest_getConnection extends TestCase { dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); - } protected void tearDown() throws Exception { @@ -53,5 +47,4 @@ public class DruidDataSourceTest_getConnection extends TestCase { } assertNotNull(error); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java index 8c82d6f48..2baec5d7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getConnection_2.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; @@ -20,7 +17,6 @@ public class DruidDataSourceTest_getConnection_2 extends TestCase { dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java index e84f0016e..c09d2ea40 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPooledConnection.java @@ -1,24 +1,19 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.sql.ConnectionEvent; -import javax.sql.ConnectionEventListener; -import javax.sql.PooledConnection; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import javax.sql.ConnectionEvent; +import javax.sql.ConnectionEventListener; +import javax.sql.PooledConnection; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.concurrent.atomic.AtomicInteger; /** * 这个场景测试defaultAutoCommit @@ -38,7 +33,6 @@ public class DruidDataSourceTest_getPooledConnection extends TestCase { throw new SQLException(); } }); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java index 0beb88c01..65adaef5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java @@ -1,13 +1,9 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; /** * 这个场景测试initialSize > maxActive @@ -21,7 +17,6 @@ public class DruidDataSourceTest_getPoolingPeakTime extends TestCase { dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java index 6949079c2..c4d84d2f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试initialSize > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java index 7e93c7418..8d763cbab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest_initSql extends TestCase { private DruidDataSource dataSource; @@ -40,5 +35,4 @@ public class DruidDataSourceTest_initSql extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java index 49e352965..84e2b91e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSql_factory.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceFactory; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.util.Properties; public class DruidDataSourceTest_initSql_factory extends TestCase { private DruidDataSource dataSource; @@ -36,5 +31,4 @@ public class DruidDataSourceTest_initSql_factory extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java index 1845e4d9b..683acccca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_initSqls.java @@ -1,14 +1,9 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; public class DruidDataSourceTest_initSqls extends TestCase { private DruidDataSource dataSource; @@ -35,5 +30,4 @@ public class DruidDataSourceTest_initSqls extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java index 00787439e..47f4fae07 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest_interrupt extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java index 097efd598..66e695626 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt2.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - - public class DruidDataSourceTest_interrupt2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java index 5c77a6db3..e74d1fa77 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt3.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest_interrupt3 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java index f83b1d115..6a0fe68cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastCreateError.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.util.Properties; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java index 2edda5be6..80e4e9997 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_lastError.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java index 89fb90e91..7521bf104 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_loadSysPropertyFilter.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试defaultAutoCommit diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java index 046299585..4b0c2a065 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试initialSize > maxActive @@ -22,7 +18,6 @@ public class DruidDataSourceTest_maxActive1 extends TestCase { dataSource.setFilters("stat"); dataSource.setInitialSize(3); dataSource.setMaxActive(1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java index 5a1577ba8..96278e4c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试maxActive < 0 @@ -21,7 +17,6 @@ public class DruidDataSourceTest_maxActive2 extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setFilters("stat"); dataSource.setMaxActive(-1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java index faeb386e3..cec56c3f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试initialSize > maxActive @@ -22,7 +18,6 @@ public class DruidDataSourceTest_maxActive3 extends TestCase { dataSource.setFilters("stat"); dataSource.setMinIdle(100); dataSource.setMaxActive(10); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java index f0931c5e7..575bb136f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试initialSize > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java index 8b313fb3e..3e3d2d6d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - /** * 这个场景测试initialSize > maxActive * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java index 46d5f4989..55a89218e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - /** * 这个场景测试maxActive < 0 * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java index 99cbead89..b598160e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java @@ -1,7 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.time.LocalDateTime; @@ -9,11 +9,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceTest_notEmptyWait2 extends TestCase { private DruidDataSource dataSource; @@ -48,10 +43,10 @@ public class DruidDataSourceTest_notEmptyWait2 extends TestCase { public void run() { startLatch.countDown(); try { - System.out.println(Thread.currentThread() +" "+ LocalDateTime.now() + " begin " ); + System.out.println(Thread.currentThread() + " " + LocalDateTime.now() + " begin "); Connection conn = dataSource.getConnection(); Thread.sleep(2); - System.out.println(Thread.currentThread() +" "+ LocalDateTime.now() + " getConnection== " + conn); + System.out.println(Thread.currentThread() + " " + LocalDateTime.now() + " getConnection== " + conn); conn.close(); } catch (Exception e) { e.printStackTrace(); @@ -85,14 +80,13 @@ public class DruidDataSourceTest_notEmptyWait2 extends TestCase { errorThreadEndLatch.await(100, TimeUnit.MILLISECONDS); - assertEquals(0, maxWaitErrorCount.get());//因为最大超时没有设置，所以线程一直循环进不到maxWaitErrorCount加1的逻辑了 + assertEquals(0, maxWaitErrorCount.get()); //因为最大超时没有设置，所以线程一直循环进不到maxWaitErrorCount加1的逻辑了 assertTrue(dataSource.getNotEmptySignalCount() > 0); conn.close(); - System.out.println(Thread.currentThread() +" "+ LocalDateTime.now() +"释放了连接"); + System.out.println(Thread.currentThread() + " " + LocalDateTime.now() + "释放了连接"); endLatch.await(100, TimeUnit.MILLISECONDS); assertEquals(0, errorCount.get()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java index ffaa65e37..0cf262fca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java index 081293f48..496cb5b8c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java index 4ec5be08d..4d371b37b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker; +import junit.framework.TestCase; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java index 9d6e2d360..5b132cade 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试minIdle > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java index 8a887c692..f1dfd82b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle.java @@ -1,12 +1,10 @@ package com.alibaba.druid.bvt.pool; - -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import java.sql.Statement; /** * 这个场景测试initialSize > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java index 738847839..624494aae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_recycle2.java @@ -1,7 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.SQLException; @@ -10,15 +14,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import junit.framework.TestCase; - - -import com.alibaba.druid.filter.FilterAdapter; -import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; - /** * 这个场景测试initialSize > maxActive * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java index 6951ca416..786658765 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnBorrowFailed.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.sql.PooledConnection; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; +import junit.framework.TestCase; + +import javax.sql.PooledConnection; + +import java.sql.Connection; +import java.util.concurrent.atomic.AtomicInteger; /** * 这个场景测试defaultAutoCommit diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java index e5bb3fdfc..3b5592cdf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_testOnWhileIdleFailed.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.concurrent.atomic.AtomicInteger; - -import javax.sql.PooledConnection; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; +import junit.framework.TestCase; + +import javax.sql.PooledConnection; + +import java.sql.Connection; +import java.util.concurrent.atomic.AtomicInteger; /** * 这个场景测试defaultAutoCommit diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java index 5ab90b783..8f8c6b672 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_tryGet.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; public class DruidDataSourceTest_tryGet extends TestCase { private DruidDataSource dataSource; @@ -34,5 +29,4 @@ public class DruidDataSourceTest_tryGet extends TestCase { conn1.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java index b4b1b1569..a601aa0b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_wrapDriverFilters.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; /** * 这个场景测试defaultAutoCommit diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java index e68e59f91..415a012f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledCallableStatementTest.java @@ -1,23 +1,18 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledCallableStatement; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; +import junit.framework.TestCase; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; public class DruidPooledCallableStatementTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java index f006fe4a9..0a9425991 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.Savepoint; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.Savepoint; public class DruidPooledConnectionTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java index 92fd5ddb5..97a9d2a54 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest1.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; +import junit.framework.TestCase; + +import java.sql.SQLException; public class DruidPooledConnectionTest1 extends TestCase { private DruidDataSource dataSource; @@ -21,7 +16,6 @@ public class DruidPooledConnectionTest1 extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setFilters("stat"); dataSource.setPoolPreparedStatements(true); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest2.java index 0bc714cb5..5aab86f40 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest2.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; +import junit.framework.TestCase; + +import java.sql.SQLException; public class DruidPooledConnectionTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java index b3708adbf..c0b7fc05a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest_prepareError.java @@ -1,20 +1,15 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; public class DruidPooledConnectionTest_prepareError extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java index f2b89a8c5..19ab1d6b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest.java @@ -1,16 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.ResultSet; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledPreparedStatement; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.ResultSet; public class DruidPooledPreparedStatementTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java index b469fc3ac..02f4accf7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledPreparedStatementTest1.java @@ -1,22 +1,17 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.ParameterMetaData; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.ParameterMetaData; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class DruidPooledPreparedStatementTest1 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java index b2f45e494..2a8998800 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockResultSet; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledResultSet; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLFeatureNotSupportedException; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockResultSet; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledResultSet; - public class DruidPooledResultSetTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java index 73a5e6081..3aefe9bd9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockResultSet; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockResultSet; -import com.alibaba.druid.pool.DruidDataSource; - public class DruidPooledResultSetTest2 extends TestCase { private DruidDataSource dataSource; @@ -56,5 +52,4 @@ public class DruidPooledResultSetTest2 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java index ca6dc776d..06cf52d04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledStatementTest.java @@ -1,23 +1,18 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.SQLWarning; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledStatement; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.SQLFeatureNotSupportedException; +import java.sql.SQLWarning; +import java.sql.Statement; public class DruidPooledStatementTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java index 67d4caad1..ae27aa02d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java @@ -1,7 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.JdbcSqlStat; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,11 +10,6 @@ import java.sql.ResultSet; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.JdbcSqlStat; - /* * Copyright 1999-2018 Alibaba Group Holding Ltd. * diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java index 0ca400aa9..034103608 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.MockExceptionSorter; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class ExceptionSorterTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java index 3adedb61a..012c6031a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/FullTest.java @@ -1,14 +1,9 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - - +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; public class FullTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java index 8b06d86b3..a9bf11984 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/HoldableUnsupportTest.java @@ -1,16 +1,14 @@ package com.alibaba.druid.bvt.pool; -import java.sql.Connection; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.Filter; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import junit.framework.TestCase; +import java.sql.Connection; +import java.sql.SQLException; public class HoldableUnsupportTest extends TestCase { private DruidDataSource dataSource; @@ -25,7 +23,6 @@ public class HoldableUnsupportTest extends TestCase { } }; dataSource.getProxyFilters().add(filter); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java index f02d76c3a..402d142fd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/InitExceptionThrowTest.java @@ -12,7 +12,7 @@ import java.util.Properties; public class InitExceptionThrowTest extends TestCase { private DruidDataSource dataSource = new DruidDataSource(); - private int connectCount = 0; + private int connectCount; protected void setUp() throws Exception { dataSource.setInitExceptionThrow(false); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java b/core/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java index 294db54a9..acba014ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/Issue4316.java @@ -1,9 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; import org.junit.Test; public class Issue4316 { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java index b32a8ac01..4b67fab77 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java @@ -15,15 +15,11 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.Constants; import com.alibaba.druid.stat.JdbcDataSourceStat; +import junit.framework.TestCase; + +import java.util.Properties; public class JdbcDataSourceStatTest extends TestCase { public void test_max() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest.java index 1efe02c21..908f2c1b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest.java @@ -57,6 +57,5 @@ public class KeepAliveTest extends TestCase { connections[i].close(); } // assertEquals(dataSource.getMaxActive(), dataSource.getPoolingCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java b/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java index 1cffa30b2..663c6dfc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/KeepAliveTest_scheduler.java @@ -61,7 +61,6 @@ public class KeepAliveTest_scheduler extends TestCase { } // assertEquals(dataSource.getMaxActive(), dataSource.getPoolingCount()); - // Thread.sleep(1000 * 1000); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java index d437e2164..418ef1a29 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/LastActiveTest_0.java @@ -1,17 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.PreparedStatement; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidConnectionHolder; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; +import junit.framework.TestCase; + +import java.lang.reflect.Field; +import java.sql.PreparedStatement; + +import static org.junit.Assert.assertNotEquals; /** * 这个场景测试initialSize > maxActive @@ -69,5 +66,4 @@ public class LastActiveTest_0 extends TestCase { DruidConnectionHolder holder = (DruidConnectionHolder) field.get(conn); return holder.getLastActiveTimeMillis(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java index 3d907f6ce..d272d0672 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.concurrent.locks.ReentrantLock; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.util.concurrent.locks.ReentrantLock; public class LockFairTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java index f6e46b033..a69b72b36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -15,19 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class ManagedDataSourceTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java index 9f4b172a5..58101e602 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class PSCacheTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java index 4e45203d1..1cd7a15a3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class PSCacheTest1 extends TestCase { private DruidDataSource dataSource; @@ -94,6 +90,4 @@ public class PSCacheTest1 extends TestCase { conn.close(); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java index 0f0c9ebab..b61f9e5e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class PSCacheTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java index 54e183af5..2bc535e0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidConnectionHolder; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -27,6 +22,7 @@ import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.pool.PreparedStatementHolder; import com.alibaba.druid.pool.PreparedStatementPool; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class PSCacheTest3 extends TestCase { private DruidDataSource dataSource; @@ -152,7 +148,6 @@ public class PSCacheTest3 extends TestCase { assertEquals(3, stmtPool.size()); } - assertFalse(stmtHoler_0.isPooling()); assertTrue(stmtHoler_1.isPooling()); assertTrue(stmtHoler_2.isPooling()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java index 3986e32a3..d2fdd659b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java @@ -15,19 +15,9 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidConnectionHolder; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.pool.DruidPooledPreparedStatement; -import com.alibaba.druid.pool.DruidPooledResultSet; -import com.alibaba.druid.pool.PreparedStatementHolder; -import com.alibaba.druid.pool.PreparedStatementPool; +import com.alibaba.druid.pool.*; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class PSCacheTest4 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java index 625179074..7fc7f3af2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcDataSourceStat; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class ParamTest extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index e3e7fd8de..fa11788f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.util.DruidPasswordCallback; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.util.Properties; public class PasswordCallbackTest extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java index a89fe5fe9..d1a585acc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; import com.alibaba.druid.pool.PreparedStatementPool.MethodType; +import junit.framework.TestCase; public class PreparedStatementKeyTest extends TestCase { public void test_0() throws Exception { @@ -19,48 +15,41 @@ public class PreparedStatementKeyTest extends TestCase { public void test_eq() throws Exception { assertEquals(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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + 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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + 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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + 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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + 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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + 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 { - assertFalse( // - new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( // + assertFalse( + new PreparedStatementKey("select 'a'", "c1", MethodType.M1, 101, 102, 103).equals( new PreparedStatementKey("select 'b'", "c1", MethodType.M1, 101, 102, 103))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java index 3d974b041..37ec1240d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementProxyImplTest.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; +import junit.framework.TestCase; import java.math.BigDecimal; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.Types; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; - public class PreparedStatementProxyImplTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java index 0239fb113..ff5da4753 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/RegisterTest.java @@ -1,13 +1,7 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; - +import junit.framework.TestCase; public class RegisterTest extends TestCase { public void test() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java index d9b66dda1..deb541fc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java @@ -1,17 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.Savepoint; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.pool.DruidDataSource; - public class SavepointTest extends TestCase { private DruidDataSource dataSource; @@ -20,7 +16,6 @@ public class SavepointTest extends TestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java index dcbfa4ff1..6cfc35ddd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; - +import junit.framework.TestCase; public class SlowSqlMillisTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java index e5673bab9..2e8847f2f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java @@ -15,14 +15,9 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; - +import junit.framework.TestCase; public class SlowSqlMillisTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java index 3acfb3b45..94d8ce805 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java @@ -15,23 +15,6 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Collections; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.atomic.AtomicLong; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; @@ -40,6 +23,18 @@ import com.alibaba.druid.spring.User; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.json.JSONUtils; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Collections; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.atomic.AtomicLong; public class SpringIbatisFilterTest extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java index 595445b96..649090a14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java @@ -15,23 +15,18 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.Statement; - -import javax.sql.DataSource; - +import com.alibaba.druid.spring.User; +import com.alibaba.druid.stat.DruidDataSourceStatManager; import junit.framework.TestCase; - import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.context.support.ClassPathXmlApplicationContext; -import com.alibaba.druid.spring.User; -import com.alibaba.druid.stat.DruidDataSourceStatManager; +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.Statement; public class SpringMybatisFilterTest extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java index a93b25463..5b57b5da4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java @@ -15,16 +15,11 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class TestActiveTrace extends TestCase { private DruidDataSource dataSource; @@ -39,7 +34,6 @@ public class TestActiveTrace extends TestCase { dataSource.setTimeBetweenEvictionRunsMillis(10); dataSource.setMinEvictableIdleTimeMillis(300 * 1000); dataSource.setUrl("jdbc:mock:xxx"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java index 6637ad2d9..f8449c32b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestClone extends PoolTestCase { private DruidDataSource dataSource; @@ -107,7 +101,6 @@ public class TestClone extends PoolTestCase { conn_6.close(); conn_7.close(); conn_8.close(); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index 71af1fd7d..c9e762f53 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -15,19 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestClose_0 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 017bb621d..47b44682c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestClose_1 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java index 816c33c38..2e1c9f0b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestClose_2 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java index fdcf8aef5..02aef1400 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestConnectError extends TestCase { private DruidDataSource dataSource; private MockDriver driver; @@ -64,7 +60,6 @@ public class TestConnectError extends TestCase { dataSource.setMinEvictableIdleTimeMillis(300 * 1000); dataSource.setMaxActive(20); dataSource.setUrl("jdbc:mock:TestConnectError"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java index eff8fb7cb..57b1d5f31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java @@ -15,8 +15,9 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.time.LocalDateTime; @@ -25,11 +26,6 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class TestConnectTimeout extends TestCase { private DruidDataSource dataSource; @@ -42,7 +38,7 @@ public class TestConnectTimeout extends TestCase { dataSource.setFilters("stat"); dataSource.setMaxOpenPreparedStatements(30); dataSource.setMaxActive(4); - dataSource.setMaxWait(50000);//时间灵敏度不够，容易导致单测失败，因此调大一点 + dataSource.setMaxWait(50000); //时间灵敏度不够，容易导致单测失败，因此调大一点 dataSource.setMinIdle(0); dataSource.setInitialSize(1); dataSource.init(); @@ -71,7 +67,7 @@ public class TestConnectTimeout extends TestCase { try { for (int i = 0; i < 100; ++i) { Connection conn = dataSource.getConnection(); - System.out.println(LocalDateTime.now() +" : " + Thread.currentThread() + " " + conn); + System.out.println(LocalDateTime.now() + " : " + Thread.currentThread() + " " + conn); Thread.sleep(1); conn.close(); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java index f72eb2dfa..4579d3def 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestDefault extends TestCase { protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java index 86687235b..15d99da9c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.concurrent.CountDownLatch; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.util.concurrent.CountDownLatch; public class TestDisable extends TestCase { private MockDriver driver; @@ -44,7 +40,7 @@ public class TestDisable extends TestCase { dataSource.setMaxActive(2); dataSource.setMaxIdle(2); dataSource.setMinIdle(1); - dataSource.setMaxWait(500);// 加上最大等待时间，防止出现无限等待导致单测卡死的情况 + dataSource.setMaxWait(500); // 加上最大等待时间，防止出现无限等待导致单测卡死的情况 dataSource.setMinEvictableIdleTimeMillis(300 * 1000); // 300 / 10 dataSource.setTimeBetweenEvictionRunsMillis(180 * 1000); // 180 / 10 dataSource.setTestWhileIdle(true); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java index 81a712d3f..3f5af961f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class TestDruidDataSource extends TestCase { protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java index 8d3585a05..4cb01f420 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; public class TestGetUpdateCount extends TestCase { private DruidDataSource dataSource; @@ -140,7 +136,7 @@ public class TestGetUpdateCount extends TestCase { } public static class MyPreparedStatement extends MockPreparedStatement { - Integer updateCount = null; + Integer updateCount; public MyPreparedStatement(MockConnection conn, String sql) { super(conn, sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java index 0df567046..a2f4824eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - import com.alibaba.druid.PoolTestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import java.sql.Connection; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + public class TestGraceShutdown extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java index e319abe38..ab995319a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.DbType; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class TestH2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java index 0cacd1bf6..ce9681a3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java @@ -15,22 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DataSourceMonitorable; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; public class TestIdle extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java index 025153705..515f936f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class TestIdle2 extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java index 4a1fd8764..20d2503e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.management.ManagementFactory; -import java.sql.Connection; - -import javax.management.ObjectName; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import javax.management.ObjectName; + +import java.lang.management.ManagementFactory; +import java.sql.Connection; public class TestIdle3 extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java index 057f6ba88..be7e8a8ba 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestLogLongTimeTransaction extends TestCase { private DruidDataSource dataSource; private MockDriver driver; @@ -52,7 +48,6 @@ public class TestLogLongTimeTransaction extends TestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setFilters("stat,trace,log4j,encoding"); dataSource.setTransactionThresholdMillis(1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java index d654e6fd1..8c84bd68b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java @@ -1,20 +1,15 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.Iterator; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcSqlStat; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.Iterator; public class TestOnBorrowFileAndNameTest extends TestCase { private DruidDataSource dataSource; @@ -30,7 +25,6 @@ public class TestOnBorrowFileAndNameTest extends TestCase { dataSource.setTestOnBorrow(true); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java index 3c470f7e6..d2a6de925 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; -import oracle.jdbc.OracleConnection; -import oracle.jdbc.internal.OraclePreparedStatement; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.PreparedStatementHolder; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import oracle.jdbc.OracleConnection; +import oracle.jdbc.internal.OraclePreparedStatement; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOraclePrefetch extends TestCase { private DruidDataSource dataSource; @@ -111,6 +107,5 @@ public class TestOraclePrefetch extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java index 4f2fbb86c..fcd59402f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.test.util.OracleMockDriver; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.test.util.OracleMockDriver; -import com.alibaba.druid.util.JdbcUtils; - public class TestOracleWall extends TestCase { private DruidDataSource dataSource; @@ -78,6 +74,5 @@ public class TestOracleWall extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java index f1be9539f..40273fa14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; @@ -32,6 +23,11 @@ import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOracleWall2 extends TestCase { private DruidDataSource dataSource; @@ -118,6 +114,5 @@ public class TestOracleWall2 extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java index b6de6f066..bd0166a89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; @@ -32,6 +23,11 @@ import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOracleWall3 extends TestCase { private DruidDataSource dataSource; @@ -118,6 +114,5 @@ public class TestOracleWall3 extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java index 573cfdce0..75b35a21f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; @@ -32,6 +23,11 @@ import com.alibaba.druid.test.util.OracleMockDriverJdbc3; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOracleWallJdbc3 extends TestCase { private DruidDataSource dataSource; @@ -118,6 +114,5 @@ public class TestOracleWallJdbc3 extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java index d011473df..826cd97fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.pool.DruidPooledResultSet; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOracleWrap extends TestCase { private DruidDataSource dataSource; @@ -110,6 +106,5 @@ public class TestOracleWrap extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java index 50163c79d..5b94e4949 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement; import com.alibaba.druid.pool.DruidPooledResultSet; import com.alibaba.druid.test.util.OracleMockDriverJdbc3; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestOracleWrap2 extends TestCase { private DruidDataSource dataSource; @@ -110,6 +106,5 @@ public class TestOracleWrap2 extends TestCase { } assertEquals(1, dataSource.getCachedPreparedStatementCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java index c5b76baba..a7906de8a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class TestPoolPreparedStatement extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java index 25f1df523..a02a68b08 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class TestPoolPreparedStatement2 extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java index af98d2c49..1511aaf18 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class TestRemoveAbandoned extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java index 061737202..7277720d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; public class TestRemoveAbandoned2 extends TestCase { private MockDriver driver; @@ -65,7 +61,6 @@ public class TestRemoveAbandoned2 extends TestCase { } assertEquals(0, dataSource.getActiveCount()); - Thread abandonThread = new Thread("abandoned") { public void run() { for (; ; ) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java index 6d47f46e0..1d978c669 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockPreparedStatement; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockPreparedStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestSharePreparedStatements extends TestCase { protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java index 41c391936..897e24e83 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; -import com.alibaba.druid.stat.JdbcStatManager; - public class TestStat extends TestCase { private DruidDataSource dataSource; @@ -39,7 +35,6 @@ public class TestStat extends TestCase { dataSource.setName("com.alibaba.dragoon.monitor"); dataSource.setMinIdle(0); dataSource.setPoolPreparedStatements(false); - } protected void tearDown() throws Exception { @@ -67,6 +62,5 @@ public class TestStat extends TestCase { JdbcStatManager.getInstance().getDataSourceList(); assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java index 5548c6602..8fa3ec441 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class TimeBetweenLogStatsMillisTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java index 5a10e3b06..87d611226 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest2.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class TimeBetweenLogStatsMillisTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java index 47f2d5903..8fa53cbdc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TimeBetweenLogStatsMillisTest3.java @@ -1,18 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class TimeBetweenLogStatsMillisTest3 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java index 305590c53..e944f5609 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/TransactionTest.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.pool; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - public class TransactionTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java index cf3d68230..541ef656a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest.java @@ -1,16 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.mock.MockResultSet; @@ -21,6 +10,12 @@ import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Statement; public class UnwrapTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java index 06ed403ca..a603d6adf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.mock.MockStatement; @@ -19,6 +9,11 @@ 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; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; public class UnwrapTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java index 875123696..4452cd23c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java @@ -1,20 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.filter.logging.Log4jFilter; import com.alibaba.druid.filter.logging.LogFilter; import com.alibaba.druid.filter.stat.MergeStatFilter; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; + public class UnwrapTest_filter extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UserPasswordVersionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UserPasswordVersionTest.java index f787a4343..ad22e26c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UserPasswordVersionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UserPasswordVersionTest.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import junit.framework.TestCase; -import java.sql.Connection; import java.util.Properties; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; /** * 这个场景测试initialSize > maxActive diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingDefaultLockModeBenchmarkTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingDefaultLockModeBenchmarkTest.java index b5a0f174b..886fed2f3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingDefaultLockModeBenchmarkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingDefaultLockModeBenchmarkTest.java @@ -1,25 +1,10 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; @@ -29,6 +14,10 @@ import java.sql.Connection; import java.util.Properties; import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @BenchmarkMode(Mode.AverageTime) @Warmup(iterations = 1, time = 3) @Measurement(iterations = 3, time = 3) diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingFairLockBenchmarkTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingFairLockBenchmarkTest.java index 1cf850011..78aa18558 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingFairLockBenchmarkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingFairLockBenchmarkTest.java @@ -1,25 +1,10 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; @@ -29,6 +14,10 @@ import java.sql.Connection; import java.util.Properties; import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @BenchmarkMode(Mode.AverageTime) @Warmup(iterations = 1, time = 3) @Measurement(iterations = 3, time = 3) diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingUnfairLockBenchmarkTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingUnfairLockBenchmarkTest.java index 8155f2e71..e0d73a058 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/UsingUnfairLockBenchmarkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/UsingUnfairLockBenchmarkTest.java @@ -1,25 +1,10 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -import org.openjdk.jmh.annotations.Benchmark; -import org.openjdk.jmh.annotations.BenchmarkMode; -import org.openjdk.jmh.annotations.Fork; -import org.openjdk.jmh.annotations.Level; -import org.openjdk.jmh.annotations.Measurement; -import org.openjdk.jmh.annotations.Mode; -import org.openjdk.jmh.annotations.OutputTimeUnit; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.State; -import org.openjdk.jmh.annotations.TearDown; -import org.openjdk.jmh.annotations.Threads; -import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.RunnerException; import org.openjdk.jmh.runner.options.Options; @@ -29,6 +14,10 @@ import java.sql.Connection; import java.util.Properties; import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + @BenchmarkMode(Mode.AverageTime) @Warmup(iterations = 1, time = 3) @Measurement(iterations = 3, time = 3) diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java index a16f8488f..3578c74b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.util.JdbcConstants; +import java.lang.reflect.Field; +import java.sql.Connection; + public class ValidationQueryLogDB2Test extends PoolTestCase { private DruidDataSource dataSource; @@ -47,7 +42,6 @@ public class ValidationQueryLogDB2Test extends PoolTestCase { conn.close(); - assertEquals(1, log.getErrorCount()); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java index b8e143f72..62742d397 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.pool; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.util.JdbcConstants; +import java.lang.reflect.Field; +import java.sql.Connection; + public class ValidationQueryLogTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java index d9a885aec..fd7df2171 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java @@ -15,18 +15,13 @@ */ package com.alibaba.druid.bvt.pool.adapter; -import static org.junit.Assert.*; - - -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import java.sql.Connection; + public class DruidDataSourceC3P0AdapterTest extends PoolTestCase { private MockDriver driver; private DruidDataSourceC3P0Adapter dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java index be0771d6a..65624580e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java @@ -15,17 +15,15 @@ */ package com.alibaba.druid.bvt.pool.adapter; -import static org.junit.Assert.*; - - -import java.io.Closeable; -import javax.sql.DataSource; - import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import javax.sql.DataSource; + +import java.io.Closeable; + public class DruidDataSourceC3P0AdapterTest2 extends PoolTestCase { public void test_0() throws Exception { assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index c42b71dc6..8d5e4d1b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -15,21 +15,15 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class ConnectionTest extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index 385c5f103..b446ba3e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -15,21 +15,16 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class ConnectionTest2 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index a1697ce57..b52bdc0c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -15,16 +15,7 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -32,6 +23,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Properties; + public class ConnectionTest3 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -132,5 +128,4 @@ public class ConnectionTest3 extends PoolTestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index c09cf242c..b600c284e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -15,20 +15,7 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; @@ -39,6 +26,13 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import java.sql.Connection; +import java.sql.Date; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; + public class ConnectionTest4 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index 9632cf291..afd09f1f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -15,18 +15,7 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Properties; - -import javax.sql.ConnectionEvent; -import javax.sql.ConnectionEventListener; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -34,6 +23,12 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import javax.sql.ConnectionEvent; +import javax.sql.ConnectionEventListener; + +import java.sql.SQLException; +import java.util.Properties; + public class ConnectionTest5 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -86,7 +81,6 @@ public class ConnectionTest5 extends PoolTestCase { dataSource.setResetStatEnable(true); dataSource.resetStat(); assertEquals(0, dataSource.getConnectCount()); - } public void test_handleException() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index a0efb1a23..e812f6f3b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -15,19 +15,7 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.SQLException; -import java.util.Collections; -import java.util.Properties; - -import javax.security.auth.callback.PasswordCallback; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -37,6 +25,12 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import javax.security.auth.callback.PasswordCallback; + +import java.sql.SQLException; +import java.util.Collections; +import java.util.Properties; + public class DataSourceTest3 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -196,7 +190,6 @@ public class DataSourceTest3 extends PoolTestCase { DruidPooledConnection conn = dataSource.getConnection().unwrap(DruidPooledConnection.class); conn.close(); - } public void test_error_10() throws Exception { @@ -259,7 +252,6 @@ public class DataSourceTest3 extends PoolTestCase { * */ private static final long serialVersionUID = 1L; - } public void test_setPasswordCallbackClassName() throws Exception { @@ -330,6 +322,5 @@ public class DataSourceTest3 extends PoolTestCase { DruidPooledConnection conn = dataSource.getConnection().unwrap(DruidPooledConnection.class); dataSource.validateConnection(conn); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java index 6f94a0c56..c9b782c7e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java @@ -15,19 +15,14 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.util.Hashtable; -import java.util.Properties; +import com.alibaba.druid.pool.DruidDataSourceFactory; +import junit.framework.TestCase; import javax.naming.RefAddr; import javax.naming.Reference; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSourceFactory; +import java.util.Hashtable; +import java.util.Properties; public class DruidDataSourceFactoryTest extends TestCase { @SuppressWarnings("serial") diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java index c6ca65ca1..4a95c2de6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.Connection; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; +import java.sql.Connection; + public class MaxEvictableIdleTimeMillisTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java index b140bfc5a..101d80d5d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; @@ -15,8 +12,6 @@ public class MaxEvictableIdleTimeMillisTest2 extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setMaxActive(50); dataSource.setMinIdle(5); - - } protected void tearDown() throws Exception { @@ -39,6 +34,4 @@ public class MaxEvictableIdleTimeMillisTest2 extends TestCase { assertTrue(dataSource.isInited()); assertEquals(30, dataSource.getMaxEvictableIdleTimeMillis()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java index 3b37fd4a5..ccef2ad52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxPhyTimeMillisTest.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.Connection; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; +import java.sql.Connection; + public class MaxPhyTimeMillisTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java index e1d3e6d80..a9302db8c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.io.InputStream; -import java.io.Reader; -import java.sql.*; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidConnectionHolder; @@ -32,6 +23,11 @@ import com.alibaba.druid.pool.DruidPooledCallableStatement; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; import com.alibaba.druid.pool.PreparedStatementHolder; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.Reader; +import java.sql.*; public class PoolableCallableStatementTest extends TestCase { private DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java index 76850f488..48f53b6e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java @@ -15,8 +15,15 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockPreparedStatement; +import com.alibaba.druid.pool.DruidConnectionHolder; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidPooledConnection; +import com.alibaba.druid.pool.DruidPooledPreparedStatement; +import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; +import com.alibaba.druid.pool.PreparedStatementHolder; +import junit.framework.TestCase; import java.io.InputStream; import java.io.Reader; @@ -27,18 +34,6 @@ import java.sql.Timestamp; import java.sql.Types; import java.util.Arrays; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.mock.MockPreparedStatement; -import com.alibaba.druid.pool.DruidConnectionHolder; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.pool.DruidPooledPreparedStatement; -import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; -import com.alibaba.druid.pool.PreparedStatementHolder; - public class PoolablePreparedStatementTest extends TestCase { protected MockPreparedStatement raw; protected DruidPooledPreparedStatement stmt; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java index 8d1c62c9e..146e0a02f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java @@ -15,18 +15,13 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.pool.DruidPooledStatement; +import junit.framework.TestCase; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockStatement; -import com.alibaba.druid.pool.DruidPooledStatement; - public class PoolableStatementTest extends TestCase { protected Statement raw; protected DruidPooledStatement stmt; @@ -54,5 +49,4 @@ public class PoolableStatementTest extends TestCase { assertEquals(false, stmt.isPoolable()); stmt.toString(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 4014bdc46..ed1e48f8f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -15,18 +15,6 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledStatement; @@ -34,6 +22,13 @@ import com.alibaba.druid.pool.vendor.NullExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.CallableStatement; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class PoolableStatementTest2 extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java index 19acc8b07..6bab78e0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.bvt.pool.basic; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidPooledStatement; +import junit.framework.TestCase; + +import java.sql.SQLException; public class PoolableStatementTest3 extends TestCase { public void test_clearResultSetError() throws Exception { @@ -37,6 +36,5 @@ public class PoolableStatementTest3 extends TestCase { } }; stmt.close(); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java index 51b6e1ffc..7caa78fb7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java @@ -15,13 +15,9 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.PoolableWrapper; +import junit.framework.TestCase; public class PoolableWrapperTest extends TestCase { public void test_isWrapper() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java index 5d594415f..9b550a38e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java @@ -15,12 +15,6 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidConnectionHolder; @@ -29,6 +23,7 @@ import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; import com.alibaba.druid.pool.PreparedStatementHolder; import com.alibaba.druid.pool.PreparedStatementPool; import com.alibaba.druid.pool.PreparedStatementPool.MethodType; +import junit.framework.TestCase; public class PreparedStatementKeyTest extends TestCase { public void test_equals_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java index 150f71d8c..69de7d6a3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest.java @@ -15,8 +15,10 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - +import com.alibaba.druid.mock.MockResultSet; +import com.alibaba.druid.pool.DruidPooledResultSet; +import com.alibaba.druid.pool.DruidPooledStatement; +import junit.framework.TestCase; import java.io.InputStream; import java.io.Reader; @@ -28,13 +30,6 @@ import java.sql.Ref; import java.sql.SQLException; import java.sql.SQLXML; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockResultSet; -import com.alibaba.druid.pool.DruidPooledResultSet; -import com.alibaba.druid.pool.DruidPooledStatement; - public class ResultSetTest extends TestCase { private DruidPooledStatement stmt; private MockResultSet raw; @@ -99,7 +94,6 @@ public class ResultSetTest extends TestCase { resultSet.getAsciiStream("1"); resultSet.getUnicodeStream("1"); resultSet.getBinaryStream("1"); - } public void test_set() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java index 09f143951..14f64420c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/ResultSetTest2.java @@ -15,18 +15,13 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.ResultSet; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidPooledResultSet; import com.alibaba.druid.pool.DruidPooledStatement; +import junit.framework.TestCase; + +import java.sql.ResultSet; +import java.sql.SQLException; public class ResultSetTest2 extends TestCase { private DruidPooledStatement stmt; @@ -638,6 +633,5 @@ public class ResultSetTest2 extends TestCase { error = ex; } assertNotNull(error); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java index 5339c5250..2df9aed0d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.Statement; public class TestCommit extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index 4e21ac5bc..8089df67b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -15,24 +15,19 @@ */ package com.alibaba.druid.bvt.pool.basic; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.Date; -import java.sql.Statement; - -import javax.sql.DataSource; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.NullExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.Date; +import java.sql.Statement; + public class TestDataSourceBasic extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index b20ce70b2..e38ce694a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.bvt.pool.basic; -import java.util.Arrays; -import java.util.Properties; - import com.alibaba.druid.PoolTestCase; -import com.alibaba.druid.pool.JDBC4ValidConnectionChecker; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ExceptionSorter; +import com.alibaba.druid.pool.JDBC4ValidConnectionChecker; import com.alibaba.druid.stat.DataSourceMonitorable; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import java.util.Arrays; +import java.util.Properties; + public class TestDataSourceBasic2 extends PoolTestCase { public void test_0() throws Exception { DruidDataSourceStatManager.clear(); @@ -129,5 +128,4 @@ public class TestDataSourceBasic2 extends PoolTestCase { super.tearDown(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java index 419d87066..495523832 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; +import java.sql.Connection; + public class ConnectPropertiesChangeTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java index 61f01303b..3886dc2da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java @@ -15,20 +15,14 @@ */ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; +import java.sql.Connection; + public class ConnectPropertiesChangeTest1 extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java index 51e600619..66bd350d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - - -import java.lang.reflect.Field; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceStatLogger; import com.alibaba.druid.pool.DruidDataSourceStatLoggerImpl; import com.alibaba.druid.support.logging.Log; +import java.lang.reflect.Field; + public class DruidDataSourceStatLoggerImplTest extends PoolTestCase { private DruidDataSource dataSource; @@ -34,7 +28,6 @@ public class DruidDataSourceStatLoggerImplTest extends PoolTestCase { dataSource.setConnectionProperties("a=3;b=4"); dataSource.setFilters("stat"); dataSource.init(); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java index 5ee1568f9..8fcc94f27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java @@ -15,18 +15,13 @@ */ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - - -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.util.JdbcUtils; +import java.sql.Connection; + public class MaxActiveChangeTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java index 63f8a0a8e..b2e578e3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java @@ -15,20 +15,15 @@ */ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.logging.Log; import java.lang.reflect.Field; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.logging.Log; - public class PoolPreparedStatementsChangeTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java index c4b310ebf..42e9903a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java @@ -1,20 +1,14 @@ package com.alibaba.druid.bvt.pool.dynamic; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.DruidDataSourceStatValue; +import com.alibaba.druid.support.logging.Log; import java.lang.reflect.Field; import java.sql.Connection; import java.sql.PreparedStatement; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidDataSourceStatValue; -import com.alibaba.druid.support.logging.Log; - public class SqlSkipCountTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java index c47d8be76..57fb57972 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OceanBaseOracleExceptionSorterTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.OceanBaseOracleExceptionSorter; -import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; @@ -75,5 +71,4 @@ public class OceanBaseOracleExceptionSorterTest extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java index 1eab345bc..61d987419 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java @@ -1,20 +1,15 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest extends TestCase { private DruidDataSource dataSource; @@ -76,5 +71,4 @@ public class OracleExceptionSorterTest extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java index e9745358a..351d8c487 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_closeConn extends TestCase { private DruidDataSource dataSource; @@ -76,5 +71,4 @@ public class OracleExceptionSorterTest_closeConn extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java index 92c767909..e5bb430b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_closeConn_1 extends TestCase { private DruidDataSource dataSource; @@ -73,5 +68,4 @@ public class OracleExceptionSorterTest_closeConn_1 extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java index 5958a5844..acea3ec87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_closeConn_2 extends TestCase { private DruidDataSource dataSource; @@ -73,5 +68,4 @@ public class OracleExceptionSorterTest_closeConn_2 extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java index efb1ac801..49e14a4cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_closeConn_3 extends TestCase { private DruidDataSource dataSource; @@ -74,5 +69,4 @@ public class OracleExceptionSorterTest_closeConn_3 extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConnectFailedDatasource.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConnectFailedDatasource.java index 479fc5609..bb53a21cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConnectFailedDatasource.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConnectFailedDatasource.java @@ -1,20 +1,17 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.lang.Thread.State; -import java.sql.SQLException; -import java.util.concurrent.TimeUnit; -import junit.framework.TestCase; - -import org.springframework.test.util.ReflectionTestUtils; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSource.CreateConnectionThread; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriverConnectFailed; +import junit.framework.TestCase; +import org.springframework.test.util.ReflectionTestUtils; + +import java.lang.Thread.State; +import java.sql.SQLException; +import java.util.concurrent.TimeUnit; public class OracleExceptionSorterTest_closeConnectFailedDatasource extends TestCase { private DruidDataSource dataSource; @@ -32,7 +29,7 @@ public class OracleExceptionSorterTest_closeConnectFailedDatasource extends Test dataSource.setMaxOpenPreparedStatements(100); dataSource.setMaxActive(1); dataSource.setMaxWait(1000); - + OracleMockDriverConnectFailed.CONNECT_BARIER.reset(); } @@ -55,7 +52,7 @@ public class OracleExceptionSorterTest_closeConnectFailedDatasource extends Test OracleMockDriverConnectFailed.CONNECT_BARIER.await(100, TimeUnit.MILLISECONDS); dataSource.close(); - + // waiting for createConnectionThread terminated. CreateConnectionThread thread = (CreateConnectionThread) ReflectionTestUtils.getField(dataSource, "createConnectionThread"); for (int i = 0; i < 10 && State.TERMINATED != thread.getState(); i++) { @@ -63,5 +60,4 @@ public class OracleExceptionSorterTest_closeConnectFailedDatasource extends Test } assertEquals(State.TERMINATED, thread.getState()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java index 445c283aa..a1c99540f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java @@ -1,14 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +8,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_closeStmt extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_closeStmt extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java index db7e8c1d8..17c9a5621 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -13,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_commit extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java index 7e7505050..ae992b6c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_concurrent.java @@ -1,16 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.concurrent.CountDownLatch; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; @@ -18,6 +7,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.util.concurrent.CountDownLatch; public class OracleExceptionSorterTest_concurrent extends TestCase { private DruidDataSource dataSource; @@ -100,5 +94,4 @@ public class OracleExceptionSorterTest_concurrent extends TestCase { assertEquals(2001, dataSource.getConnectCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java index afb0f3ba3..6e68bc436 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java @@ -1,11 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -13,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_rollback extends TestCase { private DruidDataSource dataSource; @@ -80,5 +79,4 @@ public class OracleExceptionSorterTest_rollback extends TestCase { assertTrue(dataSource.getPoolingCount() >= 1); assertTrue(dataSource.getCreateCount() >= 2); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java index 712157aea..dde90f140 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_setCatalog extends TestCase { private DruidDataSource dataSource; @@ -79,5 +74,4 @@ public class OracleExceptionSorterTest_setCatalog extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java index 2659dddfa..528a85ee6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_setIsolationLevel extends TestCase { private DruidDataSource dataSource; @@ -79,5 +74,4 @@ public class OracleExceptionSorterTest_setIsolationLevel extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java index 17967f6f3..11b19ff70 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_setReadOnly extends TestCase { private DruidDataSource dataSource; @@ -81,5 +76,4 @@ public class OracleExceptionSorterTest_setReadOnly extends TestCase { assertTrue(dataSource.getPoolingCount() >= 1); assertTrue(dataSource.getCreateCount() >= 2); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java index 3d57b82e0..d94b2a32b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_setSavepoint extends TestCase { private DruidDataSource dataSource; @@ -71,7 +66,7 @@ public class OracleExceptionSorterTest_setSavepoint extends TestCase { // assert that shrink will not call emptySignal at this time. dataSource.shrink(true, false); - + conn.close(); { @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_setSavepoint extends TestCase { assertEquals(1, dataSource.getPoolingCount()); assertEquals(2, dataSource.getCreateCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java index eaebde130..db2ef7789 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -17,6 +7,11 @@ import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; public class OracleExceptionSorterTest_setSavepointWithName extends TestCase { private DruidDataSource dataSource; @@ -79,5 +74,4 @@ public class OracleExceptionSorterTest_setSavepointWithName extends TestCase { assertTrue(dataSource.getPoolingCount() >= 1); assertTrue(dataSource.getCreateCount() >= 2); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java index e17ee14db..60aa9f6e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_addBatch.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_addBatch extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_addBatch extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java index 00becc36c..7434d5a5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_cancel.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_cancel extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_cancel extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java index 7f9823f43..614fda6bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearBatch.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_clearBatch extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_clearBatch extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java index 73b2747c1..e99e41916 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_clearWarrnings.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_clearWarrnings extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_clearWarrnings extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java index aa8fa8b34..ff4c6b23e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_execute extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_execute extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java index 351b69b05..99a0c2248 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeBatch.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeBatch extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_executeBatch extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java index 534220602..a4794e7dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeQuery.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeQuery extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_executeQuery extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java index 2bb829d45..237697d1b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeUpdate extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_executeUpdate extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java index 52073e3b3..4e501d981 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_1.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeUpdate_1 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_executeUpdate_1 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java index 398bea721..4b5d0d68f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeUpdate_2 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_executeUpdate_2 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java index d40e188df..64f4312c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_executeUpdate_3.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_executeUpdate_3 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_executeUpdate_3 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java index 5b7baca55..da2e2913b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_1.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_execute_1 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_execute_1 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java index 7e47c2f2e..04a168544 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_2.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_execute_2 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_execute_2 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java index 5cf053c05..57478fbd1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_execute_3.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_execute_3 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_execute_3 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java index d7f353d04..339a2d012 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchDirection.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getFetchDirection extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getFetchDirection extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java index 4d6980c91..2b6eb8976 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getFetchSize.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getFetchSize extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getFetchSize extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java index 38558976c..15e0e1e1e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getGeneratedKeys.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getGeneratedKeys extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getGeneratedKeys extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java index 6daf55fb3..668e961d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxField.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getMaxField extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getMaxField extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java index b08aea2cf..523be8330 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMaxRows.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getMaxRows extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getMaxRows extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java index 9b2254f3e..9306c5754 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getMoreResults extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_getMoreResults extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java index 56433e822..2ad27fe1e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getMoreResults_1.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getMoreResults_1 extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getMoreResults_1 extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java index 8f8fc5431..588eeddf8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getQueryTimeout.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getQueryTimeout extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getQueryTimeout extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java index a61e05910..40813ed13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSet.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getResultSet extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_getResultSet extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java index 4ad55f1d1..d74f8d7fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetConcurrency.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getResultSetConcurrency extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getResultSetConcurrency extends Test conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java index 132ba82c9..8991dec8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetHoldability.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getResultSetHoldability extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getResultSetHoldability extends Test conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java index 08af53084..8df5c815b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getResultSetType.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getResultSetType extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_getResultSetType extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java index b48e33201..55ed8bea1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getUpdateCount.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getUpdateCount extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_getUpdateCount extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java index c1709c24d..2ce01a664 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_getWarrnings.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_getWarrnings extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_getWarrnings extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java index 1c51d5b23..292140927 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setCursorName.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setCursorName extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_setCursorName extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java index d6486bbc4..015accb6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setEscapeProcessing.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setEscapeProcessing extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_setEscapeProcessing extends TestCase conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java index 86a73450f..6d2f190ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchDirection.java @@ -1,16 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -19,6 +8,12 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setFetchDirection extends TestCase { private DruidDataSource dataSource; @@ -83,5 +78,4 @@ public class OracleExceptionSorterTest_stmt_setFetchDirection extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java index d880aec61..c94b7ff93 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setFetchSize.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setFetchSize extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_setFetchSize extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java index ea0a1d078..83fafec67 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxField.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setMaxField extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_setMaxField extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java index ea14d083f..aa6dddced 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setMaxRows.java @@ -1,15 +1,5 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; @@ -18,6 +8,11 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; public class OracleExceptionSorterTest_stmt_setMaxRows extends TestCase { private DruidDataSource dataSource; @@ -82,5 +77,4 @@ public class OracleExceptionSorterTest_stmt_setMaxRows extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java index df71cfd9f..dd8644df6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java @@ -1,25 +1,18 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Statement; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; -import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; + public class OracleExceptionSorterTest_stmt_setQueryTimeout extends PoolTestCase { private DruidDataSource dataSource; @@ -86,5 +79,4 @@ public class OracleExceptionSorterTest_stmt_setQueryTimeout extends PoolTestCase conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java index 20aba2c82..d480ab32d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java @@ -1,16 +1,10 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import java.sql.SQLException; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.vendor.OracleExceptionSorter; - public class OracleExceptionSorter_userDefined extends PoolTestCase { protected void setUp() throws Exception { super.setUp(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java index 34a149333..e04a02977 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java @@ -1,20 +1,14 @@ package com.alibaba.druid.bvt.pool.exception; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; +import java.sql.SQLException; + public class OracleExceptionSorter_userDefined_1 extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java index 45da8038d..ea2109059 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java @@ -1,7 +1,8 @@ package com.alibaba.druid.bvt.pool.profile; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.DataSourceNotAvailableException; +import com.alibaba.druid.pool.DruidDataSource; import java.sql.SQLException; import java.util.Properties; @@ -10,11 +11,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import com.alibaba.druid.PoolTestCase; -import com.alibaba.druid.pool.DataSourceDisableException; -import com.alibaba.druid.pool.DataSourceNotAvailableException; -import com.alibaba.druid.pool.DruidDataSource; - public class FailFastTest extends PoolTestCase { private DruidDataSource dataSource; @@ -93,5 +89,4 @@ public class FailFastTest extends PoolTestCase { Thread.sleep(100 * 1); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java index 11db3c0e9..b7e40a816 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/profile/ProfileEnableTest.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.pool.profile; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; - import junit.framework.TestCase; public class ProfileEnableTest extends TestCase { @@ -27,5 +26,4 @@ public class ProfileEnableTest extends TestCase { conn.close(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java index 4a9c10b40..b153135b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java @@ -1,16 +1,9 @@ package com.alibaba.druid.bvt.pool.property; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; - public class PropertyTest_filters extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java index dd2df2e64..04a8d8984 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testOnBorrow.java @@ -1,14 +1,8 @@ package com.alibaba.druid.bvt.pool.property; -import static org.junit.Assert.*; - - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; - +import junit.framework.TestCase; public class PropertyTest_testOnBorrow extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java index 2282e109f..697738ea8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_testWhileIdle.java @@ -1,14 +1,8 @@ package com.alibaba.druid.bvt.pool.property; -import static org.junit.Assert.*; - - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; - +import junit.framework.TestCase; public class PropertyTest_testWhileIdle extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java index 85f50f243..3668077dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_useGlobalDataSourceStat.java @@ -1,14 +1,8 @@ package com.alibaba.druid.bvt.pool.property; -import static org.junit.Assert.*; - - - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; - +import junit.framework.TestCase; public class PropertyTest_useGlobalDataSourceStat extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java index 40ec84875..739bcb85f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java @@ -1,16 +1,9 @@ package com.alibaba.druid.bvt.pool.property; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; - public class PropertyTest_validationQuery extends PoolTestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java index f53999bc7..8d5579b00 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java @@ -1,16 +1,10 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.vendor.InformixExceptionSorter; import java.sql.SQLException; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.vendor.InformixExceptionSorter; - public class InformixExceptionSorterTest extends PoolTestCase { public void test_informix() throws Exception { InformixExceptionSorter sorter = new InformixExceptionSorter(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java index d907f2944..6614bf7e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java @@ -1,17 +1,11 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker; +import java.sql.SQLException; + public class MSSQLValidConnectionCheckerTest extends PoolTestCase { public void test_0() throws Exception { MSSQLValidConnectionChecker checker = new MSSQLValidConnectionChecker(); @@ -19,7 +13,6 @@ public class MSSQLValidConnectionCheckerTest extends PoolTestCase { MockConnection conn = new MockConnection(); assertTrue(checker.isValidConnection(conn, "select 1", 10)); - } public void test_closed() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java index 2520305de..374a1c3bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java @@ -1,17 +1,11 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - -import java.sql.Connection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker; +import java.sql.Connection; + public class MySQLValidConnectionCheckerTest extends PoolTestCase { private DruidDataSource dataSource; @@ -49,5 +43,4 @@ public class MySQLValidConnectionCheckerTest extends PoolTestCase { Connection conn = dataSource.getConnection(); conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java index 4fa17054a..4f737501e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java @@ -1,16 +1,9 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; +import java.sql.SQLException; public class MySqlExceptionSorterTest extends PoolTestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java index 80555263c..a5a46671f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java @@ -2,10 +2,7 @@ package com.alibaba.druid.bvt.pool.vendor; import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; -import com.alibaba.druid.util.MySqlUtils; -import junit.framework.TestCase; -import java.lang.reflect.Constructor; import java.net.SocketTimeoutException; import java.sql.SQLException; diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java index 9903d8851..fd2867605 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java @@ -1,16 +1,9 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - -import java.sql.SQLException; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; +import java.sql.SQLException; public class MySqlExceptionSorterTest_oceanbase extends PoolTestCase { public void test_true() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java index 9198b5644..524cf3836 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java @@ -1,17 +1,11 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.vendor.PGExceptionSorter; import org.postgresql.util.GT; import org.postgresql.util.PSQLException; import org.postgresql.util.PSQLState; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.vendor.PGExceptionSorter; - public class PGExceptionSorterTest extends PoolTestCase { public void test_pg() throws Exception { PGExceptionSorter exSorter = new PGExceptionSorter(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java index 8c4908da8..e8b4b11cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java @@ -1,16 +1,10 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.pool.vendor.SybaseExceptionSorter; import java.sql.SQLException; -import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.vendor.SybaseExceptionSorter; - public class SybaseExceptionSorterTest extends PoolTestCase { public void test_false() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java index a69e8e3a0..ab8014045 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java @@ -1,15 +1,8 @@ package com.alibaba.druid.bvt.pool.vendor; -import static org.junit.Assert.*; - - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - - import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; - public class ValidConnectionCheckerAdapterTest extends PoolTestCase { public void test_adapter() throws Exception { ValidConnectionCheckerAdapter adapter = new ValidConnectionCheckerAdapter(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java index 9fbbc76ba..25dc76d67 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.pool.xa; -import javax.sql.XAConnection; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - import com.alibaba.druid.pool.xa.DruidXADataSource; import com.alibaba.druid.util.JdbcUtils; +import javax.sql.XAConnection; + public class H2XATest extends PoolTestCase { private DruidXADataSource dataSource; @@ -35,7 +33,6 @@ public class H2XATest extends PoolTestCase { dataSource.setTestOnBorrow(false); JdbcUtils.execute(dataSource, "CREATE TABLE user (id INT, name VARCHAR(40))"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java b/core/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java index f19666bd9..184ea782c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java @@ -1,17 +1,11 @@ package com.alibaba.druid.bvt.pool.xa; -import static org.junit.Assert.*; - - -import java.lang.reflect.Constructor; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; -import net.sourceforge.jtds.jdbc.JtdsConnection; - - import com.alibaba.druid.pool.xa.JtdsXAConnection; import com.alibaba.druid.pool.xa.JtdsXAResource; +import net.sourceforge.jtds.jdbc.JtdsConnection; + +import java.lang.reflect.Constructor; public class JtdsXAConnectionTest extends PoolTestCase { public void test_jtds() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java index f8fcb68f5..010166c7d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java @@ -15,8 +15,12 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; import java.math.BigDecimal; import java.sql.Connection; @@ -27,21 +31,12 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.concurrent.atomic.AtomicLong; -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; -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"; private AtomicLong fetchRowCout = new AtomicLong(); - Connection globalConnection = null; + Connection globalConnection; protected void setUp() throws Exception { JdbcStatManager stat = JdbcStatManager.getInstance(); @@ -77,7 +72,6 @@ public class AllStatisticTest extends TestCase { f1(); f2(); f3(); - } public void f1() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java index 1d473d6dd..ca155cb15 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java @@ -15,27 +15,15 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Savepoint; -import java.sql.Statement; -import java.sql.Types; -import java.util.Calendar; -import java.util.HashMap; - -import junit.framework.TestCase; - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.math.BigDecimal; +import java.sql.*; +import java.util.Calendar; +import java.util.HashMap; 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"; @@ -90,7 +78,7 @@ public class BasicTypeTest extends TestCase { conn = DriverManager.getConnection(create_url); conn.rollback(); - pstmt = conn.prepareStatement("INSERT INTO T_BASIC_TYPE (F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16, F17) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?)"); + pstmt = conn.prepareStatement("INSERT INTO T_BASIC_TYPE (F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14, F15, F16, F17) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); pstmt.getParameterMetaData(); pstmt.setFloat(1, 1F); @@ -278,7 +266,7 @@ public class BasicTypeTest extends TestCase { ResultSet.CLOSE_CURSORS_AT_COMMIT); JdbcUtils.close(pstmt); - cstmt = conn.prepareCall("CALL BASIC_CALL_0(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?, ?, ?, ?)"); + cstmt = conn.prepareCall("CALL BASIC_CALL_0(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); cstmt.registerOutParameter(1, Types.FLOAT); cstmt.registerOutParameter(2, Types.DOUBLE); cstmt.registerOutParameter(3, Types.FLOAT); @@ -666,5 +654,4 @@ public class BasicTypeTest extends TestCase { // F11 TIMESTAMP, F12 BLOB, F13 VARCHAR(256), F14 VARCHAR(256), F15 // VARCHAR(256), F16 VARCHAR(256), F17 SMALLINT)"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java index c8f275ea6..328286a94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java @@ -15,8 +15,10 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.DriverManager; @@ -25,12 +27,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.util.JdbcUtils; +import static org.junit.Assert.assertArrayEquals; 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java index 1547c2c2b..87322c3f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java @@ -15,23 +15,13 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.io.ByteArrayInputStream; -import java.sql.Blob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.ByteArrayInputStream; +import java.sql.*; 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"; @@ -186,5 +176,4 @@ public class BlobTest extends TestCase { JdbcUtils.close(conn); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java index c1229c4e3..1a2887a6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java @@ -15,22 +15,11 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.*; public class CallStatementTest extends TestCase { /** @@ -170,7 +159,9 @@ public class CallStatementTest extends TestCase { ps.setInt(1, p2); data2[0] = ps.executeQuery(); - if (p2 == 99) data2[0].close(); + if (p2 == 99) { + data2[0].close(); + } // return no results if (p2 == 199) { @@ -227,10 +218,16 @@ public class CallStatementTest extends TestCase { 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() + ")"); - if (c == null) System.out.println(" c = null"); - else System.out.print(" c=<" + c + ">(" + c.length() + ")"); + if (b == null) { + System.out.println(" b = null"); + } else { + System.out.print(" b=<" + b + ">(" + b.length() + ")"); + } + if (c == null) { + System.out.println(" c = null"); + } else { + System.out.print(" c=<" + c + ">(" + c.length() + ")"); + } System.out.println(""); @@ -283,5 +280,4 @@ public class CallStatementTest extends TestCase { public static void outparams1(int[] p1, int p2) { p1[0] = p2 * 2; } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java index d9c4dc931..0ea7da427 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java @@ -15,29 +15,6 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -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.CallableStatement; -import java.sql.Clob; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.ResultSet; -import java.sql.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Types; -import java.util.Calendar; -import java.util.Properties; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterEventAdapter; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl; @@ -47,6 +24,15 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxy; import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig; import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.Reader; +import java.math.BigDecimal; +import java.net.URL; +import java.sql.*; +import java.util.Calendar; +import java.util.Properties; public class CallableStatementProxyImplTest extends TestCase { protected void tearDown() throws Exception { @@ -601,5 +587,4 @@ public class CallableStatementProxyImplTest extends TestCase { public void setNClob(String parameterName, Reader reader) throws SQLException { } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java index 49402b07c..5470a65b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java @@ -15,24 +15,14 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.StringReader; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.ClobProxy; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.StringReader; +import java.sql.*; 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"; @@ -205,5 +195,4 @@ public class ClobTest extends TestCase { JdbcUtils.close(conn); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java index ed570e5b1..ec57e1f96 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java @@ -15,19 +15,13 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - -import org.apache.commons.logging.impl.Log4JLogger; -import org.apache.log4j.Priority; - import com.alibaba.druid.filter.logging.CommonsLogFilter; import com.alibaba.druid.filter.logging.LogFilter; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; +import org.apache.commons.logging.impl.Log4JLogger; +import org.apache.log4j.Priority; public class CommonsLogFilterTest extends TestCase { protected void tearDown() throws Exception { @@ -224,7 +218,6 @@ public class CommonsLogFilterTest extends TestCase { assertFalse(filter.isResultSetCloseAfterLogEnabled()); assertFalse(filter.isResultSetNextAfterLogEnabled()); assertFalse(filter.isResultSetOpenAfterLogEnabled()); - } @SuppressWarnings("serial") diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java index b16462eaa..a12227191 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java @@ -15,14 +15,6 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.sql.SQLClientInfoException; -import java.util.Properties; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterEventAdapter; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; @@ -30,6 +22,10 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxy; import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig; import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.SQLClientInfoException; +import java.util.Properties; public class ConnectionProxyImplTest extends TestCase { protected void tearDown() throws Exception { @@ -54,5 +50,4 @@ public class ConnectionProxyImplTest extends TestCase { connection.setClientInfo("name", null); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java index f0dd65582..aae3200cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import junit.framework.TestCase; - - import com.alibaba.druid.stat.JdbcConnectionStat; +import junit.framework.TestCase; public class ConnectionStatisticTest extends TestCase { public void test_connection_stat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java index ddd386a83..15a9ce324 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java @@ -15,25 +15,12 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.sql.Blob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLClientInfoException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Savepoint; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.*; 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java index 290a0733d..a19d13bb4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java @@ -15,18 +15,6 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.filter.stat.StatFilter; @@ -38,6 +26,12 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcDataSourceStat; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; public class CounterFilterTest extends TestCase { String sql = "SELECT 1"; @@ -107,5 +101,4 @@ public class CounterFilterTest extends TestCase { dataSource.getProperties(); dataSource.getDataSourceMBeanDomain(); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java index 122e5a0a2..50d84ffc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java @@ -15,24 +15,17 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import com.alibaba.druid.proxy.jdbc.DataSourceProxy; +import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.Driver; import java.sql.DriverManager; import java.util.Properties; -import junit.framework.TestCase; - - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.stat.JdbcStatManager; - public class DriverTest extends TestCase { protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); @@ -100,5 +93,4 @@ public class DriverTest extends TestCase { assertEquals(1, dataSource_4.getProxyFilters().size()); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java index 9b31b5d8e..932061dce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java @@ -15,21 +15,15 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.util.Properties; public class DruidDriverTest extends TestCase { protected void tearDown() throws Exception { @@ -199,5 +193,4 @@ public class DruidDriverTest extends TestCase { assertNotNull(error); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues.java index 066ed9399..fa40deb7e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues.java @@ -2,7 +2,11 @@ package com.alibaba.druid.bvt.proxy; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; -import com.alibaba.druid.proxy.jdbc.*; +import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; +import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig; +import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; +import com.alibaba.druid.proxy.jdbc.JdbcParameter; +import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl; import junit.framework.TestCase; import java.lang.reflect.Field; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_1.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_1.java index 1f35d1342..aea4d8d13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_1.java @@ -13,7 +13,6 @@ public class InsertValues_1 extends TestCase { public void test_insert_values() throws Exception { String sql = "insert into t (f0, f1, f2, f3, f4) values ('????????????????????????', '????????????????????????', '????????????????????????', '????????????????????????', '????????????????????????')"; - PreparedStatementProxyImpl proxy = new PreparedStatementProxyImpl(null, null, sql, 0); Field field = PreparedStatementProxyImpl.class.getDeclaredField("parameters"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_2.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_2.java index 746ac1024..740c324c5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/InsertValues_2.java @@ -13,7 +13,6 @@ public class InsertValues_2 extends TestCase { public void test_insert_values() throws Exception { String sql = "insert into t (f0, f1, f2, f3, f4) values (\"????????????????????????\", \"????????????????????????\", \"????????????????????????\", \"????????????????????????\", \"????????????????????????\")"; - PreparedStatementProxyImpl proxy = new PreparedStatementProxyImpl(null, null, sql, 0); Field field = PreparedStatementProxyImpl.class.getDeclaredField("parameters"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java index 72eb40cfd..37b811f48 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java @@ -15,33 +15,19 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.filter.FilterEventAdapter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.proxy.DruidDriver; -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.DataSourceProxyConfig; -import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl; -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.*; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; public class JdbcFilterEventAdapterTest extends TestCase { protected void tearDown() throws Exception { @@ -754,7 +740,6 @@ public class JdbcFilterEventAdapterTest extends TestCase { assertNotNull(error); } - // ////////////////////////// { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java index 592e75d86..6ce08cea2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java @@ -15,8 +15,15 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockResultSet; +import com.alibaba.druid.mock.MockResultSetMetaData; +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; import java.io.Closeable; import java.io.IOException; @@ -29,18 +36,6 @@ import java.sql.Statement; import java.sql.Types; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - - -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.mock.MockResultSet; -import com.alibaba.druid.mock.MockResultSetMetaData; -import com.alibaba.druid.mock.MockStatement; -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.util.Utils; -import com.alibaba.druid.util.JdbcUtils; - public class JdbcUtilsTest extends TestCase { protected void tearDown() throws Exception { DruidDriver.getProxyDataSources().clear(); @@ -277,5 +272,4 @@ public class JdbcUtilsTest extends TestCase { assertEquals("AA", text); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java index 734ab5f73..4bd4e7bdb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4j2FilterTest.java @@ -15,10 +15,12 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import com.alibaba.druid.filter.logging.Log4j2Filter; +import com.alibaba.druid.filter.logging.LogFilter; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; +import org.apache.log4j.Priority; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; @@ -27,14 +29,6 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.util.MessageSupplier; import org.apache.logging.log4j.util.Supplier; -import org.apache.log4j.Priority; - -import com.alibaba.druid.filter.logging.Log4j2Filter; -import com.alibaba.druid.filter.logging.LogFilter; -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; - -import junit.framework.TestCase; public class Log4j2FilterTest extends TestCase { protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java index 530cdac0f..cba376704 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java @@ -15,19 +15,13 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - -import org.apache.log4j.Logger; -import org.apache.log4j.Priority; - import com.alibaba.druid.filter.logging.Log4jFilter; import com.alibaba.druid.filter.logging.LogFilter; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; +import org.apache.log4j.Logger; +import org.apache.log4j.Priority; public class Log4jFilterTest extends TestCase { protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java index af54ecb7d..b6e41ea94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java @@ -15,21 +15,6 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; -import java.util.Properties; - -import junit.framework.TestCase; - - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.filter.logging.CommonsLogFilter; import com.alibaba.druid.filter.logging.Log4jFilter; @@ -48,6 +33,10 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.*; +import java.util.Properties; public class LogFilterTest extends TestCase { protected void tearDown() throws Exception { @@ -364,5 +353,4 @@ public class LogFilterTest extends TestCase { logFilter.setResultSetLogErrorEnabled(enable); logFilter.setResultSetCloseAfterLogEnabled(enable); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java index 1cc7a09e1..ceaf07a35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java @@ -15,29 +15,14 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.io.InputStream; -import java.io.Reader; -import java.sql.Blob; -import java.sql.CallableStatement; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.NClob; -import java.sql.ResultSet; -import java.sql.SQLDataException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Statement; -import java.sql.Types; - -import junit.framework.TestCase; - - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.Reader; +import java.sql.*; 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"; @@ -339,5 +324,4 @@ public class PrecallTest extends TestCase { JdbcUtils.close(conn); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java index 719761fa3..5daece65e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementProxyImplGetParametersTest.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.util.Map; - - -import junit.framework.TestCase; - import com.alibaba.druid.proxy.jdbc.JdbcParameter; import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.util.Map; public class PreparedStatementProxyImplGetParametersTest extends TestCase { private String url = "jdbc:wrap-jdbc:filters=default:name=driverTest:jdbc:mock:xxx"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java index e7bd63326..b78039a2b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java @@ -15,27 +15,14 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.io.Reader; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.NClob; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLDataException; -import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; -import java.sql.Statement; -import java.sql.Types; -import java.util.Calendar; - - -import junit.framework.TestCase; - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.Reader; +import java.sql.*; +import java.util.Calendar; 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java index c4288e847..725e6889f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.DriverManager; - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; - -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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java index 9c12a8d7a..9422a3dca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - -import java.io.Reader; -import java.sql.Connection; -import java.sql.NClob; -import java.sql.Statement; - - -import junit.framework.TestCase; - import com.alibaba.druid.filter.logging.Log4jFilter; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.mock.MockDriver; @@ -33,6 +23,12 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig; import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.io.Reader; +import java.sql.Connection; +import java.sql.NClob; +import java.sql.Statement; public class ResultSetProxyImplTest extends TestCase { String sql = "SELECT 1"; @@ -96,5 +92,4 @@ public class ResultSetProxyImplTest extends TestCase { rs.updateNCharacterStream("1", null); rs.updateNCharacterStream("1", null, 0); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java index 2a23d8ef1..cef9940bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java @@ -15,26 +15,13 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.PrintStream; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.Date; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.sql.Types; - -import junit.framework.TestCase; - - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.io.PrintStream; +import java.sql.*; public class SchemaReadTest extends TestCase { private static String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:classpath:petstore-db"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java index 789f2eb34..580ffd7f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java @@ -15,13 +15,8 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import junit.framework.TestCase; - - import com.alibaba.druid.stat.JdbcSqlStat; +import junit.framework.TestCase; public class SqlStatisticTest extends TestCase { public void test_sql_stat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java index e99126211..c04872e74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java @@ -15,8 +15,10 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.DriverManager; @@ -25,13 +27,6 @@ import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; -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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java index c36cf8304..b9bd2c541 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java @@ -15,14 +15,10 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; - - -import junit.framework.TestCase; - import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.stat.JdbcConnectionStat; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; public class StatisticTest extends TestCase { public void test_stat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java index 58fd3798d..7c58989e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java @@ -15,24 +15,17 @@ */ package com.alibaba.druid.bvt.proxy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.sql.DriverManager; -import java.sql.Statement; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.proxy.DruidDriver; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.sql.DriverManager; +import java.sql.Statement; +import java.util.Properties; 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java index 03c283a8e..c7a17efef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/DruidDriverTest.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.proxy.fake; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.alibaba.druid.proxy.DruidDriver; +import junit.framework.TestCase; import java.sql.Connection; import java.util.Properties; -import junit.framework.TestCase; - - -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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java index 01d804a78..0ded45767 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.proxy.fake; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.mock.MockDriver; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.util.Properties; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; - public class FakeDriverTest extends TestCase { public void test_0() throws Exception { String url = "jdbc:fake:x1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java index e9bc4f44f..c66490c53 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java @@ -15,23 +15,11 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.NClob; -import java.sql.ResultSet; -import java.sql.SQLXML; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; + +import java.sql.*; public class ClobTest extends TestCase { protected int dataSourceListSize; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java index c266fe627..4aee06e34 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java @@ -1,8 +1,11 @@ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.JdbcDataSourceStat; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -10,16 +13,6 @@ import java.sql.ResultSet; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.JdbcDataSourceStat; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; - public class GlobalStatTest0 extends TestCase { private DruidDataSource dataSourceA; private DruidDataSource dataSourceB; @@ -54,6 +47,7 @@ public class GlobalStatTest0 extends TestCase { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Empty loop } rs.close(); stmt.close(); @@ -64,6 +58,7 @@ public class GlobalStatTest0 extends TestCase { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Empty loop } rs.close(); stmt.close(); @@ -82,5 +77,4 @@ public class GlobalStatTest0 extends TestCase { assertEquals(2, sqlInfo.get("ExecuteCount")); assertEquals(2, sqlInfo.get("FetchRowCount")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java index 4f32f1750..4aba14ea5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest1.java @@ -1,20 +1,15 @@ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Statement; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcDataSourceStat; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.Statement; public class GlobalStatTest1 extends TestCase { private DruidDataSource dataSourceA; @@ -49,6 +44,7 @@ public class GlobalStatTest1 extends TestCase { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1"); while (rs.next()) { + // Empty loop } rs.close(); stmt.close(); @@ -59,6 +55,7 @@ public class GlobalStatTest1 extends TestCase { PreparedStatement stmt = conn.prepareStatement("SELECT 1"); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Empty loop } rs.close(); stmt.close(); @@ -70,5 +67,4 @@ public class GlobalStatTest1 extends TestCase { assertEquals(1, JdbcStatManager.getInstance().getSqlList().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java index 9bbdffedf..65c9c8aa6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - public class MergeStatFilterTest extends TestCase { private DruidDataSource dataSource; @@ -51,5 +48,4 @@ public class MergeStatFilterTest extends TestCase { assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java index 65a52926c..3c470775e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest2.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; - public class MergeStatFilterTest2 extends TestCase { private DruidDataSource dataSource; @@ -64,5 +60,4 @@ public class MergeStatFilterTest2 extends TestCase { assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() .size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java index 6489ccf3f..30ccbc3ec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest3.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; import java.io.InputStreamReader; import java.sql.Connection; import java.sql.Statement; -import junit.framework.TestCase; - - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.Utils; - public class MergeStatFilterTest3 extends TestCase { private DruidDataSource dataSource; @@ -52,11 +48,8 @@ public class MergeStatFilterTest3 extends TestCase { conn.close(); } - assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap() .size()); System.out.println(dataSource.getDataSourceStat().getSqlStatMap().keySet().iterator().next()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java index beec30a91..46d9a76ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.Statement; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; +import java.sql.Statement; public class MergeStatFilterTest_tddl extends TestCase { private DruidDataSource dataSource; @@ -89,7 +85,5 @@ public class MergeStatFilterTest_tddl extends TestCase { } assertEquals(2, dataSource.getDataSourceStat().getSqlStatMap().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java index c4eb0b538..ec0dd59b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_1.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.Statement; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; +import java.sql.Statement; public class MergeStatFilterTest_tddl_1 extends TestCase { private DruidDataSource dataSource; @@ -70,7 +66,5 @@ public class MergeStatFilterTest_tddl_1 extends TestCase { } assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java index c43602b6b..338083397 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_2.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.Statement; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; +import java.sql.Statement; public class MergeStatFilterTest_tddl_2 extends TestCase { private DruidDataSource dataSource; @@ -70,7 +66,5 @@ public class MergeStatFilterTest_tddl_2 extends TestCase { } assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java index 6a25f8887..05b4145e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_3.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class MergeStatFilterTest_tddl_3 extends TestCase { private DruidDataSource dataSource; @@ -74,7 +70,5 @@ public class MergeStatFilterTest_tddl_3 extends TestCase { } assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java index 4a2fb92d2..8b3e824a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl_4.java @@ -15,20 +15,16 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; - -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class MergeStatFilterTest_tddl_4 extends TestCase { private DruidDataSource dataSource; @@ -75,7 +71,5 @@ public class MergeStatFilterTest_tddl_4 extends TestCase { } assertEquals(1, dataSource.getDataSourceStat().getSqlStatMap().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java index dd995afbf..d82593890 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterConcurrentTest.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import java.sql.Connection; -import java.sql.Statement; -import java.util.concurrent.CountDownLatch; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcSqlStat; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.Statement; +import java.util.concurrent.CountDownLatch; public class StatFilterConcurrentTest extends TestCase { private DruidDataSource dataSource; @@ -79,6 +78,5 @@ public class StatFilterConcurrentTest extends TestCase { threads[i].start(); } endLatch.await(); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java index 16feea607..c76df6032 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java @@ -15,23 +15,19 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.TabularData; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; -import javax.management.openmbean.CompositeData; -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - - -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.support.json.JSONUtils; - public class StatFilterTest extends TestCase { public void setUp() throws Exception { JdbcStatManager.getInstance().reset(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java index e837e3830..1f704dd44 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest2.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.bvt.proxy.filter; -import java.sql.Connection; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.Statement; public class StatFilterTest2 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java index 26c0b278f..08ab5a67c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest3.java @@ -1,17 +1,10 @@ package com.alibaba.druid.bvt.proxy.filter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.DbType; +import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; - -import com.alibaba.druid.filter.stat.StatFilter; - public class StatFilterTest3 extends TestCase { @SuppressWarnings("deprecation") public void test_dbType() throws Exception { @@ -48,7 +41,6 @@ public class StatFilterTest3 extends TestCase { assertEquals("select 'x' limit 1", filter.mergeSql("select 'x' limit 1")); } - public void test_merge_pg() throws Exception { StatFilter filter = new StatFilter(); filter.setDbType(JdbcConstants.POSTGRESQL); @@ -87,7 +79,7 @@ public class StatFilterTest3 extends TestCase { assertEquals("SELECT *\n" + "FROM temp.test\n" + "ORDER BY id DESC\n" + - "LIMIT ?" - , filter.mergeSql("select * from temp.test order by id desc limit 1")); + "LIMIT ?", + filter.mergeSql("select * from temp.test order by id desc limit 1")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java index 7901ad71d..339bd1dd4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java @@ -15,14 +15,10 @@ */ package com.alibaba.druid.bvt.proxy.filter.encoding; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.UnsupportedEncodingException; - +import com.alibaba.druid.filter.encoding.CharsetConvert; import junit.framework.TestCase; -import com.alibaba.druid.filter.encoding.CharsetConvert; +import java.io.UnsupportedEncodingException; /** * @author gang.su diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java index 9c53c90dc..6844096ec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.proxy.filter.encoding; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.filter.encoding.CharsetParameter; +import junit.framework.TestCase; /** * @author gang.su @@ -32,6 +29,5 @@ public class CharsetParameterTest extends TestCase { c.setServerEncoding("2"); assertEquals("1", c.getClientEncoding()); assertEquals("2", c.getServerEncoding()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java index 5c189543a..ede500057 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java @@ -15,23 +15,17 @@ */ package com.alibaba.druid.bvt.proxy.utils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import com.alibaba.druid.bvt.proxy.DruidDriverTest.PublicJdbcFilterAdapter; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.filter.FilterManager; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; import java.sql.SQLException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import junit.framework.TestCase; - - -import com.alibaba.druid.bvt.proxy.DruidDriverTest.PublicJdbcFilterAdapter; -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.filter.FilterManager; -import com.alibaba.druid.util.Utils; - /** * druidLoader util 测试 * @@ -103,5 +97,4 @@ public class DruidLoaderUtilsTest extends TestCase { assertNull(Utils.loadClass(null)); assertNull(Utils.loadClass("")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java b/core/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java index 370d786a9..9fc69e53e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java @@ -15,20 +15,17 @@ */ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertEquals; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.Statement; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockCallableStatement; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.spring.DruidNativeJdbcExtractor; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.Statement; public class DruidJdbcExtractorTest extends TestCase { public void test_spring() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java b/core/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java index e9423de14..09cbff112 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java @@ -15,16 +15,10 @@ */ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - import com.alibaba.druid.support.spring.stat.SpringMethodInfo; import com.alibaba.druid.support.spring.stat.SpringMethodStat; import com.alibaba.druid.support.spring.stat.SpringStat; +import junit.framework.TestCase; public class SpringMethodInfoTest extends TestCase { public void test_equals() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java index d53a5adfb..1404f1f82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapClientWrapperTest.java @@ -1,25 +1,20 @@ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.Connection; -import java.sql.Statement; -import java.util.Collections; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.alibaba.druid.spring.User; import com.alibaba.druid.support.ibatis.SqlMapClientWrapper; import com.ibatis.sqlmap.client.event.RowHandler; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.Statement; +import java.util.Collections; public class SqlMapClientWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; + private ClassPathXmlApplicationContext context; protected void setUp() throws Exception { context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/ibatis/spring-config-ibatis-1.xml"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java index b586cc107..ca50db6f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest.java @@ -1,18 +1,14 @@ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertNotNull; - -import java.sql.Connection; - -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.alibaba.druid.support.ibatis.SqlMapClientWrapper; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import java.sql.Connection; public class SqlMapExecutorWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; + private ClassPathXmlApplicationContext context; protected void setUp() throws Exception { context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java index 7d0474689..14a560cd7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapExecutorWrapperTest_2.java @@ -1,25 +1,20 @@ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.sql.Connection; -import java.sql.Statement; -import java.util.Collections; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.alibaba.druid.spring.User; import com.alibaba.druid.support.ibatis.SqlMapExecutorWrapper; import com.ibatis.sqlmap.client.event.RowHandler; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.Statement; +import java.util.Collections; public class SqlMapExecutorWrapperTest_2 extends TestCase { - private ClassPathXmlApplicationContext context = null; + private ClassPathXmlApplicationContext context; protected void setUp() throws Exception { context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java index 99cd2d7f5..d01d4cf51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/spring/SqlMapSessionWrapperTest.java @@ -1,17 +1,13 @@ package com.alibaba.druid.bvt.spring; -import static org.junit.Assert.assertNotNull; - -import junit.framework.TestCase; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - import com.alibaba.druid.support.ibatis.SqlMapSessionWrapper; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; import com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl; +import junit.framework.TestCase; +import org.springframework.context.support.ClassPathXmlApplicationContext; public class SqlMapSessionWrapperTest extends TestCase { - private ClassPathXmlApplicationContext context = null; + private ClassPathXmlApplicationContext context; protected void setUp() throws Exception { context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/ibatis/spring-config-ibatis.xml"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java index 47730f2f4..eb1430eee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/BigOrTest.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.bvt.sql; -import java.util.List; - import com.alibaba.druid.DbType; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; +import junit.framework.TestCase; + +import java.util.List; public class BigOrTest extends TestCase { public void testBigOr() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java index 12c3151cf..3fe3540ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -64,7 +61,6 @@ public class CreateCompareTest extends TestCase { List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLCreateTableStatement.sort(stmtList); assertEquals("t9", ((SQLCreateTableStatement) stmtList.get(9)).getName().getSimpleName()); @@ -78,7 +74,6 @@ public class CreateCompareTest extends TestCase { assertEquals("t4", ((SQLCreateTableStatement) stmtList.get(1)).getName().getSimpleName()); assertEquals("t2", ((SQLCreateTableStatement) stmtList.get(0)).getName().getSimpleName()); - String sortedSql = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); System.out.println(sortedSql); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java index bec751e71..71fd69eca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_1.java @@ -90,7 +90,6 @@ public class CreateCompareTest_1 extends TestCase { List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLCreateTableStatement.sort(stmtList); assertEquals("XT_DJ_XT", ((SQLCreateTableStatement) stmtList.get(0)).getName().getSimpleName()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java index bf0af7aef..42aa18ad8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateCompareTest_cycle.java @@ -73,7 +73,6 @@ public class CreateCompareTest_cycle extends TestCase { List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); - SQLCreateTableStatement.sort(stmtList); String sortedSql = SQLUtils.toSQLString(stmtList, JdbcConstants.ORACLE); @@ -93,7 +92,5 @@ public class CreateCompareTest_cycle extends TestCase { assertEquals("t4", ((SQLAlterTableStatement) stmtList.get(10)).getName().getSimpleName()); assertEquals(11, stmtList.size()); - - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java index 0032f5971..5573c15dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql; -import java.util.List; - import com.alibaba.druid.DbType; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import java.util.List; public class CreateDatabaseTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java index 5a05ec9a3..86584f508 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class DistinctTest extends TestCase { private String sql = "select count(distinct *) from t"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java index c407b5565..fe542a823 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest2.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleIntervalExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest2 extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java index d2a8ac1c1..f540c7c04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleDate.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLDateExpr; +import junit.framework.TestCase; public class EqualTest_OracleDate extends TestCase { public void test_eq() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java index e46523763..234e9c314 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_OracleTimestampExpr.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_OracleTimestampExpr extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java index 2988b4670..74f7166df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_SQLSelectQueryBlock.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import junit.framework.TestCase; public class EqualTest_SQLSelectQueryBlock extends TestCase { public void test_eq() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java index b4f92dc93..03832b2ce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_aggreate extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java index 85126d437..63e716adf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_aggreate_over.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_aggreate_over extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java index ea530e9c7..f1c3b03d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_any.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_any extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java index 4a568741d..1951f0482 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_between.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_between extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java index be05bf6e0..3b50aba02 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binary.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLBinaryExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_binary extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java index 4fb32b0be..f868a4902 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_binaryOp.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_binaryOp extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java index 07ae02b84..94d82e713 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_boolean.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_boolean extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java index 36f00e059..c75305d31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_case.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_case extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java index ae054354e..5a73aed9d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cast.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.ast.expr.SQLCastExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_cast extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java index dae669ab0..10500b6b5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_cursor.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleCursorExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_cursor extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java index 4b0910457..26d31e5cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_dbLink.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.ast.expr.SQLDbLinkExpr; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; import junit.framework.TestCase; -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import static org.junit.Assert.assertNotEquals; public class EqualTest_dbLink extends TestCase { public void test_eq() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java index 9cf8b39a5..ac832fa14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_exists.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLExistsExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_exists extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java index 9baae150c..c24d9b36a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_mysql.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.ast.expr.SQLExtractExpr; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import junit.framework.TestCase; -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; +import static org.junit.Assert.assertNotEquals; public class EqualTest_extract_mysql extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java index ba2bf758b..ab358d16f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_extract_oracle.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; import junit.framework.TestCase; -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import static org.junit.Assert.assertNotEquals; public class EqualTest_extract_oracle extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java index c25fff991..271ee9f44 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_groupSet.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr; +import junit.framework.TestCase; public class EqualTest_groupSet extends TestCase { public void test_eq() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java index f2a3f0e24..908292e9a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inList.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLInListExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_inList extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java index 3fbf1b8bb..85100b0e6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLInSubQueryExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_inquery extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java index 99e378f90..54c33cc47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_mysql.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLInSubQueryExpr; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_inquery_mysql extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java index 0d144d1c7..bfb6312a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_inquery_oracle.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLInSubQueryExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_inquery_oracle extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java index c81ff6123..76ecbdcfb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_interval_mysql.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_interval_mysql extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java index 6ffc3198e..2f223f258 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLNotExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_not extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java index 66e24a32e..f04510b62 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_not_2.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLNotExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; public class EqualTest_not_2 extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java index d75d2e06a..b229dbda3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_number.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_number extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java index af5798a86..dab5ead9e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_orderBy.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.parser.SQLExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_orderBy extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java index 6d4e28896..1469ebacd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_query.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_query extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java index f5ad0a90d..6da2ace57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_select.java @@ -1,17 +1,13 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.List; -import static org.junit.Assert.*; - public class EqualTest_select extends TestCase { public void test_eq_select() throws Exception { List stmtsA = SQLUtils.parseStatements("select * from a", JdbcConstants.ODPS); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java index 6cdee5c6c..ef0ad8999 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_some.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLSomeExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_some extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java index 3291c102e..e194b8af6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_unary extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java index e2c2a3284..c16d941a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/EqualTest_unary_mysql.java @@ -1,11 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; +import junit.framework.TestCase; + +import static org.junit.Assert.assertNotEquals; public class EqualTest_unary_mysql extends TestCase { public void test_exits() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/ExportParameterShardingTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/ExportParameterShardingTest.java index 15eb3c28d..a162335f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/ExportParameterShardingTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/ExportParameterShardingTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.util.JdbcConstants; import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; -import java.util.ArrayList; import java.util.List; /** diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/FirstCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/FirstCommentTest.java index c033883e2..e70b30080 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/FirstCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/FirstCommentTest.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.sql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer; import com.alibaba.druid.sql.parser.Lexer; - import junit.framework.TestCase; +import java.util.List; + public class FirstCommentTest extends TestCase { public void test_first_commnet() throws Exception { String sql = "/*test sql*/select age from user where name = 'xx';"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/GetParentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/GetParentTest.java index 173877980..4580366e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/GetParentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/GetParentTest.java @@ -2,9 +2,11 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import static org.junit.Assert.*; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + public class GetParentTest { @Test public void test() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java index 8c873a2e3..916db1467 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/GroupingSetsTest.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class GroupingSetsTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java index 27f0a0991..53cad5576 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_0.java @@ -5,20 +5,17 @@ import junit.framework.TestCase; public class HashTest_0 extends TestCase { public void test_issue() throws Exception { - assertEquals(new SQLIdentifierExpr("a").nameHashCode64() - , new SQLIdentifierExpr("A").nameHashCode64()); - ; + assertEquals(new SQLIdentifierExpr("a").nameHashCode64(), + new SQLIdentifierExpr("A").nameHashCode64()); } public void test_issue_1() throws Exception { - assertEquals(new SQLIdentifierExpr("a").nameHashCode64() - , new SQLIdentifierExpr("`A`").nameHashCode64()); - ; + assertEquals(new SQLIdentifierExpr("a").nameHashCode64(), + new SQLIdentifierExpr("`A`").nameHashCode64()); } public void test_issue_2() throws Exception { - assertEquals(new SQLIdentifierExpr("\"a\"").nameHashCode64() - , new SQLIdentifierExpr("`A`").nameHashCode64()); - ; + assertEquals(new SQLIdentifierExpr("\"a\"").nameHashCode64(), + new SQLIdentifierExpr("`A`").nameHashCode64()); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java index 4d15075e0..2ffebe761 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/HashTest_1_propertyExpr.java @@ -7,33 +7,28 @@ import junit.framework.TestCase; 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 { @@ -65,7 +60,6 @@ public class HashTest_1_propertyExpr extends TestCase { column.setName("f1"); assertEquals(FnvHash.hashCode64("t2.f1"), column.hashCode64()); - } //ESCROW.HT_TASK_TRADE_HISTORY_NEW diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java index 4bff982b8..e1ad90d4e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java @@ -16,12 +16,9 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class MybatisTest extends TestCase { private String sql = "select * from t where id = #{id}"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java index 46f720a5e..5f72f10ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java @@ -16,11 +16,9 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class MybatisTest2 extends TestCase { private String sql = "select * from t where id = ${id}"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java index 2d8b212e8..d553a4107 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java @@ -1,23 +1,21 @@ package com.alibaba.druid.bvt.sql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import junit.framework.TestCase; + +import java.util.List; 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 " + // + 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);"; SQLStatementParser parser = new SQLStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java index c5f32aeaf..9a0a47e54 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java @@ -6,34 +6,33 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static 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); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_mysql_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.MYSQL); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_mysql_2() throws Exception { String sql = "select id, name from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.MYSQL); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_mysql_3() throws Exception { String sql = "select distinct id from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.MYSQL); - assertEquals("SELECT COUNT(DISTINCT id)\n" + // + assertEquals("SELECT COUNT(DISTINCT id)\n" + "FROM t", result); } @@ -85,5 +84,4 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { "\tGROUP BY product_id\n" + ") ALIAS_COUNT", countSql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java index 17c4b5e39..79a9aa0a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java @@ -1,40 +1,37 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; 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); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_oracle_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.ORACLE); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_oracle_2() throws Exception { String sql = "select id, name from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.ORACLE); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java index 7970b10c0..fd711788a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_PG_0.java @@ -1,31 +1,28 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; 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); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } public void test_pg_1() throws Exception { String sql = "select id, name from t"; String result = PagerUtils.count(sql, JdbcConstants.POSTGRESQL); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "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); - assertEquals("SELECT COUNT(*)\n" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } @@ -66,5 +63,4 @@ public class PagerUtilsTest_Count_PG_0 extends TestCase { "\tFROM t2\n" + ") ALIAS_COUNT", result); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java index 30fb56fe6..ff4706254 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_SQLServer_0.java @@ -1,31 +1,28 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; - -import static org.junit.Assert.*; +import junit.framework.TestCase; 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" + // + assertEquals("SELECT COUNT(*)\n" + "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" + // + assertEquals("SELECT COUNT(*)\n" + "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" + // + assertEquals("SELECT COUNT(*)\n" + "FROM t", result); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java index dcaae8543..734a3f261 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_SQLServer_1 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java index 66e4a57e6..a7774eae4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_2.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_SQLServer_2 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java index 59388880c..9150dbe69 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_3.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; 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); - assertEquals("SELECT TOP 10 *" // - + "\nFROM t1" // + assertEquals("SELECT TOP 10 *" + + "\nFROM t1" + "\nWHERE id > 1", result); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java index 4a0d37071..8e50a5e69 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_4.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_SQLServer_4 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java index 24bdad446..7f61fd64a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_5.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_SQLServer_5 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java index 7b2111859..91fb3a341 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_SQLServer_6.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class PagerUtilsTest_Limit_SQLServer_6 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java index 6a64d5f1d..c99bb45e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_0.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; 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); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nFETCH FIRST 10 ROWS ONLY", result); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java index e84294cc0..f194cf2ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_db2_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_db2_1 extends TestCase { public void test_db2_union() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java index 2e908e3b9..b7c7b748c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_h2_0.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.PagerUtils; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class PagerUtilsTest_Limit_h2_0 extends TestCase { public void test_db2_union() throws Exception { @@ -15,4 +13,4 @@ public class PagerUtilsTest_Limit_h2_0 extends TestCase { "FROM test\n" + "LIMIT 10", result); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java index 106659593..b937792fd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_hive_0.java @@ -2,9 +2,7 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.PagerUtils; -import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class PagerUtilsTest_Limit_hive_0 extends TestCase { public void test_hive_0() throws Exception { @@ -22,4 +20,4 @@ public class PagerUtilsTest_Limit_hive_0 extends TestCase { "FROM test\n" + "LIMIT 10", result); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java index 265f4850d..b315315ec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_0.java @@ -4,39 +4,37 @@ import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static 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); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nLIMIT 10", result); } public void test_mysql_1() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.MYSQL, 10, 10); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nLIMIT 10, 10", result); } public void test_mysql_2() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.MYSQL, 20, 10); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nLIMIT 20, 10", result); } public void test_mysql_3() throws Exception { String sql = "select id, name, salary from t order by id, name"; String result = PagerUtils.limit(sql, JdbcConstants.MYSQL, 20, 10); - assertEquals("SELECT id, name, salary" + // - "\nFROM t" + // - "\nORDER BY id, name" + // + assertEquals("SELECT id, name, salary" + + "\nFROM t" + + "\nORDER BY id, name" + "\nLIMIT 20, 10", result); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java index 1f96011d1..c3f14a80d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_mysql_question_placeholder.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -53,5 +52,4 @@ public class PagerUtilsTest_Limit_mysql_question_placeholder extends TestCase { options.setUppCase(false); assertEquals(expected, SQLUtils.toSQLString(select, JdbcConstants.MYSQL, options)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java index b7d347a09..6d50225ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_oracle_0.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class PagerUtilsTest_Limit_oracle_0 extends TestCase { public void test_oracle_oderby_0() throws Exception { @@ -23,8 +20,8 @@ public class PagerUtilsTest_Limit_oracle_0 extends TestCase { public void test_oracle_0() throws Exception { String sql = "select * from t"; String result = PagerUtils.limit(sql, JdbcConstants.ORACLE, 0, 10); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE ROWNUM <= 10", result); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java index fcd5a9ad9..ea2f4e6f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Limit_presto_0.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.PagerUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; /** * 分页工具类的单元测试，presto SQL类型的 @@ -18,5 +17,4 @@ public class PagerUtilsTest_Limit_presto_0 extends TestCase { String sureResult = "SELECT *\n" + "FROM test\n" + " LIMIT 10"; assertEquals(sureResult, result); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java index 181cf64d4..46dcfe1cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit.java @@ -4,8 +4,6 @@ import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java index ef9ab0f3c..c747657be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_hasUnorderedLimit_oracle.java @@ -6,14 +6,14 @@ 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" + // - "\n\tFROM (SELECT id, name, salary" + // - "\n\t\tFROM t" + // - "\n\t\tORDER BY id, name" + // - "\n\t\t) XX" + // - "\n\tWHERE ROWNUM <= 30" + // - "\n\t) XXX" + // + String sql = "SELECT *" + + "\nFROM (SELECT XX.*, ROWNUM AS RN" + + "\n\tFROM (SELECT id, name, salary" + + "\n\t\tFROM t" + + "\n\t\tORDER BY id, name" + + "\n\t\t) XX" + + "\n\tWHERE ROWNUM <= 30" + + "\n\t) XXX" + "\nWHERE RN > 20"; assertFalse(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.ORACLE)); } @@ -24,8 +24,8 @@ public class PagerUtilsTest_hasUnorderedLimit_oracle extends TestCase { } public void test_true() throws Exception { - String sql = "SELECT *" + // - "\nFROM t" + // + String sql = "SELECT *" + + "\nFROM t" + "\nWHERE ROWNUM <= 10"; assertTrue(PagerUtils.hasUnorderedLimit(sql, JdbcConstants.ORACLE)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/ReplaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/ReplaceTest.java index 9d5c21200..b436377d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/ReplaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/ReplaceTest.java @@ -4,9 +4,9 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; -import static org.junit.Assert.*; import org.junit.Test; +import static org.junit.Assert.assertEquals; public class ReplaceTest { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java index 004f62e85..dfba03452 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLASTVisitorAdapterTest.java @@ -1,39 +1,10 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLOver; -import com.alibaba.druid.sql.ast.expr.SQLAllExpr; -import com.alibaba.druid.sql.ast.expr.SQLAnyExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLCurrentOfCursorExpr; -import com.alibaba.druid.sql.ast.expr.SQLDefaultExpr; -import com.alibaba.druid.sql.ast.expr.SQLInListExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.expr.SQLSomeExpr; -import com.alibaba.druid.sql.ast.statement.SQLNotNullConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLCallStatement; -import com.alibaba.druid.sql.ast.statement.SQLColumnCheck; -import com.alibaba.druid.sql.ast.statement.SQLCommentStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; -import com.alibaba.druid.sql.ast.statement.SQLDropTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLDropViewStatement; -import com.alibaba.druid.sql.ast.statement.SQLExprHint; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; -import com.alibaba.druid.sql.ast.statement.SQLReleaseSavePointStatement; -import com.alibaba.druid.sql.ast.statement.SQLSavePointStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; -import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; -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.visitor.SQLASTVisitorAdapter; +import junit.framework.TestCase; public class SQLASTVisitorAdapterTest extends TestCase { public void test_adapter() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java index c72827820..f1f26f284 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLCommentStatementTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql; -import static org.junit.Assert.*; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class SQLCommentStatementTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLDialectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLDialectTest.java index 532638681..f08165af9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLDialectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLDialectTest.java @@ -4,7 +4,9 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLDialect; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class SQLDialectTest { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java index b3ec731b4..cf3812e8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLJoinTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java index 4e2785752..a52287424 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLParseExceptionTest.java @@ -1,8 +1,7 @@ package com.alibaba.druid.bvt.sql; -import junit.framework.TestCase; - import com.alibaba.druid.sql.parser.SQLParseException; +import junit.framework.TestCase; @SuppressWarnings("deprecation") public class SQLParseExceptionTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLResourceTest.java index 6dff038a1..7ae91935b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLResourceTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class SQLResourceTest { - protected final static String DELIMITER_LONG = "------------------------------------------------------------------------------------------------------------------------"; - protected final static String DELIMITER_SHORT = "--------------------"; + protected static final String DELIMITER_LONG = "------------------------------------------------------------------------------------------------------------------------"; + protected static final String DELIMITER_SHORT = "--------------------"; protected final DbType dbType; @@ -115,12 +115,12 @@ public class SQLResourceTest { assertEquals(2, parts.length); String sql = parts[0].trim(); - String expected = parts[1].trim().replaceAll("\r\n","\n"); + String expected = parts[1].trim().replaceAll("\r\n", "\n"); System.out.println(); System.out.println(sql); System.out.println(); - System.out.println(DELIMITER_SHORT + " " + file.getName() + " [" + (i + 1) + "/" + tests.length + "] " + dbType); + System.out.println(DELIMITER_SHORT + " " + file.getName() + " [" + (i + 1) + "/" + tests.length + "] " + dbType); System.out.println(); SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java index 30b43218d..a52e82d04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SQLSelectQueryBlockTest.java @@ -3,9 +3,13 @@ package com.alibaba.druid.bvt.sql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -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.SQLExprTableSource; +import com.alibaba.druid.sql.ast.statement.SQLSelectItem; +import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/SchemaTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/SchemaTest.java index bafbaf159..845a81092 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/SchemaTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/SchemaTest.java @@ -6,9 +6,10 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.repository.SchemaRepository; -import static org.junit.Assert.*; import org.junit.Test; +import static org.junit.Assert.assertNotNull; + public class SchemaTest { @Test public void test_schema() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java b/core/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java index d13005fb5..ec1e0d43f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/TestNewSpout.java @@ -11,7 +11,6 @@ import java.util.Set; * Created by yunning on 16/7/10. */ public class TestNewSpout { - public static int indexOf_nsharp(byte[] bytes, int fromIndex) { int end = bytes.length - 2; for (int i = fromIndex; i < end; ++i) { @@ -133,6 +132,7 @@ public class TestNewSpout { long itemTime = MathUtil.str2Long(datas, currItemOffset + 6, nextItemOffset); System.out.println("TIME : " + itemTime); if (itemTime < 0 || itemTime > 2000000000000000L) { + // Handle invalid time value } sqlInfo.setTime(itemTime); @@ -156,6 +156,7 @@ public class TestNewSpout { if (dbLen > 0 && SqlUtil.filterDbs.indexOf(db) != -1) { // sqlInfo.setNotValiDB(true); } else { + // Handle the valid case } //table_name @@ -170,8 +171,9 @@ public class TestNewSpout { int totalLen = sql.length(); if (totalLen < 9 || totalLen >= 8000) { -// sqlInfo.setParseRes(0); + // sqlInfo.setParseRes(0); } else { + // Handle the valid case } //query_time @@ -193,6 +195,7 @@ public class TestNewSpout { nextItemOffset = offsets[7]; long itemRowsSent = MathUtil.str2Long(datas, currItemOffset + 12, nextItemOffset); if (itemRowsSent < 0 || itemRowsSent > 1000000000) { + // Handle invalid value } // sqlInfo.setRowsSent(itemRowsSent); @@ -201,6 +204,7 @@ public class TestNewSpout { nextItemOffset = offsets[8]; long itemRowsExam = MathUtil.str2Long(datas, currItemOffset + 16, nextItemOffset); if (itemRowsExam < 0 || itemRowsExam > 1000000000) { + // Handle invalid value } // sqlInfo.setRowsExamined(itemRowsExam); @@ -209,6 +213,7 @@ public class TestNewSpout { nextItemOffset = offsets[9]; long itemRowsAffected = MathUtil.str2Long(datas, currItemOffset + 16, nextItemOffset); if (itemRowsAffected < 0 || itemRowsAffected > 1000000000) { + // Handle invalid value } sqlInfo.setRowsAffected(itemRowsAffected); @@ -217,6 +222,7 @@ public class TestNewSpout { nextItemOffset = offsets[10]; long itemPageRead = MathUtil.str2Long(datas, currItemOffset + 20, nextItemOffset); if (itemPageRead < 0 || itemPageRead > 1000000000) { + // Handle invalid value } sqlInfo.setInnodbPagesRead(itemPageRead); @@ -225,6 +231,7 @@ public class TestNewSpout { nextItemOffset = offsets[11]; long itemPageIORead = MathUtil.str2Long(datas, currItemOffset + 23, nextItemOffset); if (itemPageIORead < 0 || itemPageIORead > 1000000000) { + // Handle invalid value } // sqlInfo.setInnodbPagesIoRead(itemPageIORead); // currItemOffset = nextItemOffset; @@ -286,7 +293,9 @@ public class TestNewSpout { long value = 0; for (int i = start; i < end; ++i) { byte ch = data[i]; - if (ch == '.') break; + if (ch == '.') { + break; + } int digit = data[i] - '0'; value = value * 10 + digit; } @@ -341,4 +350,4 @@ public class TestNewSpout { public static final String filterDbs = org.apache.commons.lang3.StringUtils.join(SqlUtil.filterDb, ","); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/athena/AthenaResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/athena/AthenaResourceTest.java index 460f87a57..97fb2d532 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/athena/AthenaResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/athena/AthenaResourceTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.bvt.sql.SQLResourceTest; import org.junit.Test; public class AthenaResourceTest extends SQLResourceTest { - public AthenaResourceTest() { super(DbType.athena); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryCommentTest.java index eb6871937..19f78325e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryCommentTest.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.bigquery; 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.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryDataTypeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryDataTypeTest.java index 6003a0f0a..d26b0e351 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryDataTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryDataTypeTest.java @@ -4,9 +4,10 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.SQLParserUtils; -import static org.junit.Assert.*; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class BigQueryDataTypeTest { @Test public void testDataType() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryNameTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryNameTest.java index 71c588963..1e86dabdb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryNameTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/bigquery/BigQueryNameTest.java @@ -3,12 +3,10 @@ package com.alibaba.druid.bvt.sql.bigquery; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.statement.SQLCreateViewStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; -import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.util.FnvHash; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java index 952164475..63a84cbc1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderDeleteTest.java @@ -1,25 +1,20 @@ package com.alibaba.druid.bvt.sql.builder; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.builder.SQLBuilderFactory; import com.alibaba.druid.sql.builder.SQLDeleteBuilder; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class BuilderDeleteTest extends TestCase { public void test_0() throws Exception { SQLDeleteBuilder builder = SQLBuilderFactory.createDeleteBuilder(JdbcConstants.MYSQL); - builder // - .from("mytable") // - .whereAnd("f1 > 0") // - ; + builder.from("mytable") + .whereAnd("f1 > 0"); String sql = builder.toString(); System.out.println(sql); - assertEquals("DELETE FROM mytable" // + assertEquals("DELETE FROM mytable" + "\nWHERE f1 > 0", sql); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java index 4cc000b8e..d1e510626 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderSelectTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql.builder; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.builder.SQLBuilderFactory; import com.alibaba.druid.sql.builder.SQLSelectBuilder; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class BuilderSelectTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java index d84c9166d..03f8a0b55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/builder/BuilderUpdateTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql.builder; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.builder.SQLBuilderFactory; import com.alibaba.druid.sql.builder.SQLUpdateBuilder; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class BuilderUpdateTest extends TestCase { public void test_0() throws Exception { @@ -19,8 +16,8 @@ public class BuilderUpdateTest extends TestCase { String sql = builder.toString(); System.out.println(sql); - assertEquals("UPDATE mytable" // - + "\nSET f1 = f1 + 1, f2 = ?" // + assertEquals("UPDATE mytable" + + "\nSET f1 = f1 + 1, f2 = ?" + "\nWHERE f1 > 0", sql); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java index 8ac6bf237..0a1bf6fdf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/canal/CanalSQLSchemaTest.java @@ -1,11 +1,11 @@ package com.alibaba.druid.bvt.sql.canal; -import static org.junit.Assert.*; -import org.junit.Test; - import com.alibaba.druid.sql.repository.SchemaObject; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.util.JdbcConstants; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; public class CanalSQLSchemaTest { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKCloneNpe.java b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKCloneNpe.java index f871fdada..51a45e9fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKCloneNpe.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKCloneNpe.java @@ -1,13 +1,13 @@ package com.alibaba.druid.bvt.sql.clickhouse; -import java.util.List; - 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.SQLCreateTableStatement; import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKResourceTest.java index 9bec1e063..124a46bdb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CKResourceTest.java @@ -28,5 +28,4 @@ public class CKResourceTest extends SQLResourceTest { public void clickhouse_parse() throws Exception { fileTest(0, 999, i -> "bvt/parser/clickhouse/" + i + ".txt"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_select_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_select_3.java index 5b777a8b0..cbba0ee8b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_select_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_select_3.java @@ -37,13 +37,13 @@ public class CK_select_3 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, DbType.clickhouse); - assertEquals("SELECT name, c\n"+ - "FROM test\n"+ + assertEquals("SELECT name, c\n" + + "FROM test\n" + "WHERE c NOT ILIKE 'a%'", output); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, DbType.clickhouse); - assertEquals("SELECT name, c\n"+ - "FROM test\n"+ + assertEquals("SELECT name, c\n" + + "FROM test\n" + "WHERE c NOT ILIKE ?", psql); } @@ -74,13 +74,13 @@ public class CK_select_3 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, DbType.clickhouse); - assertEquals("SELECT name, c\n"+ - "FROM test\n"+ + assertEquals("SELECT name, c\n" + + "FROM test\n" + "WHERE c ILIKE 'a%'", output); String psql = ParameterizedOutputVisitorUtils.parameterize(sql, DbType.clickhouse); - assertEquals("SELECT name, c\n"+ - "FROM test\n"+ + assertEquals("SELECT name, c\n" + + "FROM test\n" + "WHERE c ILIKE ?", psql); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_update_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_update_0.java index dbbe369d6..6907145d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_update_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/CK_update_0.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.clickhouse; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,15 +7,15 @@ import com.alibaba.druid.sql.dialect.clickhouse.parser.CKStatementParser; import com.alibaba.druid.sql.dialect.clickhouse.visitor.CKStatVisitor; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; - import junit.framework.TestCase; -public class CK_update_0 extends TestCase { +import java.util.List; +public class CK_update_0 extends TestCase { public void test_0() throws Exception { String sql = "alter table tb1 ON CLUSTER 'cluster' update A=1,B=1,C=2 where ID = 1;" + "alter table tb1 ON CLUSTER cluster update A=3,B=4,C=5 where ID = 2;"; - CKStatementParser parser=new CKStatementParser(sql); + CKStatementParser parser = new CKStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); System.out.println(statementList); @@ -51,11 +49,10 @@ public class CK_update_0 extends TestCase { assertEquals("ALTER TABLE tb1 ON CLUSTER ? UPDATE A = ?, B = ?, C = ? WHERE ID = ?;", psql); } - public void test_1() throws Exception { String sql = "alter table tb1 update A=1,B=1,C=2 where ID = 1;" + "alter table tb1 update A=3,B=4,C=5 where ID = 2;"; - CKStatementParser parser=new CKStatementParser(sql); + CKStatementParser parser = new CKStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); System.out.println(statementList); @@ -89,11 +86,10 @@ public class CK_update_0 extends TestCase { assertEquals("ALTER TABLE tb1 UPDATE A = ?, B = ?, C = ? WHERE ID = ?;", psql); } - public void test_3() throws Exception { String sql = "alter table tb1 ON CLUSTER cluster update A=1,B=1,C=2 IN PARTITION partition_id where ID = 1;" + "alter table tb1 ON CLUSTER cluster update A=3,B=4,C=5 IN PARTITION partition_id where ID = 2;"; - CKStatementParser parser=new CKStatementParser(sql); + CKStatementParser parser = new CKStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); assertEquals(2, statementList.size()); @@ -127,8 +123,8 @@ public class CK_update_0 extends TestCase { } public void test_4() throws Exception { - String sql="update tb1 set A=1,B=1,C=2 IN aaa where ID = 1;"; - MySqlStatementParser mp=new MySqlStatementParser(sql); + String sql = "update tb1 set A=1,B=1,C=2 IN aaa where ID = 1;"; + MySqlStatementParser mp = new MySqlStatementParser(sql); List statementList = mp.parseStatementList(); SQLStatement stmt = statementList.get(0); System.out.println(statementList); @@ -145,6 +141,5 @@ public class CK_update_0 extends TestCase { assertEquals("UPDATE tb1\n" + "SET A = ?, B = ?, C = ? IN (aaa)\n" + "WHERE ID = ?;", psql); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/issues/Issue5933.java b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/issues/Issue5933.java index 737430903..5a09a2269 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/issues/Issue5933.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/clickhouse/issues/Issue5933.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.clickhouse.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,9 +7,10 @@ import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -20,7 +19,6 @@ import static org.junit.Assert.assertEquals; * @see ARRAY JOIN Clause */ public class Issue5933 { - @Test public void test_parse_arrauy_join_0() { for (DbType dbType : new DbType[]{DbType.clickhouse}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java index 7cb8bfc09..73c58cf6b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DALParserTest.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.*; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class DALParserTest extends TestCase { public void testdesc() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java index c2267fa0e..cdfc97d6e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DDLParserTest.java @@ -18,14 +18,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; /** * @author YU Danping @@ -73,7 +70,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE `test`.`tb1`" + // + assertEquals("ALTER TABLE `test`.`tb1`" + "\n\tADD COLUMN `name` VARCHAR(45) NULL AFTER `fid`;", output); } @@ -83,7 +80,7 @@ public class DDLParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE `test`.`tb1`" + // + assertEquals("ALTER TABLE `test`.`tb1`" + "\n\tDROP COLUMN `name`;", output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java index 51a71d76d..f5f6a4153 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLCallParserTest.java @@ -18,14 +18,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; /** * @author YU Danping diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java index 762db8fb6..ba9256705 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLDeleteParserTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class DMLDeleteParserTest extends TestCase { public void testDelete_0() throws Exception { @@ -42,7 +39,7 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE FROM id1.id" + // + assertEquals("DELETE FROM id1.id" + "\nUSING t1", output); } @@ -64,8 +61,8 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE FROM id1.id\n" + // - "WHERE col1 = 'adf'\n" + // + assertEquals("DELETE FROM id1.id\n" + + "WHERE col1 = 'adf'\n" + "LIMIT 1, ?", output); } @@ -75,9 +72,9 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE FROM id\n" + // - "WHERE col1 = 'adf'\n" + // - "ORDER BY d\n" + // + assertEquals("DELETE FROM id\n" + + "WHERE col1 = 'adf'\n" + + "ORDER BY d\n" + "LIMIT ? OFFSET 2", output); } @@ -87,9 +84,9 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE id.*\n" + // - "FROM t1, t2\n" + // - "WHERE col1 = 'adf'\n" + // + assertEquals("DELETE id.*\n" + + "FROM t1, t2\n" + + "WHERE col1 = 'adf'\n" + "\tAND col2 = 1", output); } @@ -99,7 +96,7 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE id, id.t\n" + // + assertEquals("DELETE id, id.t\n" + "FROM t1", output); } @@ -109,9 +106,9 @@ public class DMLDeleteParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("DELETE FROM t1\n" + // - "WHERE t1.id1 = 'abc'\n" + // - "ORDER BY a\n" + // + assertEquals("DELETE FROM t1\n" + + "WHERE t1.id1 = 'abc'\n" + + "ORDER BY a\n" + "LIMIT 5", output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java index 8893e28cf..4b4f76891 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.text.SimpleDateFormat; import java.util.Date; @@ -32,7 +31,7 @@ public class DMLInsertParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT HIGH_PRIORITY INTO test.t1 (t1.id1, id2)\n" + // + assertEquals("INSERT HIGH_PRIORITY INTO test.t1 (t1.id1, id2)\n" + "VALUES (?, '123')", output); } @@ -42,7 +41,7 @@ public class DMLInsertParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT IGNORE INTO test.t1 (t1.id1)\nVALUES (?)" + // + assertEquals("INSERT IGNORE INTO test.t1 (t1.id1)\nVALUES (?)" + "\nON DUPLICATE KEY UPDATE ex.col1 = ?, col2 = 12", output); } @@ -61,8 +60,8 @@ public class DMLInsertParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT LOW_PRIORITY INTO t1\nVALUES (12e-2, 1, 2)," + // - "\n\t(?)," + // + assertEquals("INSERT LOW_PRIORITY INTO t1\nVALUES (12e-2, 1, 2)," + + "\n\t(?)," + "\n\t(DEFAULT)", output); } @@ -94,7 +93,7 @@ public class DMLInsertParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT LOW_PRIORITY INTO t1 (t1.col1)\nVALUES (123)," + // + assertEquals("INSERT LOW_PRIORITY INTO t1 (t1.col1)\nVALUES (123)," + "\n\t('12''34')", output); } @@ -104,7 +103,7 @@ public class DMLInsertParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT LOW_PRIORITY INTO t1 (col1, t1.col2)\nSELECT id\nFROM t3" + // + assertEquals("INSERT LOW_PRIORITY INTO t1 (col1, t1.col2)\nSELECT id\nFROM t3" + "\nON DUPLICATE KEY UPDATE ex.col1 = ?", output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java index 67d81a0f8..d70f0a05b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLInsertParserTest_Special.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class DMLInsertParserTest_Special extends TestCase { public void testInsert_7() throws Exception { @@ -31,7 +28,7 @@ public class DMLInsertParserTest_Special extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("INSERT LOW_PRIORITY INTO t1 (col1, t1.col2)\nVALUES (123, '123''4')" + // + assertEquals("INSERT LOW_PRIORITY INTO t1 (col1, t1.col2)\nVALUES (123, '123''4')" + "\nON DUPLICATE KEY UPDATE ex.col1 = ?", output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java index 2a90d2faa..3c065dbf1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLReplaceParserTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class DMLReplaceParserTest extends TestCase { public void testReplace_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java index c080dd149..2d99e69d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class DMLSelectParserTest extends TestCase { public void test_union_0() throws Exception { @@ -82,9 +80,9 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT t1.id, t2.*\n" + // - "FROM t1, test.t2\n" + // - "WHERE test.t1.id = 1\n" + // + assertEquals("SELECT t1.id, t2.*\n" + + "FROM t1, test.t2\n" + + "WHERE test.t1.id = 1\n" + "\tAND t1.id = test.t2.id", output); } @@ -94,11 +92,11 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - 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" + // + 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); } @@ -108,8 +106,8 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT ALL tb1.id, tb2.id\n" + // - "FROM tb1, tb2\n" + // + assertEquals("SELECT ALL tb1.id, tb2.id\n" + + "FROM tb1, tb2\n" + "WHERE tb1.id2 = tb2.id2", output); } @@ -273,11 +271,11 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - 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" + // + 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); } @@ -287,11 +285,11 @@ public class DMLSelectParserTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - 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" + // + 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); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java index 840c4d468..0f9247fe6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class DMLUpdateParserTest extends TestCase { public void test_update_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java index 46de91113..351334cdc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/HintsTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class HintsTest extends TestCase { public void test_hints_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java index b198730c4..ab8994ee4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java @@ -18,11 +18,9 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.expr.SQLHexExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; +import junit.framework.TestCase; /** * @author QIU Shuo diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java index 9c357746c..dea90700b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class MTSParserTest extends TestCase { public void test_mts_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/databricks/DatabricksResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/databricks/DatabricksResourceTest.java index 5edd4123b..f2e849e1b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/databricks/DatabricksResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/databricks/DatabricksResourceTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.bvt.sql.SQLResourceTest; import org.junit.Test; public class DatabricksResourceTest extends SQLResourceTest { - public DatabricksResourceTest() { super(DbType.databricks); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java index ba607bb01..7da31c0e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_1_setNotNull.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class DB2AlterTableTest_1_setNotNull extends TestCase { public void test_alter_constraint() throws Exception { @@ -42,5 +41,4 @@ public class DB2AlterTableTest_1_setNotNull extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java index e1d4a8d5a..7bf07eb2c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_2.java @@ -17,7 +17,6 @@ package com.alibaba.druid.bvt.sql.db2; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; @@ -44,5 +43,4 @@ public class DB2AlterTableTest_2 extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java index d7f5be72f..7c2014402 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2AlterTableTest_drop_pk.java @@ -17,12 +17,9 @@ package com.alibaba.druid.bvt.sql.db2; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class DB2AlterTableTest_drop_pk extends TestCase { public void test_alter_constraint() throws Exception { @@ -44,5 +41,4 @@ public class DB2AlterTableTest_drop_pk extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java index c440149e9..6391adb85 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_01.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java index 281936c94..c7edfff95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_02.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java index e1eb37466..b4020da81 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_03.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java index 288263775..6f44e7eed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_04.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java index 6cdd9b924..98c15d6d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2CreateTableTest_05.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java index 36f47f41b..ad6777489 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2DropSequenceTest_0.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2DropSequenceTest_0 extends DB2Test { public void test_0() throws Exception { String sql = "drop sequence sales1_seq"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java index 29ce4d51c..6aef0fbee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_0.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2InsertTest_0 extends DB2Test { public void test_0() throws Exception { String sql = "insert into t (id,name) values (?,?), (?,?), (?,?)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java index c9d22e5bf..02a43f63f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2InsertTest_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java index 8597fcb57..1da8e937f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java index 2a5f08054..018167b2c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest.java @@ -28,7 +28,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import static org.junit.Assert.*; public class DB2ResourceTest extends OracleTest { public void test_0() throws Exception { @@ -86,5 +85,4 @@ public class DB2ResourceTest extends OracleTest { } } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest2.java index a37092101..2f370e3da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2ResourceTest2.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.db2; -import org.junit.Test; - import com.alibaba.druid.DbType; import com.alibaba.druid.bvt.sql.SQLResourceTest; +import org.junit.Test; public class DB2ResourceTest2 extends SQLResourceTest { - - public DB2ResourceTest2(){ + public DB2ResourceTest2() { super(DbType.db2); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java index d904c02f1..becf799f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_0.java @@ -15,12 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -29,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_0 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT * FROM DSN81010.EMP;"; @@ -59,7 +55,7 @@ public class DB2SelectTest_0 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM DSN81010.EMP;", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java index 527231cbd..c7bf03976 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_1.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_1 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT * FROM DSN81010.EMP FETCH FIRST 5 ROWS ONLY;"; @@ -57,7 +55,7 @@ public class DB2SelectTest_1 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM DSN81010.EMP" + "\nFETCH FIRST 5 ROWS ONLY;", // output); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java index 0d0f4da51..7816bb81f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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 (" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java index 5af8b20d8..74f70ea89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_11.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java index 2f2ecf2d2..b77d5b4e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java index 3e33da054..84be1ca51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_13.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,11 +24,13 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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')" // + + " WHERE WORKDEPT IN ('D11','D21')" + " FOR UPDATE;"; DB2StatementParser parser = new DB2StatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java index c252b69ca..f0e318fad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_14.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_14 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT (NEXTVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java index be21fb124..09697e744 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_15.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_15 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT (PREVVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java index 24d02dd56..2c9fb4f97 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_16.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_16 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT (CURRVAL FOR TEST_SEQ) FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java index 2b05eb5f7..abb631f91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_17.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_17 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT (NEXT VALUE FOR EMPNO) FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java index 12421ec54..f56e5dfda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_18.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_18 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT (PREVIOUS VALUE FOR EMPNO) FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java index 8ee83624c..b45929bd6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_19.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_19 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT EMPNO.CURRVAL FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java index 1eec7b4ac..cba2e6c16 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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"; @@ -58,7 +56,7 @@ public class DB2SelectTest_2 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); - assertEquals("SELECT CTRYNUM, FMS_INSTANCE_CD" // + assertEquals("SELECT CTRYNUM, FMS_INSTANCE_CD" + "\nFROM DBEFMSDR.FMSA_O_WW_CTRY_AG"// + "\nWHERE ACCT_YR = ?"// + "\nWITH UR", // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java index c5672818e..74e5d1b38 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_20.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_20 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT EMPNO.PREVVAL FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java index efb4a532e..28558c4e6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_21.java @@ -15,19 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_21 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT EMPNO.nextval FROM SYSIBM.SYSDUMMY1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java index 43a2dd8f5..74082b1f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_22.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_22 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT ID,IDENTITY,BUSICODE" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java index 3d996a5b5..b7a817fed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_23.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java index 20eb53eeb..3ed1685f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_24.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java index 9a9ebb78f..a4243d272 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_25_concat.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java index 978ea526c..e2ea98809 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_26.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java index 7d1919b71..19c46ede1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_27_interval.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java index e35f2d84a..abfa8b301 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_28.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java index 27378dc48..324385515 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_29.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java index c3ab297ab..35bc468f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_3 extends DB2Test { public void test_0() throws Exception { String sql = "select * from t for read only"; @@ -58,7 +56,7 @@ public class DB2SelectTest_3 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM t"// + "\nFOR READ ONLY", // output); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_35_lockRequest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_35_lockRequest.java index bf5100e66..441dc010a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_35_lockRequest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_35_lockRequest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java index dbdab27f6..92a45be17 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_4.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,6 +24,8 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_4 extends DB2Test { public void test_0() throws Exception { String sql = "select * from t OPTIMIZE FOR 10 ROWS"; @@ -58,7 +56,7 @@ public class DB2SelectTest_4 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); String output = SQLUtils.toSQLString(stmt, JdbcConstants.DB2); - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM t"// + "\nOPTIMIZE FOR 10", // output); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java index 5cdcfa565..5761254b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_5.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -28,22 +24,24 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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 )" // - + " FROM" // - + " ORDER_HEADER OH," // - + " ORDER_ITEM OI," // - + " ORDER_PAYMENT_PERFERENCE OPP," // - + " ORDER_SHIPMENT_PERFERENCE OSP" // - + " WHERE" // - + " OH.ORDER_ID = OI.ORDER_ID" // - + " AND OH.ORDER_ID = OPP.ORDER_ID" // - + " AND OH.ORDER_ID = OSP.ORDER_ID" // - + " " // + String sql = "SELECT * FROM (SELECT TEMP_TAB.*,ROWNUMBER() OVER() AS IDX FROM (SELECT" + + " DISTINCT ( OH.ORDER_ID )" + + " FROM" + + " ORDER_HEADER OH," + + " ORDER_ITEM OI," + + " ORDER_PAYMENT_PERFERENCE OPP," + + " ORDER_SHIPMENT_PERFERENCE OSP" + + " WHERE" + + " OH.ORDER_ID = OI.ORDER_ID" + + " AND OH.ORDER_ID = OPP.ORDER_ID" + + " AND OH.ORDER_ID = OSP.ORDER_ID" + + " " + " AND OH.ORDER_ID = ? ) AS TEMP_TAB ) AS TEMP_TAB_WITH_IDX "// - + " WHERE TEMP_TAB_WITH_IDX.IDX > 0 AND TEMP_TAB_WITH_IDX.IDX <= 20" // + + " WHERE TEMP_TAB_WITH_IDX.IDX > 0 AND TEMP_TAB_WITH_IDX.IDX <= 20" + ""; DB2StatementParser parser = new DB2StatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java index d3cc00017..1efb28055 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_6.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_6 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT all id FROM DSN81010.EMP;"; @@ -56,10 +54,10 @@ public class DB2SelectTest_6 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); - assertEquals("SELECT ALL id" // + assertEquals("SELECT ALL id" + "\nFROM DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - assertEquals("select all id" // + assertEquals("select all id" + "\nfrom DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java index 70d32ea88..4a89723dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_7.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_7 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT distinct id FROM DSN81010.EMP;"; @@ -56,10 +54,10 @@ public class DB2SelectTest_7 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); - assertEquals("SELECT DISTINCT id" // + assertEquals("SELECT DISTINCT id" + "\nFROM DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - assertEquals("select distinct id" // + assertEquals("select distinct id" + "\nfrom DSN81010.EMP;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java index 466035d67..869ce5a75 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_8.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2SelectTest_8 extends DB2Test { public void test_0() throws Exception { String sql = "SELECT unique id FROM DSN81010.EMP where id = 1;"; @@ -56,11 +54,11 @@ public class DB2SelectTest_8 extends DB2Test { // assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); // assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); - assertEquals("SELECT UNIQUE id" // + assertEquals("SELECT UNIQUE id" + "\nFROM DSN81010.EMP" + "\nWHERE id = 1;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); - assertEquals("select unique id" // + assertEquals("select unique id" + "\nfrom DSN81010.EMP" + "\nwhere id = 1;", // SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java index 4f04d45b5..a147c1e3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_9.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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_" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java index bdb580c52..ce3cc54c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_hierarchical_1.java @@ -32,7 +32,7 @@ public class DB2SelectTest_hierarchical_1 extends MysqlTest { " FROM employees\n" + " START WITH employee_id = 100\n" + " CONNECT BY PRIOR employee_id = manager_id\n" + - " ORDER SIBLINGS BY last_name;"; // + " ORDER SIBLINGS BY last_name;"; List stmtList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = stmtList.get(0); @@ -69,6 +69,5 @@ public class DB2SelectTest_hierarchical_1 extends MysqlTest { assertEquals(2, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java index 82fe0b2c9..ca77d3b5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_0.java @@ -20,9 +20,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java index d6b8c6733..ec5afb65a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_1.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java index aedccd831..8b7fdf469 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SetTest_2_schema.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java index d2138cea4..693d5967b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2TruncateTest extends DB2Test { public void test_0() throws Exception { String sql = "TRUNCATE TASK_AICSFSM_QUERY_BATCH_TEMP IMMEDIATE"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java index 6bd77e811..1559f1812 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2TruncateTest2 extends DB2Test { public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY IGNORE DELETE TRIGGERS DROP STORAGE IMMEDIATE"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java index 08e0182db..251fadfdc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2TruncateTest3 extends DB2Test { public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE RESTRICT WHEN DELETE TRIGGERS"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java index 61914b65a..6fc33f711 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest4.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2TruncateTest4 extends DB2Test { public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS IMMEDIATE"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java index 44287b3ad..deea79af9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2TruncateTest5.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class DB2TruncateTest5 extends DB2Test { public void test_0() throws Exception { String sql = "TRUNCATE TABLE INVENTORY REUSE STORAGE IGNORE DELETE TRIGGERS CONTINUE IDENTITY IMMEDIATE"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java index f1f78efa0..d327f2080 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2Values_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java index d949c8121..95259e071 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/derby/DerbySelectTest.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.derby; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; public class DerbySelectTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java index 8a71fa9ce..3c3834909 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalAndOrTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalAndOrTest extends TestCase { public void test_and() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java index 9665b380b..19ca6dbd9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalBetweenTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalBetweenTest extends TestCase { public void test_between() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java index 000b05750..8e72002fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalCaseThen extends TestCase { public void test_eval_then() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java index 84b8f6424..fa26e0b50 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalConcatTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalConcatTest extends TestCase { public void test_concat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java index cf080b176..d336ac8e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalInTest extends TestCase { public void test_in() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java index ff4095f6b..e21afb0e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalIsNullTest extends TestCase { public void test_null() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java index e14878a37..66f19d599 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalLikeTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalLikeTest extends TestCase { public void test_like() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java index aeda6e3b9..193bb6dda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAbsTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.eval; -import java.math.BigDecimal; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.math.BigDecimal; public class EvalMethodAbsTest extends TestCase { public void test_abs_int() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java index 9320a52b5..6990bbda6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAcosTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodAcosTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java index 625f8eb4c..bfe822227 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodAsciiTest extends TestCase { public void test_ascii() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java index c14eb92bf..98b372eab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsinTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodAsinTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java index a717f921d..ef4d9bec1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtan2Test.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodAtan2Test extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java index b0bc0e14d..d7771b9e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAtanTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodAtanTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java index 2c919fb34..8eefc57c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBinTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodBinTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java index 00d8987ce..15d599d7c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodBitLengthTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java index 03cb289b7..443fa4ae3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCeilTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodCeilTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java index ab477b4b3..f07859c09 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodCosTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodCosTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java index 7cb512434..5a47fb778 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodInstrTest extends TestCase { public void test_length() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java index b0c176be0..0f5bf61b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodLeftTest extends TestCase { public void test_ascii() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java index 12f890585..d823868a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodLengthTest extends TestCase { public void test_length() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java index 971b666ae..583459771 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLog10Test.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodLog10Test extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java index a35e290c2..d26252cf4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLogTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodLogTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java index 5810334c0..0265d342f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodModTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java index a78880b8c..878f0b191 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java @@ -1,12 +1,10 @@ package com.alibaba.druid.bvt.sql.eval; -import java.util.Date; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.Date; public class EvalMethodNowTest extends TestCase { public void test_now() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java index 73c092a44..64f0270d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodPITest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java index 47f345f23..2b50340b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPowerTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodPowerTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java index c0b72aed5..1010f1c7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRandom.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodRandom extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java index 387de8479..f7c4ded2e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodReverseTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java index e923dcb78..3bd59fc48 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodRightTest extends TestCase { public void test_ascii() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java index 9204a0243..1abde3df0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSinTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodSinTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java index 7db5522bd..c92d38cc1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodSqrtTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodSqrtTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java index 0397828fc..2258211e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTanTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTanTest extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java index 53d500f29..57f7854f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_Char extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java index 9a8940745..081d8f997 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Char_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_Char_1 extends TestCase { public void test_reverse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java index d81235726..a5cac59d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_Elt extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java index 58e6cd35d..3e4029cfe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_Elt_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_Elt_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java index bf3f589b8..fa74fec67 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_insert extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java index 915b64268..37bdfa9d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_insert_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java index a3ea6fc67..f315cebe2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_insert_2.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_insert_2 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java index 6a804402a..67eba4e8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_instr extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java index 206f393f8..344f63f16 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_instr_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_instr_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java index fdb294d67..4ee929011 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lcase.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_lcase extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java index b3f4824c4..c1d949a88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_left.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_left extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java index 9662ea5ed..6ab81a9be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_len.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_len extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java index 8a0e77867..93c4a83f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_locate extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java index 084320b4c..53f4dd2ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_locate_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java index 6e237b101..38e29c45c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_locate_2.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_locate_2 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java index 08bc1fa89..388ae2e70 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lower.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_lower extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java index 26dddb2a3..2abd7b6a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_lpad extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java index 11bbcac4d..f16c5b0f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_lpad_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_lpad_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java index bf3b13074..4df5c2d1b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_ltrim.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_ltrim extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java index 80daa617f..0034a808c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_mid.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_mid extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java index cd974a060..626cc0bca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_substring extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java index 4a56545c9..1084e71b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_1.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_substring_1 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java index 323f09d2f..b6e2812b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_2.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_substring_2 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java index a27bf7c84..f8805a4b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_3.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_substring_3 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java index cf065f869..12e0ab8c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTest_substring_4.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTest_substring_4 extends TestCase { public void test_method() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java index 5db091f36..23a012fcc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalMethodTrimTest extends TestCase { public void test_trim() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java index 796531cff..9443a4aa1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalRlikeTest extends TestCase { public void test_rlike() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java index 92f283131..99a6e4386 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java @@ -1,13 +1,11 @@ package com.alibaba.druid.bvt.sql.eval; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; public class EvalSelectTest extends TestCase { public void test_select() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java index eb89de322..d37ec3607 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.bvt.sql.eval; -import java.math.BigDecimal; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.math.BigDecimal; public class EvalTest extends TestCase { public void testEval() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java index 7e0237f6a..f6c756fe9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalTest_add extends TestCase { public void test_byte() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java index 4c9c7d226..67cef98e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_long.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalTest_add_long extends TestCase { public void test_add() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java index 36c7baa62..9763a9e1a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_add_short.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalTest_add_short extends TestCase { public void test_byte() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java index 98d585e77..3285f46e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_div.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.sql.eval; -import java.math.BigDecimal; -import java.math.BigInteger; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.math.BigDecimal; +import java.math.BigInteger; public class EvalTest_div extends TestCase { public void test_long() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java index 9c0f9d140..de3c3ed47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.eval; +import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; -import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_gt extends TestCase { public void test_long() throws Exception { assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? > ?", (long) 1, (byte) 2)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java index b8c73fad8..c499089dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_gt_true.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.eval; +import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; -import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_gt_true extends TestCase { public void test_long() throws Exception { assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? > ?", (long) 10, (byte) 2)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java index fefa4b16e..0d0323101 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.eval; +import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; -import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_lt extends TestCase { public void test_long() throws Exception { assertEquals(true, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? < ?", (long) 1, (byte) 2)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt_false.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt_false.java index ed8323330..57e39d167 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt_false.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lt_false.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.eval; +import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; -import com.alibaba.druid.util.JdbcConstants; - public class EvalTest_lt_false extends TestCase { public void test_long() throws Exception { assertEquals(false, SQLEvalVisitorUtils.evalExpr(JdbcConstants.MYSQL, "? < ?", (long) 10, (byte) 2)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lteq.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lteq.java index dff592362..fa17ec4da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lteq.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_lteq.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.sql.eval; -import java.math.BigDecimal; -import java.math.BigInteger; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.math.BigDecimal; +import java.math.BigInteger; public class EvalTest_lteq extends TestCase { public void test_long() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_multi_short.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_multi_short.java index 94712224d..b7cd39919 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_multi_short.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest_multi_short.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class EvalTest_multi_short extends TestCase { public void test_byte() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/LikeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/LikeTest.java index 7e0dc20c9..1d449f827 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/LikeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/LikeTest.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; +import junit.framework.TestCase; public class LikeTest extends TestCase { public void test_any_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java index f7f6fb590..bd36b4c18 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryExpr; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.math.BigDecimal; import java.math.BigInteger; @@ -222,20 +221,16 @@ public class SQLEvalVisitorUtilsTest extends TestCase { System.out.println(sql + ": " + val); assertEquals("h", val); - sql = "RPAD('hi',5,'ab')"; val = SQLEvalVisitorUtils.evalExpr(DbType.mysql, sql); System.out.println(sql + ": " + val); assertEquals("hiaba", val); - sql = "RPAD('hi',7,'abc')"; val = SQLEvalVisitorUtils.evalExpr(DbType.mysql, sql); System.out.println(sql + ": " + val); assertEquals("hiabcab", val); - - } /** @@ -251,7 +246,6 @@ public class SQLEvalVisitorUtilsTest extends TestCase { val = SQLEvalVisitorUtils.evalExpr(DbType.mysql, sql); System.out.println(sql + ": " + val); assertEquals("ar", val); - } public void test_string_replace() throws Exception { String sql = "replace('abcb','b','B')"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java index 6d91c6447..0b090f364 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2ResourceTest.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.h2.visitor.H2SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.io.InputStream; import java.io.InputStreamReader; @@ -99,5 +98,4 @@ public class H2ResourceTest extends TestCase { assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java index 079539172..145bc59d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_AlterTableTest_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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_);"; // + "alter table ACT_GE_BYTEARRAY add constraint ACT_FK_BYTEARR_DEPL foreign key (DEPLOYMENT_ID_) references ACT_RE_DEPLOYMENT (ID_);"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.H2); SQLStatement stmt = statementList.get(0); @@ -59,6 +58,5 @@ public class H2_AlterTableTest_0 extends TestCase { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("ACT_GE_BYTEARRAY")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java index ff7c17efa..b7ef67ea5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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`) ) ; "; // + "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`) ) ; "; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.H2); SQLStatement stmt = statementList.get(0); @@ -71,6 +70,5 @@ public class H2_CreateTableTest_0 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("DTS_EXECUTION_COUNTER")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java index 8ae3f2573..f4dc77d52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_1.java @@ -19,11 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.util.JdbcConstants; -import java.util.List; - -import static org.junit.Assert.*; public class H2_CreateTableTest_1 extends OracleTest { public void test_0() throws Exception { @@ -33,7 +28,7 @@ public class H2_CreateTableTest_1 extends OracleTest { " title VARCHAR(50) NOT NULL, \n" + " author VARCHAR(20) NOT NULL, \n" + " submission_date DATE \n" + - ");"; // + ");"; SQLStatement stmt = SQLUtils.parseSingleStatement(sql, DbType.h2); assertEquals("CREATE TABLE tutorials_tbl (\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java index 47284ef94..27098c568 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTriggerTest_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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"; // + "create trigger employee_trigger after insert,update,delete on employee for each row call \"test.redisson.h2cluster.trigger.ClusterTrigger\"\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.H2); SQLStatement stmt = statementList.get(0); @@ -61,6 +60,5 @@ public class H2_CreateTriggerTest_0 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("employee")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java index b863c71f1..7b4b10ced 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Explain_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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"; // + "EXPLAIN SELECT * FROM TEST WHERE ID=1"; // System.out.println(sql); @@ -61,6 +60,5 @@ public class H2_Explain_0 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("TEST")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java index 1d4e2d297..4e489efd3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_InsertTest_0.java @@ -2,11 +2,12 @@ package com.alibaba.druid.bvt.sql.h2; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.h2.parser.H2StatementParser; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; +import static org.junit.Assert.assertEquals; + /** * @author machunxiao * @create 2018-08-02 @@ -19,5 +20,4 @@ public class H2_InsertTest_0 { List stmtList = parser.parseStatementList(); assertEquals(1, stmtList.size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java index 9bf7efbcb..657983da2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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"; // + "merge into person key(id) select * from person_test"; System.out.println(sql); @@ -62,6 +61,5 @@ public class H2_MergeTest_0 extends OracleTest { assertTrue(visitor.containsTable("person")); assertTrue(visitor.containsTable("person_test")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java index 4966a08b3..37e84bfb3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_MergeTest_1.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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);"; // + "MERGE INTO CUSTOMER KEY (ID) VALUES (8, 'Loki', 32, 'Hyderabad', 3000);"; // System.out.println(sql); @@ -59,6 +58,5 @@ public class H2_MergeTest_1 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("CUSTOMER")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java index 0749604c2..4c563f5d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_0_limit.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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;"; // + "SELECT * FROM CUSTOMER LIMIT 1000;"; // System.out.println(sql); @@ -60,6 +59,5 @@ public class H2_Select_0_limit extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("CUSTOMER")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java index 1800c0ed6..529cc6aa9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_for_update.java @@ -26,7 +26,7 @@ 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"; // + "SELECT * FROM QRTZ_LOCKS WHERE SCHED_NAME = 'adminQuartzScheduler' AND LOCK_NAME = ? FOR UPDATE"; // System.out.println(sql); @@ -63,6 +63,5 @@ public class H2_Select_1_for_update extends TestCase { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("QRTZ_LOCKS")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java index d509c4d00..a52f19693 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_Select_1_nulls_first.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class H2_Select_1_nulls_first extends OracleTest { String sql = // "SELECT * FROM (SELECT ID, COUNT(*) FROM TEST\n" + " GROUP BY ID UNION SELECT NULL, COUNT(*) FROM TEST)\n" + - " ORDER BY 1 NULLS LAST;"; // + " ORDER BY 1 NULLS LAST;"; // System.out.println(sql); @@ -69,6 +68,5 @@ public class H2_Select_1_nulls_first extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("TEST")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java index f5ca0575e..c243841a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateDatabase_0.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class HiveCreateDatabase_0 extends OracleTest { public void test_0() throws Exception { String sql = // - "CREATE DATABASE merge_data;"; // + "CREATE DATABASE merge_data;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -57,6 +56,5 @@ public class HiveCreateDatabase_0 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("merge_data.transactions")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java index b7a583c9d..faf2a101f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_0.java @@ -3,19 +3,17 @@ package com.alibaba.druid.bvt.sql.hive; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.hive.parser.HiveStatementParser; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; public class HiveCreateTableTest_0 extends TestCase { public void test_select() throws Exception { String sql = "CREATE EXTERNAL TABLE students (name VARCHAR(64), age INT, gpa DECIMAL(3, 2))\n" + - " CLUSTERED BY (age) INTO 2 BUCKETS STORED AS ORC;";// + " CLUSTERED BY (age) INTO 2 BUCKETS STORED AS ORC;"; assertEquals("CREATE EXTERNAL TABLE students (\n" + "\tname VARCHAR(64),\n" + "\tage INT,\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java index f432680a9..9e908faf8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ 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" + - "select * from sc002.test;"; // + "select * from sc002.test;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -62,6 +61,5 @@ public class HiveCreateTableTest_1 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("sc001.test")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java index 5c224418d..4986fed7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_10.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -33,7 +32,7 @@ public class HiveCreateTableTest_10 extends OracleTest { " AS\n" + "SELECT (key % 1024) new_key, concat(key, value) key_value_pair\n" + "FROM key_value_store\n" + - "SORT BY new_key, key_value_pair;\n"; // + "SORT BY new_key, key_value_pair;\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -70,6 +69,5 @@ public class HiveCreateTableTest_10 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("new_key_value_store")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java index 026ebdfec..4ef78495d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_11.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ public class HiveCreateTableTest_11 extends OracleTest { public void test_0() throws Exception { String sql = // "CREATE TABLE empty_key_value_store\n" + - "LIKE key_value_store;"; // + "LIKE key_value_store;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -60,6 +59,5 @@ public class HiveCreateTableTest_11 extends OracleTest { assertTrue(visitor.containsTable("empty_key_value_store")); assertTrue(visitor.containsTable("key_value_store")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java index 7082279e0..1809417eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_12.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class HiveCreateTableTest_12 extends OracleTest { " FIELDS TERMINATED BY '\\001'\n" + " COLLECTION ITEMS TERMINATED BY '\\002'\n" + " MAP KEYS TERMINATED BY '\\003'\n" + - " STORED AS SEQUENCEFILE;"; // + " STORED AS SEQUENCEFILE;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -86,6 +85,5 @@ public class HiveCreateTableTest_12 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("page_view")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java index 3b4bb8ba1..dd547e8bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_13_skew.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ 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" + - " SKEWED BY (key) ON (1,5,6) STORED AS DIRECTORIES;"; // + " SKEWED BY (key) ON (1,5,6) STORED AS DIRECTORIES;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -63,6 +62,5 @@ public class HiveCreateTableTest_13_skew extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("list_bucket_single")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java index c7b0b2721..97f1efbc3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_14_skew.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ 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" + - " SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78))"; // + " SKEWED BY (col1, col2) ON (('s1',1), ('s3',3), ('s13',13), ('s78',78))"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -63,6 +62,5 @@ public class HiveCreateTableTest_14_skew extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("list_bucket_multiple")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java index 6fc68d8a4..51a081a92 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_15_pk.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ public class HiveCreateTableTest_15_pk extends OracleTest { public void test_0() throws Exception { String sql = // "create table pk(id1 integer, id2 integer,\n" + - " primary key(id1, id2) disable novalidate);"; // + " primary key(id1, id2) disable novalidate);"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -62,6 +61,5 @@ public class HiveCreateTableTest_15_pk extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("pk")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java index c36259f6d..96e4c06c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_16_fk.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ public class HiveCreateTableTest_16_fk extends OracleTest { public void test_0() throws Exception { String sql = // "create table fk(id1 integer, id2 integer,\n" + - " constraint c1 foreign key(id1, id2) references pk(id2, id1) disable novalidate);"; // + " constraint c1 foreign key(id1, id2) references pk(id2, id1) disable novalidate);"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -63,6 +62,5 @@ public class HiveCreateTableTest_16_fk extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("fk")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java index 2aa94987c..51e9b974f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_17.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -41,7 +40,7 @@ public class HiveCreateTableTest_17 extends OracleTest { "is_deleted bigint,\n" + "campaign_plan string,\n" + "campaign_name string\n" + - ") partitioned by(ds string) stored as ORC;"; // + ") partitioned by(ds string) stored as ORC;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -89,6 +88,5 @@ public class HiveCreateTableTest_17 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("dim_ad_sem_kw_intl")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java index cfd074c35..e1432c2a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_18.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class HiveCreateTableTest_18 extends OracleTest { "\tlanguages array,\n" + "\treligions map>)\n" + "ROW FORMAT SERDE 'org.openx.data.jsonserde.JsonSerDe'\n" + - "STORED AS TEXTFILE;"; // + "STORED AS TEXTFILE;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -69,6 +68,5 @@ public class HiveCreateTableTest_18 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("json_nested_test")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java index 448b067b9..bdd596b09 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_19.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_19 extends OracleTest { String sql = // "CREATE TABLE complex_array (\n" + "\tname string, address struct\n" + - ")"; // + ")"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -62,6 +61,5 @@ public class HiveCreateTableTest_19 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("complex_array")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java index 33d0ca8ef..01f8b0f8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ 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" + - " PARTITIONED BY (datestamp STRING) CLUSTERED BY (userid) INTO 256 BUCKETS STORED AS ORC;"; // + " PARTITIONED BY (datestamp STRING) CLUSTERED BY (userid) INTO 256 BUCKETS STORED AS ORC;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -68,6 +67,5 @@ public class HiveCreateTableTest_2 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("pageviews")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java index a0dfadab0..6c1c9c254 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_20.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -31,7 +30,7 @@ public class HiveCreateTableTest_20 extends OracleTest { "\tmyfield string, ts string\n" + ") ROW FORMAT SERDE 'org.openx.data.jsonserde.JsonSerDe'\n" + "WITH SERDEPROPERTIES ( \"mapping.ts\" = \"timestamp\" )\n" + - "STORED AS TEXTFILE;"; // + "STORED AS TEXTFILE;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -70,6 +69,5 @@ public class HiveCreateTableTest_20 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("mytable")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java index 878df0136..573ac08fd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_21.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class HiveCreateTableTest_21 extends OracleTest { ",col6 FLOAT,col7 DOUBLE,col8 DOUBLE PRECISION,col9 STRING,col10 BINARY\n" + ",col11 TIMESTAMP,col12 DECIMAL,col13 DECIMAL(10,2),col13 DATE,col14 VARCHAR,col15 CHAR\n" + ",col16 ARRAY,col17 MAP,col18 STRUCT,col20 UNIONTYPE\n" + - ") clustered by (PAR1,PAR2) INTO 32 BUCKETS\n"; // + ") clustered by (PAR1,PAR2) INTO 32 BUCKETS\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -85,6 +84,5 @@ public class HiveCreateTableTest_21 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aliyun_cdm.test_903_table")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java index d4e22883f..b2f19057f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_22.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_22 extends OracleTest { String sql = // "create table if not exists aliyun_cdm.test_904_table (\n" + "col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME" + - "\n) skewed by (PAR1,PAR2) ON ((\"v1\",100),(\"v2\",200))\n"; // + "\n) skewed by (PAR1,PAR2) ON ((\"v1\",100),(\"v2\",200))\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -66,6 +65,5 @@ public class HiveCreateTableTest_22 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aliyun_cdm.test_904_table")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java index 3f32736aa..94b50280f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_23_temporary.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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"; // + "create temporary table aliyun_cdm.test_893_table (col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME)\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -63,6 +62,5 @@ public class HiveCreateTableTest_23_temporary extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aliyun_cdm.test_893_table")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java index 8afd2d8ec..11edb2736 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_24.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_24 extends OracleTest { public void test_0() throws Exception { String sql = // "create table aliyun_cdm.test_905_table \n" + - "(col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME) row format delimited fields terminated by \"\\\\001\"\n"; // + "(col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME) row format delimited fields terminated by \"\\\\001\"\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -67,13 +66,12 @@ public class HiveCreateTableTest_24 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aliyun_cdm.test_905_table")); - } public void test_1_error() throws Exception { String sql = // "create table aliyun_cdm.test_905_table \n" + - "(col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME) row format delimited field terminated by \"\\\\001\"\n"; // + "(col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME) row format delimited field terminated by \"\\\\001\"\n"; Exception error = null; try { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java index 084a47f88..d4acde3ad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_25.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class HiveCreateTableTest_25 extends OracleTest { "create table aliyun_cdm.test_910_table(\n" + "col1 BIGINT,col2 STRING,col3 BOOLEAN,col4 DOUBLE,col5 DATETIME,\n" + "constraint c11 foreign key(col1,col2) references aliyun_cdm.test_910_table_f (col1,col2) disable novalidate\n" + - ")\n"; // + ")\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -68,7 +67,5 @@ public class HiveCreateTableTest_25 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aliyun_cdm.test_910_table")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java index 5974f22ff..c083903e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_26_struct.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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' >)"; // + "CREATE TABLE IF NOT EXISTS test_910_table (col19 STRUCT < col20:STRING COMMENT 'column19' >)"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -60,7 +59,5 @@ public class HiveCreateTableTest_26_struct extends OracleTest { assertTrue(visitor.containsTable("test_910_table")); assertTrue(visitor.containsColumn("test_910_table", "col19")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java index 166365847..adfaace34 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_27.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -59,7 +58,7 @@ public class HiveCreateTableTest_27 extends OracleTest { " 'numRows'='-1', \n" + " 'rawDataSize'='-1', \n" + " 'totalSize'='1870175', \n" + - " 'transient_lastDdlTime'='1527408051')"; // + " 'transient_lastDdlTime'='1527408051')"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -121,7 +120,5 @@ public class HiveCreateTableTest_27 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java index e89dff1e7..423457d9b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_28_struct.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,7 @@ public class HiveCreateTableTest_28_struct extends OracleTest { " 'numRows'='-1', \n" + " 'rawDataSize'='-1', \n" + " 'totalSize'='347', \n" + - " 'transient_lastDdlTime'='1530879306')"; // + " 'transient_lastDdlTime'='1530879306')"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -97,7 +96,5 @@ public class HiveCreateTableTest_28_struct extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("json_table_1")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java index fe79ed128..489dfbfd1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_29.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_29 extends OracleTest { String sql = // "CREATE TABLE dataphin_test (id STRING, name STRING) \n" + "ROW FORMAT DELIMITED FIELDS TERMINATED BY ',' \n" + - "LINES TERMINATED BY '\\n' STORED AS PARQUET;"; // + "LINES TERMINATED BY '\\n' STORED AS PARQUET;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -66,7 +65,5 @@ public class HiveCreateTableTest_29 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("dataphin_test")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java index d4133485a..ae6374c76 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -35,7 +34,7 @@ public class HiveCreateTableTest_3 extends OracleTest { "COMMENT 'session来源类型维表'\n" + "PARTITIONED BY(date STRING COMMENT '日期', pos STRING COMMENT '位置')\n" + "ROW FORMAT DELIMITED FIELDS TERMINATED BY ','\n" + - "STORED AS SEQUENCEFILE"; // + "STORED AS SEQUENCEFILE"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -76,6 +75,5 @@ public class HiveCreateTableTest_3 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("pub_ae_sess_type_dimt0_text")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java index 5d02439cd..0b30b341f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_30.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -51,7 +50,7 @@ public class HiveCreateTableTest_30 extends OracleTest { " 'numRows'='-1',\n" + " 'rawDataSize'='-1',\n" + " 'totalSize'='2224',\n" + - " 'transient_lastDdlTime'='1528440011')\n"; // + " 'transient_lastDdlTime'='1528440011')\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -104,7 +103,6 @@ public class HiveCreateTableTest_30 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("nation")); - } public void test_1() throws Exception { @@ -116,7 +114,7 @@ public class HiveCreateTableTest_30 extends OracleTest { + "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 '萌豆'"; // + + "COMMENT '萌豆'"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -153,7 +151,7 @@ public class HiveCreateTableTest_30 extends OracleTest { + " 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/'"; // + + "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); @@ -176,7 +174,6 @@ public class HiveCreateTableTest_30 extends OracleTest { SQLStatement statement = SQLUtils.parseSingleStatement(sql, DbType.hive, SQLParserFeature.KeepComments); assertEquals("-- 234234\n" + "CREATE TABLE a (\n" + "\tid varchar\n" + ")", SQLUtils.toSQLString(statement, JdbcConstants.HIVE)); - } public void test_4() throws Exception { @@ -186,7 +183,6 @@ public class HiveCreateTableTest_30 extends OracleTest { 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)); - } public void test_5() throws Exception { @@ -196,7 +192,5 @@ public class HiveCreateTableTest_30 extends OracleTest { 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)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java index abaf0e9d7..fb4c01cee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_31_mappedBy_for_dla.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_31_mappedBy_for_dla extends OracleTest { String sql = // "create table aaaa (\n" + " id int not null MAPPED BY (name='pk',format='yyy',charset='utf8',type='string'）\n" + - ") MAPPED by (name='AAAA')"; // + ") MAPPED by (name='AAAA')"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -63,7 +62,5 @@ public class HiveCreateTableTest_31_mappedBy_for_dla extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aaaa")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java index 367891f1b..43fcf057f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_32_properties.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class HiveCreateTableTest_32_properties extends OracleTest { String sql = // "create table aaaa (\n" + " id int not null COLPROPERTIES (name='pk',format='yyy',charset='utf8',type='string'）\n" + - ") MAPPED by (name='AAAA')"; // + ") MAPPED by (name='AAAA')"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -68,14 +67,13 @@ public class HiveCreateTableTest_32_properties extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aaaa")); - } public void test_mysql() throws Exception { String sql = // "create table aaaa (\n" + " id int not null COLPROPERTIES (name='pk',format='yyy',charset='utf8',type='string'）\n" + - ")"; // + ")"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -111,7 +109,5 @@ public class HiveCreateTableTest_32_properties extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("aaaa")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java index 5f2b0bcd5..497e33623 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_33_struct.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -105,7 +104,7 @@ public class HiveCreateTableTest_33_struct extends OracleTest { " phaseQuality int\n" + " ) \n" + "STORED AS PARQUET \n" + - "LOCATION 'oss://wegene-genomics-api-test/parquet_data/WGSDANAL098612/';"; // + "LOCATION 'oss://wegene-genomics-api-test/parquet_data/WGSDANAL098612/';"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -328,7 +327,5 @@ public class HiveCreateTableTest_33_struct extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("user_snp_test_4")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java index 162edec8e..bcf1324d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_34.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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');"; // + "CREATE DATABASE `ddl_json_string` WITH DBPROPERTIES (LOCATION = 'oss://oss-cn-hangzhou-for-openanalytics/datasets/tpch/1x/json_string/', catalog = 'oss');"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -62,7 +61,5 @@ public class HiveCreateTableTest_34 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java index 070ed41da..14b511a34 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_35_dla.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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;"; // + String sql = "create table dla_table1 like dla_table2;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -57,7 +56,5 @@ public class HiveCreateTableTest_35_dla extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java index 38fcbaf47..f1b6450a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_36_dla.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class HiveCreateTableTest_36_dla extends OracleTest { "\n" + "    column_mapping = 'hello,world;james,bond;'\n" + "\n" + - ");"; // + ");"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -64,7 +63,5 @@ public class HiveCreateTableTest_36_dla extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java index 670a4cef1..a2d8ca7b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_37_dla.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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');"; // + String sql = "create table dla_table1 like mapping('mysql_table1');"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -57,7 +56,5 @@ public class HiveCreateTableTest_37_dla extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java index d20ff03d4..c8f40bb5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_38_dla.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -84,7 +83,5 @@ public class HiveCreateTableTest_38_dla extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); // assertTrue(visitor.containsTable("customer_case.tradelist_csv")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java index 12740fd16..f5ed7ee82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_39_dla.java @@ -49,7 +49,5 @@ public class HiveCreateTableTest_39_dla extends OracleTest { "\t'skip.header.line.count' = '0',\n" + "\t'recursive.directories' = 'false'\n" + ");", SQLUtils.toSQLString(statementList, JdbcConstants.HIVE)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java index e5f2588b1..551e253b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -33,7 +32,7 @@ public class HiveCreateTableTest_4 extends OracleTest { "\tlast_update_user string)\n" + "PARTITIONED BY (tran_date string)\n" + "CLUSTERED BY (ID) into 5 buckets \n" + - "STORED AS ORC TBLPROPERTIES ('transactional'='true');\n"; // + "STORED AS ORC TBLPROPERTIES ('transactional'='true');\n"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -76,6 +75,5 @@ public class HiveCreateTableTest_4 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("merge_data.transactions")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java index c9530b3a0..b5d33646f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_40_dla.java @@ -77,7 +77,5 @@ public class HiveCreateTableTest_40_dla extends OracleTest { "\t'recursive.directories' = 'false',\n" + "\t'file.filter' = 'shangjian_6e958954-f2c7-11e8-94b7-0c54159e4818.json.snappy'\n" + ");", SQLUtils.toSQLString(statementList, JdbcConstants.HIVE)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java index c39dc3204..565537a51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_41.java @@ -34,7 +34,5 @@ public class HiveCreateTableTest_41 extends OracleTest { "\tid int COMMENT '学号',\n" + "\tname string COMMENT '姓名'\n" + ");", SQLUtils.toSQLString(statementList, JdbcConstants.HIVE)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java index 1344e9ae3..605d2d745 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_42.java @@ -39,7 +39,5 @@ public class HiveCreateTableTest_42 extends OracleTest { "WITH SERDEPROPERTIES (\n" + "\t\"serialization.encoding\" = 'gbk'\n" + ");", SQLUtils.toSQLString(statementList, JdbcConstants.HIVE)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java index 352de646c..9f663d029 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43.java @@ -40,7 +40,5 @@ public class HiveCreateTableTest_43 extends OracleTest { "LIKE\n" + "SELECT *\n" + "FROM tbl1;", SQLUtils.toSQLString(statementList, JdbcConstants.HIVE)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java index 4f55c24df..ad0be9813 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_43_dla.java @@ -59,5 +59,4 @@ public class HiveCreateTableTest_43_dla extends OracleTest { "\t'textinputformat.record.delimiter' = '\\u25bc'\n" + ");", statementList.get(0).toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java index 4a12655b3..a3afa8ebf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_44.java @@ -58,5 +58,4 @@ public class HiveCreateTableTest_44 extends OracleTest { "\t'recursive.directories' = 'true'\n" + ");", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java index f53ed7bf4..28cb4a90c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_45_dla.java @@ -46,5 +46,4 @@ public class HiveCreateTableTest_45_dla extends OracleTest { "\t'TABLE_MAPPING' = `device_group_relation`\n" + ")", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java index 17102cc3e..2bd7d181f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_46_dla.java @@ -35,5 +35,4 @@ public class HiveCreateTableTest_46_dla extends OracleTest { assertEquals(stmt.toString(), SQLUtils.parseSingleStatement(stmt.toString(), DbType.hive, SQLParserFeature.KeepComments).toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java index 8b338f19a..110a28d32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_47_dla.java @@ -66,5 +66,4 @@ public class HiveCreateTableTest_47_dla assertEquals(stmt.toString(), SQLUtils.parseSingleStatement(stmt.toString(), DbType.hive, SQLParserFeature.KeepComments).toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java index fdd148f53..444138832 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_49_dla.java @@ -48,5 +48,4 @@ public class HiveCreateTableTest_49_dla assertEquals(stmt.toString(), SQLUtils.parseSingleStatement(stmt.toString(), DbType.hive, SQLParserFeature.KeepComments).toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java index 6e43706fd..e1ff4f1de 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class HiveCreateTableTest_5 extends OracleTest { "CREATE TABLE user_info_bucketed(user_id BIGINT, firstname STRING, lastname STRING)\n" + "COMMENT 'A bucketed copy of user_info'\n" + "PARTITIONED BY(ds STRING)\n" + - "CLUSTERED BY(user_id) INTO 256 BUCKETS;"; // + "CLUSTERED BY(user_id) INTO 256 BUCKETS;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -70,6 +69,5 @@ public class HiveCreateTableTest_5 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("user_info_bucketed")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java index 96c09ca49..3d3ef33e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_6.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class HiveCreateTableTest_6 extends OracleTest { " dtDontQuery string,\n" + " name string\n" + ")\n" + - "partitioned by (date string)"; // + "partitioned by (date string)"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -69,6 +68,5 @@ public class HiveCreateTableTest_6 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("table_name")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java index 246004d54..2737d0864 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_7.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class HiveCreateTableTest_7 extends OracleTest { " ip STRING COMMENT 'IP Address of the User')\n" + " COMMENT 'This is the page view table'\n" + " PARTITIONED BY(dt STRING, country STRING)\n" + - " STORED AS SEQUENCEFILE;"; // + " STORED AS SEQUENCEFILE;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -74,6 +73,5 @@ public class HiveCreateTableTest_7 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("page_view")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java index bc08254e4..0c47f40ba 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_8.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,7 @@ public class HiveCreateTableTest_8 extends OracleTest { " PARTITIONED BY(dt STRING, country STRING)\n" + " ROW FORMAT DELIMITED\n" + " FIELDS TERMINATED BY '\\001' ESCAPED BY '\\\\'\n" + - "STORED AS SEQUENCEFILE;"; // + "STORED AS SEQUENCEFILE;"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -79,6 +78,5 @@ public class HiveCreateTableTest_8 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("page_view")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java index 53c89a99a..f2ee74b01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveCreateTableTest_9.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,7 @@ public class HiveCreateTableTest_9 extends OracleTest { " COMMENT 'This is the staging page view table'\n" + " ROW FORMAT DELIMITED FIELDS TERMINATED BY '\\054'\n" + " STORED AS TEXTFILE\n" + - " LOCATION '';"; // + " LOCATION '';"; List statementList = SQLUtils.toStatementList(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -76,6 +75,5 @@ public class HiveCreateTableTest_9 extends OracleTest { assertEquals(0, visitor.getOrderByColumns().size()); assertTrue(visitor.containsTable("page_view")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java index b0db2e801..20217caa4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_0.java @@ -11,7 +11,7 @@ import java.util.List; public class HiveInsert_0 extends TestCase { public void test_select() throws Exception { String sql = "INSERT INTO TABLE students\n" + - " VALUES ('fred flintstone', 35, 1.28), ('barney rubble', 32, 2.32);";// + " VALUES ('fred flintstone', 35, 1.28), ('barney rubble', 32, 2.32);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -35,6 +35,5 @@ public class HiveInsert_0 extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java index 4262dc3d2..9e81abf01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_1.java @@ -12,7 +12,7 @@ public class HiveInsert_1 extends TestCase { public void test_select() throws Exception { String sql = "FROM page_view_stg pvs\n" + "INSERT OVERWRITE TABLE page_view PARTITION(dt='2008-06-08', country)\n" + - " SELECT pvs.viewTime, pvs.userid, pvs.page_url, pvs.referrer_url, null, null, pvs.ip, pvs.cnt";// + " SELECT pvs.viewTime, pvs.userid, pvs.page_url, pvs.referrer_url, null, null, pvs.ip, pvs.cnt"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -40,6 +40,5 @@ public class HiveInsert_1 extends TestCase { assertEquals(2, visitor.getTables().size()); assertEquals(8, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java index e8b612462..82467f8d9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveInsert_3.java @@ -14,7 +14,7 @@ public class HiveInsert_3 extends TestCase { "INSERT OVERWRITE TABLE sale_detail_multi partition (sale_date='2010', region='china' )\n" + "SELECT shop_name, customer_id, total_price\n" + "INSERT OVERWRITE TABLE sale_detail_multi partition (sale_date='2010', region='china' )\n" + - "SELECT shop_name, customer_id, total_price;";// + "SELECT shop_name, customer_id, total_price;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.HIVE); SQLStatement stmt = statementList.get(0); @@ -50,6 +50,5 @@ public class HiveInsert_3 extends TestCase { assertTrue(visitor.containsColumn("sale_detail", "shop_name")); assertTrue(visitor.containsColumn("sale_detail", "customer_id")); assertTrue(visitor.containsColumn("sale_detail", "total_price")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveKeywordsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveKeywordsTest.java index 9b65965ea..e85429532 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveKeywordsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveKeywordsTest.java @@ -9,12 +9,8 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.VisitorFeature; import junit.framework.TestCase; -import org.junit.Test; - -import static org.junit.Assert.*; public class HiveKeywordsTest extends TestCase { - public void test_keywords() { DbType dbType = DbType.hive; String sql = "select 1 as TIMESTAMPLOCALTZ"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java index bc20916b0..e406c38fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveResourceTest.java @@ -28,5 +28,4 @@ public class HiveResourceTest extends SQLResourceTest { public void hive_parse() throws Exception { fileTest(0, 999, i -> "bvt/parser/hive/" + i + ".txt"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_0.java index 0b0f8b2e8..58e310e5a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_0.java @@ -3,10 +3,8 @@ package com.alibaba.druid.bvt.sql.hive; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -14,7 +12,7 @@ public class HiveSelectTest_0 extends TestCase { public void test_select() throws Exception { String sql = "SELECT page_views.*\n" + "FROM page_views\n" + - "WHERE page_views.date >= '2008-03-01' AND page_views.date <= '2008-03-31'";// + "WHERE page_views.date >= '2008-03-01' AND page_views.date <= '2008-03-31'"; assertEquals("SELECT page_views.*\n" + "FROM page_views\n" + "WHERE page_views.date >= '2008-03-01'\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_1_limit.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_1_limit.java index 97889a54b..6c0592fb2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_1_limit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_1_limit.java @@ -10,7 +10,7 @@ import java.util.List; public class HiveSelectTest_1_limit extends TestCase { public void test_select() throws Exception { - String sql = "SELECT * FROM customers ORDER BY create_date LIMIT 2,5";// + String sql = "SELECT * FROM customers ORDER BY create_date LIMIT 2,5"; assertEquals("SELECT *\n" + "FROM customers\n" + "ORDER BY create_date\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java index 2b87b019b..c552ff46e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_lateralview.java @@ -11,7 +11,7 @@ import java.util.List; public class HiveSelectTest_2_lateralview extends TestCase { public void test_select() throws Exception { String sql = "SELECT pageid, adid\n" + - "FROM pageAds LATERAL VIEW explode(adid_list) adTable AS adid;";// + "FROM pageAds LATERAL VIEW explode(adid_list) adTable AS adid;"; assertEquals("SELECT pageid, adid\n" + "FROM pageAds\n" + "\tLATERAL VIEW explode(adid_list) adTable AS adid;", SQLUtils.formatHive(sql)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java index 145de6093..9ab9b51cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_2_true.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.hive; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; @@ -14,7 +13,7 @@ import java.util.List; public class HiveSelectTest_2_true extends TestCase { public void test_select() throws Exception { - String sql = "SELECT * FROM customers where isvalid = true or isxx = false";// + String sql = "SELECT * FROM customers where isvalid = true or isxx = false"; assertEquals("SELECT *\n" + "FROM customers\n" + "WHERE isvalid = true\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java index 6174ac662..2837a7efe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_3_array.java @@ -11,7 +11,7 @@ import java.util.List; public class HiveSelectTest_3_array extends TestCase { public void test_select() throws Exception { - String sql = "select languages[0] from json_nested_test;";// + String sql = "select languages[0] from json_nested_test;"; assertEquals("SELECT languages[0]\n" + "FROM json_nested_test;", SQLUtils.formatHive(sql)); assertEquals("select languages[0]\n" + @@ -37,6 +37,5 @@ public class HiveSelectTest_3_array assertTrue(visitor.containsColumn("json_nested_test", "languages")); // assertTrue(visitor.containsColumn("customers", "isxx")); // assertTrue(visitor.containsColumn("customers", "*")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java index c84fdd182..aa442de27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_42_cte.java @@ -89,6 +89,5 @@ public class HiveSelectTest_42_cte extends TestCase { "FROM dycg_perform_startgametaketimelog\n" + "GROUP BY app_id, ver, machine_dc, game_id\n" + "\tGROUPING SETS ((app_id), (app_id, ver), (app_id, ver, machine_dc), (app_id, ver, game_id), (app_id, machine_dc), (app_id, machine_dc, game_id), (app_id, game_id), (app_id, ver, machine_dc, game_id))", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java index 9b1592d8e..3f24aa231 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_44_issue_3973.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.hive; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.hive.ast.HiveMultiInsertStatement; import junit.framework.TestCase; import java.util.List; @@ -37,6 +36,5 @@ public class HiveSelectTest_44_issue_3973 extends TestCase { "INSERT OVERWRITE TABLE t2\n" + "SELECT *\n" + "FROM t;", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java index e1b1f6d0b..1de8e0a37 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_45_issue_3987.java @@ -39,6 +39,5 @@ public class HiveSelectTest_45_issue_3987 extends TestCase { "\tWHERE pdate = ''\n" + ") m\n" + "WHERE m.rownum = 1", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java index 83ab4f424..07b612c77 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_47.java @@ -134,6 +134,5 @@ public class HiveSelectTest_47 extends TestCase { // assertEquals(1, visitor.getTables().size()); // assertEquals(2, visitor.getColumns().size()); // assertEquals(2, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java index 9f289167b..94cfba5e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_48.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; @@ -18,6 +17,5 @@ public class HiveSelectTest_48 extends TestCase { SQLStatement sqlStatement = stmtList.get(0); SQLSelectStatement stmt = (SQLSelectStatement) sqlStatement; List list = ((SQLSelectQueryBlock) stmt.getSelect().getQuery()).getSelectList(); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java index 88ec66241..b4e2aa08a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSelectTest_4_array.java @@ -11,7 +11,7 @@ import java.util.List; public class HiveSelectTest_4_array extends TestCase { public void test_select() throws Exception { - String sql = "select religions['catholic'][0] from json_nested_test;";// + String sql = "select religions['catholic'][0] from json_nested_test;"; assertEquals("SELECT religions['catholic'][0]\n" + "FROM json_nested_test;", SQLUtils.formatHive(sql)); assertEquals("select religions['catholic'][0]\n" + @@ -37,6 +37,5 @@ public class HiveSelectTest_4_array assertTrue(visitor.containsColumn("json_nested_test", "religions")); // assertTrue(visitor.containsColumn("customers", "isxx")); // assertTrue(visitor.containsColumn("customers", "*")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSetTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSetTest_1.java index 1948efd3a..0489a3b39 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSetTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/HiveSetTest_1.java @@ -1,20 +1,17 @@ package com.alibaba.druid.bvt.sql.hive; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + /** * @author lizongbo */ public class HiveSetTest_1 extends TestCase { - static String sql1 = "set hivevar:exp_id = 8001\n" + ";"; @@ -59,7 +56,6 @@ public class HiveSetTest_1 extends TestCase { } - public void test_setHiveVar3() throws Exception { { DbType dbType = JdbcConstants.ODPS; @@ -81,7 +77,6 @@ public class HiveSetTest_1 extends TestCase { } - public void test_setHiveVar4() throws Exception { for (DbType dbType : new DbType[]{JdbcConstants.ODPS, JdbcConstants.HIVE}) { List statementList = SQLUtils.parseStatements(sql4, dbType); @@ -93,4 +88,4 @@ public class HiveSetTest_1 extends TestCase { } } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5430.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5430.java index 155acb9df..110c50fe6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5430.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5430.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.hive.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -12,13 +10,13 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Name; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; - import org.apache.commons.lang3.StringUtils; import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; /** * @author lizongbo @@ -27,7 +25,6 @@ import static org.junit.Assert.assertTrue; * @todo 还有4个SQL解析存在转义字符识别的问题，暂时忽略，等温少来解决识别问题吧 */ public class Issue5430 { - private static final Log log = LogFactory.getLog(Issue5430.class); @Test @@ -138,7 +135,7 @@ public class Issue5430 { + " STORED AS SEQUENCEFILE", }) { index++; - if (index >=21) { + if (index >= 21) { continue; } String normalizeSql = normalizeSql(sql); @@ -148,7 +145,7 @@ public class Issue5430 { String newSql = statement.toString(); String normalizeNewSql = normalizeSql(newSql); System.out.println("第" + index + "条生成的sql格式归一化===" + normalizeNewSql); - assertEquals(normalizeSql.toLowerCase(),normalizeNewSql.toLowerCase()); + assertEquals(normalizeSql.toLowerCase(), normalizeNewSql.toLowerCase()); if (!normalizeSql.equalsIgnoreCase(normalizeNewSql)) { System.err.println("第" + index + "条是解析失败原始的sql===" + normalizeSql); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5853.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5853.java index f349c214f..4495d1c1c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5853.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5853.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.hive.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,7 +16,6 @@ import static org.junit.Assert.assertEquals; * @see ... */ public class Issue5853 { - @Test public void test_parse_create_0() { for (String sql : new String[]{ @@ -87,5 +85,4 @@ public class Issue5853 { } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java index 6bc884214..aa2ebbf36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.hive.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,23 +16,20 @@ import static org.junit.Assert.assertEquals; * @see = 3 and ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});\n" - , + "SET hivevar:account_period = IF(${hivevar:now_month} >= 3 and ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});\n", }) { SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List statementList = parser.parseStatementList(); assertEquals(1, statementList.size()); assertEquals( - "SET hivevar:account_period = IF(${hivevar:now_month} >= 3 AND ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});" - , statementList.get(0).toString()); + "SET hivevar:account_period = IF(${hivevar:now_month} >= 3 AND ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});", + statementList.get(0).toString()); SQLParseAssertUtil.assertParseSql(sql, dbType); } } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5968.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5968.java index 9302985a9..c91e57a7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5968.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5968.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.hive.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,13 +17,10 @@ import static org.junit.Assert.assertEquals; * @see Hive DDL */ public class Issue5968 { - - @Test public void test_parse_stored_by() { for (DbType dbType : new DbType[]{DbType.hive}) { for (String sql : new String[]{ - "CREATE TABLE IF NOT EXISTS test.tests(\n" + " id bigint COMMENT 'from deserializer',\n " + " job_group bigint COMMENT 'from deserializer',\n" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloKeywordsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloKeywordsTest.java index 7f48052fa..d60ac8689 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloKeywordsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloKeywordsTest.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.VisitorFeature; import junit.framework.TestCase; -import static org.junit.Assert.*; public class HoloKeywordsTest extends TestCase { public void test_keywords() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloResourceTest.java index 2d8fd675d..c5716b8ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/hologres/HoloResourceTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.bvt.sql.SQLResourceTest; import org.junit.Test; - public class HoloResourceTest extends SQLResourceTest { public HoloResourceTest() { super(DbType.hologres); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/impala/ImpalaResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/impala/ImpalaResourceTest.java index faf98eda1..24182a9d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/impala/ImpalaResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/impala/ImpalaResourceTest.java @@ -28,5 +28,4 @@ public class ImpalaResourceTest extends SQLResourceTest { public void impala_parse() throws Exception { fileTest(0, 999, i -> "bvt/parser/impala/" + i + ".txt"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java index e84f9ef34..d3fc0a392 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/informix/InformixSelectTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.informix; -import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java index c9d3bb895..7c7e04a11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AdsDumpTest_0.java @@ -26,6 +26,4 @@ public class AdsDumpTest_0 extends TestCase { "\tAND (amp.buyer_add_cart_info.show_price >= 13300))\n" + "LIMIT 144800", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AntlrMySqlTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AntlrMySqlTest.java index 8dcfe6847..fda109dc4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AntlrMySqlTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/AntlrMySqlTest.java @@ -40,7 +40,7 @@ public class AntlrMySqlTest extends TestCase { stmt.accept(schemaStatVisitor); assertTrue(stmtSql, provider.checkValid(stmtSql)); } - + // test different style newline. if (sql.indexOf("\r\n") == -1) { sql = sql.replace("\n", "\r\n"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java index fb45ded1a..28a7c166d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CobarHintsTest.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; public class CobarHintsTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java index 4571e1d9e..3beb0d818 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class ComparisonFunctionsAndOperatorsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java index f966fc468..15d5ad84e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class ControlFlowFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java index d47b8c299..db9eb5f98 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class CreateUserTest extends MysqlTest { public void test_0() throws Exception { String sql = "CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'mypass';"; @@ -43,6 +41,4 @@ public class CreateUserTest extends MysqlTest { assertTrue(visitor.getTables().size() == 0); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java index e77eb31fe..8f76a57ed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class DateAndTimeFunctionsTest extends TestCase { public void test_0() throws Exception { @@ -623,7 +620,6 @@ public class DateAndTimeFunctionsTest extends TestCase { 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java index 26085ce7b..0d3242934 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class DateAndTimeValuesTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java index cebf3299d..a5c5195d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -44,9 +43,9 @@ public class DeleteSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - assertEquals("DELETE t1" + // - "\nFROM t1" + // - "\n\tLEFT JOIN t2 ON t1.id = t2.id" + // + assertEquals("DELETE t1" + + "\nFROM t1" + + "\n\tLEFT JOIN t2 ON t1.id = t2.id" + "\nWHERE t2.id IS NULL;", SQLUtils.toMySqlString(stmt)); } @@ -58,8 +57,8 @@ public class DeleteSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - assertEquals("DELETE a1, a2\nFROM t1 a1" + // - "\n\tINNER JOIN t2 a2" + // + assertEquals("DELETE a1, a2\nFROM t1 a1" + + "\n\tINNER JOIN t2 a2" + "\nWHERE a1.id = a2.id", SQLUtils.toMySqlString(stmt)); } @@ -92,5 +91,4 @@ public class DeleteSyntaxTest extends TestCase { assertEquals("DELETE LOW_PRIORITY QUICK IGNORE FROM T", SQLUtils.toMySqlString(stmt)); assertEquals("delete low_priority quick ignore from T", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java index 2dba47a79..92259a402 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class DropTableTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP TABLE films, distributors;"; @@ -50,6 +48,4 @@ public class DropTableTest extends MysqlTest { assertTrue(visitor.getColumns().isEmpty()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java index 85d94de91..f476b7e3f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class DropUserTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP USER 'jeffrey'@'localhost';"; @@ -43,6 +41,4 @@ public class DropUserTest extends MysqlTest { assertTrue(visitor.getTables().size() == 0); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java index 20fd36cf0..f05194f22 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class EncryptionAndCompressionFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java index cd88eda6c..08631dc28 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; - import junit.framework.TestCase; +import java.util.List; + 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 +34,18 @@ public class FullTextSearchesWithQueryExpansionTest extends TestCase { { String text = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT *" // - + "\nFROM articles" // + assertEquals("SELECT *" + + "\nFROM articles" + "\nWHERE MATCH (title, body) AGAINST ('database' IN NATURAL LANGUAGE MODE)", text); } { String text = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select *" // - + "\nfrom articles" // + assertEquals("select *" + + "\nfrom articles" + "\nwhere match (title, body) against ('database' in natural language mode)", text); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java index 5245f8c42..23e7c0c1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HelpTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class HelpTest extends TestCase { public void test_help_0() throws Exception { @@ -33,5 +30,4 @@ public class HelpTest extends TestCase { String output = SQLUtils.toMySqlString(stmt); assertEquals("HELP 'contents'", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java index 2ca78f3e9..1a0db09cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class HexadecimalValuesTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java index cdfdb8685..2efd30f2c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/IdentifierTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class IdentifierTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java index c1ff1b6bb..d7ac1cd7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class InformationFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java index f0f0741e4..698c90fe2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; - +import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; +import java.util.List; + public class InsertSyntaxTest extends TestCase { public void test_0() throws Exception { String sql = "INSERT INTO tbl_name () VALUES();"; @@ -70,8 +66,8 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - assertEquals("INSERT INTO tbl_name (a, b, c)\nVALUES (1, 2, 3)," + // - "\n\t(4, 5, 6)," + // + assertEquals("INSERT INTO tbl_name (a, b, c)\nVALUES (1, 2, 3)," + + "\n\t(4, 5, 6)," + "\n\t(7, 8, 9);", text); } @@ -83,8 +79,8 @@ public class InsertSyntaxTest extends TestCase { String text = output(stmtList); - assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3, 4, 5" + // + assertEquals("INSERT INTO tbl_name (a, b, c)" + + "\nVALUES (1, 2, 3, 4, 5" + "\n\t, 6, 7, 8, 9);", text); } @@ -111,11 +107,11 @@ public class InsertSyntaxTest extends TestCase { SQLStatement stmt = stmtList.get(0); - assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3)" + // + assertEquals("INSERT INTO tbl_name (a, b, c)" + + "\nVALUES (1, 2, 3)" + "\nON DUPLICATE KEY UPDATE c = c + 1;", SQLUtils.toMySqlString(stmt)); - assertEquals("insert into tbl_name (a, b, c)" + // - "\nvalues (1, 2, 3)" + // + 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java index fbf2548f2..4188839bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class Kill_Test extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java index 7426d921f..db97b1179 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class LOAD_XML_Syntax_Test extends TestCase { public void test_0() throws Exception { @@ -38,6 +35,4 @@ public class LOAD_XML_Syntax_Test extends TestCase { assertEquals("LOAD XML LOCAL INFILE 'person.xml' INTO TABLE person ROWS IDENTIFIED BY '';", text); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java index 7b942fbc7..e39f23c2c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class LoadDataInFileSyntaxTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java index 784de9f4f..16b8afc55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -180,7 +179,6 @@ public class LogicalOperatorsTest extends TestCase { assertEquals("SELECT 1 XOR 1 XOR 1;", text); } - public void test14() { String sql = "SELECT ~1;"; @@ -191,7 +189,6 @@ public class LogicalOperatorsTest extends TestCase { assertEquals("SELECT ~1;", text); - sql = "SELECT ~(1+1);"; parser = new MySqlStatementParser(sql); @@ -213,7 +210,6 @@ public class LogicalOperatorsTest extends TestCase { "FROM SUNTEST\n" + "WHERE ~ID = 1;", text); - sql = "SELECT * FROM SUNTEST WHERE ~(ID = 1);"; parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java index bf2fe5488..ee672b909 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class MathematicalFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java index fa51fb4f0..b29066f67 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class MiscellaneousFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java index c7e7bf98b..a6babd78c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySql57Test.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.sql.mysql; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; - import junit.framework.TestCase; - public class MySql57Test extends TestCase { public void test_0() throws Exception { String sql = "ALTER TABLE t1 ALGORITHM=INPLACE, CHANGE COLUMN c1 c1 VARCHAR(255);"; @@ -17,12 +13,12 @@ public class MySql57Test extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE t1" // - + "\n\tALGORITHM = INPLACE," // + assertEquals("ALTER TABLE t1" + + "\n\tALGORITHM = INPLACE," + "\n\tCHANGE COLUMN c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table t1" // - + "\n\talgorithm = INPLACE," // + assertEquals("alter table t1" + + "\n\talgorithm = INPLACE," + "\n\tchange column c1 c1 VARCHAR(255);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java index 4ed22451f..f2bdc8b7b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlASTVisitorAdapterTest.java @@ -6,7 +6,12 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryExpr; import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr; import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr; import com.alibaba.druid.sql.ast.statement.*; -import com.alibaba.druid.sql.dialect.mysql.ast.*; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlIgnoreIndexHint; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUseIndexHint; 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; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java index 6c2e319b2..e398563cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAnalyzeTest_1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlAnalyzeTest_1 extends MysqlTest { public void test_0() throws Exception { String sql = "ANALYZE TABLE t1,t2"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java index d72421bb9..99bdcabb5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlBeginTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class MySqlBeginTest extends MysqlTest { public void test_0() throws Exception { String sql = "START TRANSACTION;" @@ -34,7 +32,6 @@ public class MySqlBeginTest extends MysqlTest { + "\nCOMMIT;" + "\n"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); // print(statementList); @@ -87,6 +84,4 @@ public class MySqlBeginTest extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java index 0dea1801e..da94b3701 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlChecksumTableTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java index 4c5d7be86..508ff9610 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + 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;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java index 98a3dfb7a..565eaf488 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + 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;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java index 779acc6d1..9b3b46a32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + 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;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java index 87cd5ee7f..33a1d9d8b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlDeleteTest_3 extends MysqlTest { public void test_0() throws Exception { - String sql = "DELETE FROM t1 " // + String sql = "DELETE FROM t1 " + "WHERE s11 > ANY"// + "(SELECT COUNT(*) /* no hint */ FROM t2"// + " WHERE NOT EXISTS"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java index f05db41b0..69c6eac0e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_4_force_partition.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java index c47d852b1..0e24f3cdc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_5_force_partition.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java index e0a730624..444bc6cdd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_6.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_7.java index cb17e09c3..df3ad77af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_7.java @@ -1,16 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import org.junit.Test; +import java.util.List; + +import static org.junit.Assert.assertEquals; + public class MySqlDeleteTest_7 { @Test public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java index 21f6a64f9..2cb5983e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescTest_0.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class MySqlDescTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = " Desc City"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java index 7d6e6abc3..36f02056b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlDescribteTest extends MysqlTest { public void test_0() throws Exception { String sql = " DESCRIBE City"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java index 4dafe3ba1..79fe82e4b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDumpTest_1.java @@ -53,6 +53,5 @@ public class MySqlDumpTest_1 extends MysqlTest { assertTrue(visitor.containsColumn("wenyu_meta_person", "dept")); assertTrue(visitor.containsColumn("wenyu_meta_person", "gender")); assertTrue(visitor.containsColumn("wenyu_meta_person", "pid")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java index d251f7bbf..7ccd07d98 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; 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(?,?) " + // + String sql = "insert into userdetectitem26 (nick,volume) values(?,?) " + "ON DUPLICATE KEY UPDATE title = ?,picURL = ?,scoreExceed = ?,score="; Exception error = null; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java index 768f2f92c..ed0f89390 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_1.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java index 84ee5b9da..7302c66b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_3.java @@ -17,14 +17,13 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static 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" + // - " LEFT JOIN sdb_goods_cat AS C ON C.cat_id = G.cat_id" + // - " LEFT JOIN sdb_brand AS B ON B.brand_id = G.brand_id" + // + String sql = "SELECT count(*) AS num FROM sdb_products AS P" + + " LEFT JOIN sdb_goods AS G ON G.goods_id = P.goods_id" + + " LEFT JOIN sdb_goods_cat AS C ON C.cat_id = G.cat_id" + + " LEFT JOIN sdb_brand AS B ON B.brand_id = G.brand_id" + " WHERE P.disabled = ? AND P.op_status = LIMIT ?, ?"; Exception error = null; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java index ef060dedf..2c61095de 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlExplainStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; @@ -190,5 +189,4 @@ public class MySqlExplainTest extends MysqlTest { private static void assertHasSeenTableColumn(MySqlSchemaStatVisitor visitor, String tableName, String columnName) { assertTrue(visitor.getColumns().contains(new TableStat.Column(tableName, columnName))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java index 2dd993afc..45c6de3a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_0.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class MySqlExplainTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = "explain SELECT * FROM sonar.groups where id = 1"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java index b232f1720..c47eea270 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlExplainTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java index 178bf4559..e42c6906c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class MySqlFormatTest extends TestCase { public void test_0() throws Exception { String text = "CREATE TABLE customer (a INT, b CHAR (20), INDEX (a));"; - assertEquals("CREATE TABLE customer (\n" + // - "\ta INT,\n" + // - "\tb CHAR(20),\n" + // - "\tINDEX(a)\n" + // + assertEquals("CREATE TABLE customer (\n" + + "\ta INT,\n" + + "\tb CHAR(20),\n" + + "\tINDEX(a)\n" + ");", SQLUtils.format(text, JdbcUtils.MYSQL)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java index e30cf41fa..1386df3ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest2.java @@ -15,11 +15,9 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class MySqlFormatTest2 extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java index 209db5e9c..c6bcd3e23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest3.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlFormatTest3 extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest4.java index 4243fb8ac..3f7c78595 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest4.java @@ -15,33 +15,30 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; -import static org.junit.Assert.*; + +import java.util.ArrayList; +import java.util.List; /** * test java.sql.Time parameter format and Boolean parameterized * @author lizongbo */ public class MySqlFormatTest4 extends TestCase { - public void test_0() throws Exception { String text = "select * from tabletest\n" + "where ccc like '%tidb_txn_mode%' and open_flag = true " - + "and bbb = 1 and ddd= 4567.9888 " + + "and bbb = 1 and ddd = 4567.9888 " + "and added_time > ? and added_time < ?;"; List parameters = new ArrayList<>(); - java.sql.Time startTime= new java.sql.Time(System.currentTimeMillis()); + java.sql.Time startTime = new java.sql.Time(System.currentTimeMillis()); startTime.setHours(11); startTime.setMinutes(22); startTime.setSeconds(33); - java.sql.Time endTime= new java.sql.Time(System.currentTimeMillis()); + java.sql.Time endTime = new java.sql.Time(System.currentTimeMillis()); endTime.setHours(20); endTime.setMinutes(21); endTime.setSeconds(23); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java index 418312c61..7e35ff78a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHelpTest_0.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlHelpTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = "HELP 'search_string'"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java index 1c286409f..9d26c54f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlHintStatementTest.java @@ -22,11 +22,11 @@ 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 */;"// - + "\n/*!40101 SET character_set_client = utf8 */;" // + + "\n/*!40101 SET character_set_client = utf8 */;" + "\nCREATE TABLE `item_similarity` ("// + " `id` bigint(20) unsigned NOT NULL, "// + " `sellerId` bigint(20) DEFAULT NULL,"// - + " PRIMARY KEY (`id`)" // + + " PRIMARY KEY (`id`)" + " ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"// + " \n/*!40101 SET character_set_client = @saved_cs_client */;"; String rs = SQLUtils.formatMySql(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java index 1c7734e78..b44b9a13c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOptimizeTest_1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlOptimizeTest_1 extends MysqlTest { public void test_0() throws Exception { String sql = "OPTIMIZE TABLE t1,t2"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOrderingExprTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOrderingExprTest.java index ac5fd67f2..ff1afd4b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOrderingExprTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlOrderingExprTest.java @@ -20,14 +20,12 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; - import junit.framework.TestCase; /** * @author lizongbo */ public class MySqlOrderingExprTest extends TestCase { - public void test_order_column_0() throws Exception { String sql = "SELECT task_id, task_name FROM table_task WHERE task_count > 20 AND (task_date = '20230306' OR task_date = '20230307') GROUP BY task_id ASC"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -39,5 +37,4 @@ public class MySqlOrderingExprTest extends TestCase { System.out.println(groupByColumnName); assertEquals("task_id ASC", groupByColumnName); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepCheckTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepCheckTest.java index a01b34cc0..82dd86532 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepCheckTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepCheckTest.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; public class MySqlRepCheckTest { - final private SchemaRepository repository = new SchemaRepository(JdbcUtils.MYSQL); + private final SchemaRepository repository = new SchemaRepository(JdbcUtils.MYSQL); @Test public void test_check() { @@ -40,4 +40,4 @@ public class MySqlRepCheckTest { return schemaDdls; } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepTest.java index 4b0c16cc6..84e4bc5cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRepTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.util.JdbcUtils; public class MySqlRepTest { - public static void main(String[] args) { SchemaRepository repository = new SchemaRepository(JdbcUtils.MYSQL); repository.setDefaultSchema("test_db"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java index 598d20a9b..6030a6b64 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlReplaceTest.java @@ -20,9 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlResourceTest.java index b9422802d..50d3ffab7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlResourceTest.java @@ -28,5 +28,4 @@ public class MySqlResourceTest extends SQLResourceTest { public void mysql_parse() throws Exception { fileTest(0, 999, i -> "bvt/parser/mysql/" + i + ".txt"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java index 59674a4ad..b92e57953 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlRevokeTest.java @@ -28,7 +28,6 @@ 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); @@ -61,6 +60,4 @@ public class MySqlRevokeTest extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java index 6bd0e0de9..941d57d51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetPasswordTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlSetPasswordTest extends MysqlTest { public void test_0() throws Exception { String sql = "SET PASSWORD FOR 'bob'@'%.example.org' = PASSWORD('cleartext password');"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java index d217dc5d1..fc9d28c3a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_0.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlSetTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = "SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java index a88e5c280..b1f9ab2e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_1.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - import junit.framework.TestCase; +import java.util.List; + public class MySqlSetTest_1 extends TestCase { public void test_0() throws Exception { String sql = "SET @@session.autocommit = ON;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java index 0397c1624..3101a5781 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java index d9fa62202..2cc94bca6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSetTest_3.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java index 16b05dcf5..8d20e06eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlTruncateTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlTruncateTest_1 extends MysqlTest { public void test_0() throws Exception { String sql = "truncate table city_list-- test"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -60,6 +58,4 @@ public class MySqlTruncateTest_1 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java index ba7c78c19..5fd2036ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUpdateStatementLimitTest.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; public class MySqlUpdateStatementLimitTest extends TestCase { public void test_limit() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java index 4e32e3fa0..42d41022b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlUseTest_0.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlUseTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = "use db;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java index d158e0fee..c87d6a8c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/MysqlCheckTest.java @@ -4,7 +4,11 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddConstraint; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLCheck; +import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlAlterTableAlterCheck; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -13,23 +17,21 @@ import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.fastjson2.JSON; -import static org.junit.Assert.*; - import java.util.List; import java.util.regex.Pattern; public class MysqlCheckTest extends MysqlTest { public void testEndTokenChecking() throws Exception { Object[][] samples = { - { "update test_tab1 set b= 1 swhere a=1", false, true }, - { "select * from test_tab1 swhere a=1", false, true }, - { "delete from test_tab1 \n swhere a=1", false, true }, - { "delete from test_tab1 where a=1", true, true }, - { "delete from test_tab1 \n where a=1 \n", true, true }, - { "IF age>20 THEN SET @count1=@count1+1/* a */;\n" + {"update test_tab1 set b= 1 swhere a=1", false, true}, + {"select * from test_tab1 swhere a=1", false, true}, + {"delete from test_tab1 \n swhere a=1", false, true}, + {"delete from test_tab1 where a=1", true, true}, + {"delete from test_tab1 \n where a=1 \n", true, true}, + {"IF age>20 THEN SET @count1=@count1+1/* a */;\n" + " ELSEIF age=20 THEN SET @count2=@count2+1;/* b */\n" + " ELSE SET @count3=@count3+1;\n" - + "/* c */ END IF/*d*/;", true, false } + + "/* c */ END IF/*d*/;", true, false} }; for (final Object[] arr : samples) { @@ -64,7 +66,7 @@ public class MysqlCheckTest extends MysqlTest { } } } - + public void test_create1() { String sql = "CREATE TABLE `t12` (\n" + " `c1` int DEFAULT NULL,\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java index a00b4caa1..c435bac03 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/NumberTest.java @@ -15,18 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.parser.SQLStatementParser; +import java.util.List; public class NumberTest extends TestCase { public void test_0() throws Exception { @@ -50,5 +46,4 @@ public class NumberTest extends TestCase { assertEquals("SELECT 294.42;", text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java index 8c6ce6550..0f7c66171 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class REPLACE_Syntax_Test extends TestCase { public void test_0() throws Exception { @@ -61,5 +58,4 @@ public class REPLACE_Syntax_Test extends TestCase { assertEquals("REPLACE INTO t (col1, col2)\nVALUES (?, ?)", text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java index a206f4f2a..ef1a20f33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class RegularExpressionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java index 300561aab..a5f0433f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class Reset_Test extends TestCase { public void test_0() throws Exception { @@ -36,7 +34,6 @@ public class Reset_Test extends TestCase { assertEquals("BINLOG 'str';", text); } - private String output(List stmtList) { StringBuilder out = new StringBuilder(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java index ce0fc13ad..7dcbc0de0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; - +import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; +import java.util.List; + 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;"; @@ -133,10 +129,10 @@ public class SELECT_Syntax_Test extends TestCase { String text = output(stmtList); - assertEquals("SELECT column1" // - + "\nFROM t1" // - + "\nWHERE EXISTS (" // - + "\n\tSELECT *" // + assertEquals("SELECT column1" + + "\nFROM t1" + + "\nWHERE EXISTS (" + + "\n\tSELECT *" + "\n\tFROM t2" + "\n);", text); } @@ -149,9 +145,9 @@ public class SELECT_Syntax_Test extends TestCase { String text = output(stmtList); - assertEquals("SELECT DISTINCT store_type" // - + "\nFROM stores" // - + "\nWHERE NOT EXISTS (" // + 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" @@ -320,7 +316,7 @@ public class SELECT_Syntax_Test extends TestCase { "SELECT a AS until\nFROM t", "SELECT a AS open\nFROM t" }; - + for (int i = 0; i < sqls.length; i++) { MySqlStatementParser parser = new MySqlStatementParser(sqls[i]); List parseStatementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java index ed163195b..9721f617a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class SHOW_COLUMNS_Syntax_Test extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java index 9815bdd77..8f87d9fc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class SHOW_DATABASES_Syntax_Test extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java index 2348857ac..2d845856f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_STATUS_Syntax_Test.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class SHOW_STATUS_Syntax_Test extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java index 701cdf6fa..e672f6c49 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class SHOW_TABLES_Syntax_Test extends TestCase { public void test_0() throws Exception { @@ -64,7 +62,6 @@ public class SHOW_TABLES_Syntax_Test extends TestCase { text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); assertEquals("SHOW FULL TABLES FROM SUNTEST", text); - sql = "SHOW FULL TABLES IN SUNTEST LIKE '%DDD%' "; parser = new MySqlStatementParser(sql); stmtList = parser.parseStatementList(); @@ -83,13 +80,10 @@ public class SHOW_TABLES_Syntax_Test extends TestCase { text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); 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(); text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); assertEquals("SHOW FULL TABLES FROM SUNTEST WHERE NAME = 'DDD'", text); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java index c75f88815..23224a843 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class SHOW_WARNINGS_Syntax_Test extends TestCase { public void test_0() throws Exception { @@ -71,5 +68,4 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { assertEquals("SHOW WARNINGS LIMIT 10, 10;", text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java index d4c434e40..483ed12d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLSelectTest.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class SQLSelectTest extends TestCase { public void test_select() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java index f6c823711..144add7b5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddColumnTest.java @@ -1,25 +1,21 @@ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; public class SQLUtilsAddColumnTest extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT id, name" // + assertEquals("SELECT id, name" + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", null, null)); } public void test_select_1() throws Exception { - assertEquals("SELECT id, name AS XX" // + assertEquals("SELECT id, name AS XX" + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX", null)); } public void test_select_2() throws Exception { - assertEquals("SELECT id, name AS \"XX W\"" // + assertEquals("SELECT id, name AS \"XX W\"" + "\nFROM t", SQLUtils.addSelectItem("select id from t", "name", "XX W", null)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java index 40d8500a5..f1a42c5d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest.java @@ -1,47 +1,42 @@ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - +import junit.framework.TestCase; public class SQLUtilsAddConditionTest extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", null)); } public void test_select_1() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // - + "\nWHERE id = 0" // + 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 { - assertEquals("DELETE FROM t" // + assertEquals("DELETE FROM t" + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", null)); } public void test_delete_1() throws Exception { - assertEquals("DELETE FROM t" // - + "\nWHERE id = 0" // + 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 { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", null)); } public void test_update_1() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0" + "\n\tAND name = 'bb'", SQLUtils.addCondition("update t set f1 = ? where id = 0", "name = 'bb'", null)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_mysql.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_mysql.java index f68ff8416..85dd557dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_mysql.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_mysql.java @@ -1,49 +1,44 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - +import junit.framework.TestCase; public class SQLUtilsAddConditionTest_mysql extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", DbType.mysql)); } public void test_select_1() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // - + "\nWHERE id = 0" // + assertEquals("SELECT *" + + "\nFROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("select * from t where id = 0", "name = 'aaa'", DbType.mysql)); } public void test_delete() throws Exception { - assertEquals("DELETE FROM t" // + assertEquals("DELETE FROM t" + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", DbType.mysql)); } public void test_delete_1() throws Exception { - assertEquals("DELETE FROM t" // - + "\nWHERE id = 0" // + assertEquals("DELETE FROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("delete from t where id = 0", "name = 'aaa'", DbType.mysql)); } - public void test_update() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", DbType.mysql)); } public void test_update_1() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0" + "\n\tAND name = 'bb'", SQLUtils.addCondition("update t set f1 = ? where id = 0", "name = 'bb'", DbType.mysql)); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_oracle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_oracle.java index bb2181c49..4f8db5fa3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_oracle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_oracle.java @@ -3,44 +3,41 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; - public class SQLUtilsAddConditionTest_oracle extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", DbType.oracle)); } public void test_select_1() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // - + "\nWHERE id = 0" // + assertEquals("SELECT *" + + "\nFROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("select * from t where id = 0", "name = 'aaa'", DbType.oracle)); } public void test_delete() throws Exception { - assertEquals("DELETE FROM t" // + assertEquals("DELETE FROM t" + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", DbType.oracle)); } public void test_delete_1() throws Exception { - assertEquals("DELETE FROM t" // - + "\nWHERE id = 0" // + assertEquals("DELETE FROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("delete from t where id = 0", "name = 'aaa'", DbType.oracle)); } - public void test_update() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", DbType.oracle)); } public void test_update_1() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0" + "\n\tAND name = 'bb'", SQLUtils.addCondition("update t set f1 = ? where id = 0", "name = 'bb'", DbType.oracle)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_pg.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_pg.java index 443d46fec..82e479868 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_pg.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_pg.java @@ -3,44 +3,41 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; - public class SQLUtilsAddConditionTest_pg extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", DbType.postgresql)); } public void test_select_1() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // - + "\nWHERE id = 0" // + assertEquals("SELECT *" + + "\nFROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("select * from t where id = 0", "name = 'aaa'", DbType.postgresql)); } public void test_delete() throws Exception { - assertEquals("DELETE FROM t" // + assertEquals("DELETE FROM t" + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", DbType.postgresql)); } public void test_delete_1() throws Exception { - assertEquals("DELETE FROM t" // - + "\nWHERE id = 0" // + assertEquals("DELETE FROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("delete from t where id = 0", "name = 'aaa'", DbType.postgresql)); } - public void test_update() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", DbType.postgresql)); } public void test_update_1() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0" + "\n\tAND name = 'bb'", SQLUtils.addCondition("update t set f1 = ? where id = 0", "name = 'bb'", DbType.postgresql)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_sqlserver.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_sqlserver.java index 228cb745c..96eeadc2b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_sqlserver.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsAddConditionTest_sqlserver.java @@ -1,50 +1,44 @@ package com.alibaba.druid.bvt.sql.mysql; import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - +import junit.framework.TestCase; public class SQLUtilsAddConditionTest_sqlserver extends TestCase { public void test_select() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 0", SQLUtils.addCondition("select * from t", "id = 0", DbType.sqlserver)); } public void test_select_1() throws Exception { - assertEquals("SELECT *" // - + "\nFROM t" // - + "\nWHERE id = 0" // + assertEquals("SELECT *" + + "\nFROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("select * from t where id = 0", "name = 'aaa'", DbType.sqlserver)); } public void test_delete() throws Exception { - assertEquals("DELETE FROM t" // + assertEquals("DELETE FROM t" + "\nWHERE id = 0", SQLUtils.addCondition("delete from t", "id = 0", DbType.sqlserver)); } public void test_delete_1() throws Exception { - assertEquals("DELETE FROM t" // - + "\nWHERE id = 0" // + assertEquals("DELETE FROM t" + + "\nWHERE id = 0" + "\n\tAND name = 'aaa'", SQLUtils.addCondition("delete from t where id = 0", "name = 'aaa'", DbType.sqlserver)); } - public void test_update() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0", SQLUtils.addCondition("update t set f1 = ?", "id = 0", DbType.sqlserver)); } public void test_update_1() throws Exception { assertEquals("UPDATE t"// - + "\nSET f1 = ?" // + + "\nSET f1 = ?" + "\nWHERE id = 0" + "\n\tAND name = 'bb'", SQLUtils.addCondition("update t set f1 = ? where id = 0", "name = 'bb'", DbType.sqlserver)); } } - diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java index 22b960fcb..e1c1ec154 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/SQLUtilsTest.java @@ -1,25 +1,21 @@ package com.alibaba.druid.bvt.sql.mysql; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import org.junit.Test; - 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")); - assertEquals("SELECT *" + // - "\nFROM t" + // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE id = 'abc'", formattedSql); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java index 0c4dfd1e8..cc8c17357 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class START_TRANSACTION_Test extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java index a5ef0cb4c..ed2bf0dc2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java index 5157e386e..c18a6aa1f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class StringFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java index 7e0ca4d24..1ff647da4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class StringTest extends TestCase { public void test_latin() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/TiDBBeginTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/TiDBBeginTest.java index 8a3b963f9..5285a5a25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/TiDBBeginTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/TiDBBeginTest.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -25,13 +23,12 @@ import com.alibaba.druid.sql.ast.statement.SQLBlockStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; +import java.util.List; /** * @author lizongbo */ public class TiDBBeginTest extends MysqlTest { - public void test_0() throws Exception { String sql = "BEGIN ;"; testSql(sql); @@ -101,9 +98,7 @@ public class TiDBBeginTest extends MysqlTest { assertEquals(1, visitor.getTables().size()); } - void testSql(String sql) throws Exception { - // MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.KeepComments); List statementList = SQLUtils.parseStatements(sql, JdbcConstants.TIDB); SQLStatement statement = statementList.get(0); @@ -119,6 +114,4 @@ public class TiDBBeginTest extends MysqlTest { assertEquals(0, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java index b0b02ec6c..95156feee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; + +import java.util.List; public class XMLFunctionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java index 022af8916..9a4f2aa82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterMaterializedViewTest_0.java @@ -164,7 +164,6 @@ public class MySqlAlterMaterializedViewTest_0 extends TestCase { "ALTER MATERIALIZED VIEW mymv\n" + "REFRESH FAST ON OVERWRITE\n" + "DISABLE QUERY REWRITE;"); - } public void test_bad_case() { @@ -195,7 +194,6 @@ public class MySqlAlterMaterializedViewTest_0 extends TestCase { " REFRESH COMPLETE " + "ENABLE QUERY"; failed(sql7); - } public void failed(String sql) { @@ -212,5 +210,4 @@ public class MySqlAlterMaterializedViewTest_0 extends TestCase { System.out.println(stmt.toString()); assertEquals(expectedSql, stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java index adccb8b71..d5f7f2bf6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableGroupTest_0.java @@ -39,5 +39,4 @@ public class MySqlAlterTableGroupTest_0 extends TestCase { assertEquals("ALTER TABLEGROUP new_ddl.ddl_test_1 k1 = 123", SQLUtils.toMySqlString(stmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java index 3e6215997..3580421cf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTable_refactor_test.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -96,7 +95,7 @@ public class MySqlAlterTable_refactor_test extends MysqlTest { "\tRENAME INDEX a TO b,\n" + "\tRENAME TO tb2,\n" + "\tWITHOUT VALIDATION,\n" + - "\tORDER BY a, b, c" , + "\tORDER BY a, b, c", SQLUtils.toMySqlString(statementList.get(0))); } @@ -123,5 +122,4 @@ public class MySqlAlterTable_refactor_test extends MysqlTest { "\tADD INDEX i1 (a, b) COVERING (c, d) DBPARTITION BY hash(a) TBPARTITION BY MM(actionDate) TBPARTITIONS 12;", SQLUtils.toMySqlString(statementList.get(0))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java index 8b3e74c5a..d3bc5682c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterUserTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java index d28f67abd..6ac359f03 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterViewTest_0.java @@ -39,5 +39,4 @@ public class MySqlAlterViewTest_0 extends TestCase { "select count(*)\n" + "from t3;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java index 15e39633f..a52ad56a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_0.java @@ -31,10 +31,10 @@ public class MySqlAlterTableAddIndex_0 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `test`.`tb1`" + // + assertEquals("ALTER TABLE `test`.`tb1`" + "\n\tADD INDEX `ix` (`f2` ASC);", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table `test`.`tb1`" + // + assertEquals("alter table `test`.`tb1`" + "\n\tadd index `ix` (`f2` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -54,7 +54,6 @@ public class MySqlAlterTableAddIndex_0 extends TestCase { assertEquals("ALTER TABLE `test`.`tb1`\n" + "\t ALTER INDEX `ix` FULLTEXT ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); - } public void test_alter_fulltext2() throws Exception { @@ -65,7 +64,6 @@ public class MySqlAlterTableAddIndex_0 extends TestCase { assertEquals("ALTER TABLE `test`.`tb1`\n" + "\t ALTER INDEX `ix` FULLTEXT INDEX ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); - } public void test_alter_fulltext3() throws Exception { @@ -76,7 +74,5 @@ public class MySqlAlterTableAddIndex_0 extends TestCase { assertEquals("ALTER TABLE `test`.`tb1`\n" + "\t ALTER INDEX `ix` FULLTEXT QUERY ANALYZER = 'sfewfw';", SQLUtils.toMySqlString(stmt)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java index 0a3b85753..88bec6dea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_1 extends TestCase { public void test_alter_first() throws Exception { @@ -32,10 +31,10 @@ public class MySqlAlterTableAddIndex_1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `test`.`tb1`" + // + assertEquals("ALTER TABLE `test`.`tb1`" + "\n\tADD UNIQUE INDEX `ix2` (`fid` ASC);", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table `test`.`tb1`" + // + assertEquals("alter table `test`.`tb1`" + "\n\tadd unique index `ix2` (`fid` asc);", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -45,5 +44,4 @@ public class MySqlAlterTableAddIndex_1 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java index ab7404a63..b8aafd174 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_10.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; /** * @version 1.0 @@ -117,5 +116,4 @@ public class MySqlAlterTableAddIndex_10 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java index adc9941cc..2739d959d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_11.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; /** * @version 1.0 @@ -97,5 +96,4 @@ public class MySqlAlterTableAddIndex_11 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java index 8dff8fb92..00b71a5dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_2 extends TestCase { public void test_alter_first() throws Exception { @@ -45,5 +44,4 @@ public class MySqlAlterTableAddIndex_2 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java index 18ed88a79..2acb00518 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_3.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_3 extends TestCase { public void test_alter_first() throws Exception { @@ -45,5 +44,4 @@ public class MySqlAlterTableAddIndex_3 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java index fd7754f42..5d6338afa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_4.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_4 extends TestCase { public void test_alter_first() throws Exception { @@ -45,5 +44,4 @@ public class MySqlAlterTableAddIndex_4 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java index e33fc88e3..c2fa4ac29 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_5.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.alterTable; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,7 @@ import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class MySqlAlterTableAddIndex_5 extends TestCase { public void test_alter_first() throws Exception { @@ -47,5 +44,4 @@ public class MySqlAlterTableAddIndex_5 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java index 3af1103fe..d34ff302a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_6.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.alterTable; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,7 @@ import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class MySqlAlterTableAddIndex_6 extends TestCase { public void test_alter_first() throws Exception { @@ -48,5 +45,4 @@ public class MySqlAlterTableAddIndex_6 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java index a2c1fe22a..b74b53bc3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_7.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.alterTable; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,7 @@ import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class MySqlAlterTableAddIndex_7 extends TestCase { public void test_alter_first() throws Exception { @@ -48,5 +45,4 @@ public class MySqlAlterTableAddIndex_7 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java index 0bea849d2..8258d4ced 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_8.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_8 extends TestCase { public void test_alter_first() throws Exception { @@ -48,5 +47,4 @@ public class MySqlAlterTableAddIndex_8 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java index f96ea19a7..206d8ce6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddIndex_9.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddIndex_9 extends TestCase { public void test_0() throws Exception { @@ -151,5 +150,4 @@ public class MySqlAlterTableAddIndex_9 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java index 434517381..49d20e761 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddPrimaryKey extends TestCase { public void test_alter_first() throws Exception { @@ -32,12 +31,12 @@ public class MySqlAlterTableAddPrimaryKey extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tCHANGE COLUMN `fid` `fid` INT(11) NOT NULL DEFAULT NULL,\n\t" + // + 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)); - assertEquals("alter table `test`.`tb1`" + // - "\n\tchange column `fid` `fid` INT(11) not null default null,\n\t" + // + 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)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -47,5 +46,4 @@ public class MySqlAlterTableAddPrimaryKey extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java index 8a0ca8507..b677a4032 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddPrimaryKey_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddPrimaryKey_1 extends TestCase { public void test_alter_first() throws Exception { @@ -32,10 +31,10 @@ public class MySqlAlterTableAddPrimaryKey_1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE tabelname" + // + assertEquals("ALTER TABLE tabelname" + "\n\tADD PRIMARY KEY (id)", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tabelname" + // + assertEquals("alter table tabelname" + "\n\tadd primary key (id)", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -45,5 +44,4 @@ public class MySqlAlterTableAddPrimaryKey_1 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java index 11a3a6b0f..970c6fcc8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAddUniqueTest.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAddUniqueTest extends TestCase { public void test_alter_first() throws Exception { @@ -45,5 +44,4 @@ public class MySqlAlterTableAddUniqueTest extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getCreateIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java index f6ead5d1a..58fd4ec23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnDropDefaultTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAlterColumnDropDefaultTest extends TestCase { public void test_alter_first() throws Exception { @@ -29,11 +28,10 @@ public class MySqlAlterTableAlterColumnDropDefaultTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE tabelname" + // + assertEquals("ALTER TABLE tabelname" + "\n\tALTER COLUMN operateVersion DROP DEFAULT", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tabelname" + // + assertEquals("alter table tabelname" + "\n\talter column operateVersion drop default", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java index 0d6b424c2..87f0b012f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnSetDefaultTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableAlterColumnSetDefaultTest extends TestCase { public void test_alter_first() throws Exception { @@ -29,11 +28,10 @@ public class MySqlAlterTableAlterColumnSetDefaultTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE tabelname" + // + assertEquals("ALTER TABLE tabelname" + "\n\tALTER COLUMN operateVersion SET DEFAULT 0", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tabelname" + // + assertEquals("alter table tabelname" + "\n\talter column operateVersion set default 0", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java index 51a35c042..c83afb6ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableAlterColumnTest.java @@ -34,5 +34,4 @@ public class MySqlAlterTableAlterColumnTest extends TestCase { 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java index c636418b6..85684db25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDisableKeys.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDisableKeys extends TestCase { public void test_alter_first() throws Exception { @@ -38,14 +37,13 @@ public class MySqlAlterTableDisableKeys extends TestCase { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE tableName" + // + assertEquals("ALTER TABLE tableName" + "\n\tDISABLE KEYS", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tableName" + // + assertEquals("alter table tableName" + "\n\tdisable keys", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java index 7837aa7c1..278a41baa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_0.java @@ -31,10 +31,10 @@ public class MySqlAlterTableDropIndex_0 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `test`.`tb1`" + // + assertEquals("ALTER TABLE `test`.`tb1`" + "\n\tDROP INDEX `ix`;", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table `test`.`tb1`" + // + assertEquals("alter table `test`.`tb1`" + "\n\tdrop index `ix`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -44,5 +44,4 @@ public class MySqlAlterTableDropIndex_0 extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(1, tableStat.getDropIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java index c1bc1e461..d3e478fc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropIndex_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDropIndex_1 extends TestCase { public void test_alter_first() throws Exception { @@ -31,12 +30,12 @@ public class MySqlAlterTableDropIndex_1 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP INDEX `ix`," + // + assertEquals("ALTER TABLE `test`.`tb1`" + + "\n\tDROP INDEX `ix`," + "\n\tDROP INDEX `ix2`;", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table `test`.`tb1`" + // - "\n\tdrop index `ix`," + // + assertEquals("alter table `test`.`tb1`" + + "\n\tdrop index `ix`," + "\n\tdrop index `ix2`;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java index e5e180bfa..e0bc74bd6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropKey.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDropKey extends TestCase { public void test_alter_first() throws Exception { @@ -32,10 +31,10 @@ public class MySqlAlterTableDropKey extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE t6" + // + assertEquals("ALTER TABLE t6" + "\n\tDROP KEY v", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table t6" + // + assertEquals("alter table t6" + "\n\tdrop key v", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); SchemaStatVisitor visitor = new SQLUtils().createSchemaStatVisitor(JdbcConstants.MYSQL); @@ -65,5 +64,4 @@ public class MySqlAlterTableDropKey extends TestCase { assertEquals(1, tableStat.getAlterCount()); assertEquals(0, tableStat.getDropIndexCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java index 58e1d7d27..c9458dfc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDropPrimaryKey.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDropPrimaryKey extends TestCase { public void test_alter_first() throws Exception { @@ -38,14 +37,13 @@ public class MySqlAlterTableDropPrimaryKey extends TestCase { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE tableName" + // + assertEquals("ALTER TABLE tableName" + "\n\tDROP PRIMARY KEY", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tableName" + // + assertEquals("alter table tableName" + "\n\tdrop primary key", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java index 4787f97e9..4aaa2a074 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDrop_Test extends TestCase { public void test_alter_first() throws Exception { @@ -29,11 +28,10 @@ public class MySqlAlterTableDrop_Test extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); - assertEquals("ALTER TABLE `rules`" // + assertEquals("ALTER TABLE `rules`" + "\n\tDROP COLUMN `enabled`", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table `rules`" // + assertEquals("alter table `rules`" + "\n\tdrop column `enabled`", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java index 0a7fdca9e..fcb8efd6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDrop_Test_1 extends TestCase { public void test_alter_first() throws Exception { @@ -37,5 +36,4 @@ public class MySqlAlterTableDrop_Test_1 extends TestCase { "\tdrop column Column9,\n" + "\tdrop column Column10;", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java index d1c54ae68..576494185 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableDrop_Test_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableDrop_Test_2 extends TestCase { public void test_alter_first() throws Exception { @@ -42,5 +41,4 @@ public class MySqlAlterTableDrop_Test_2 extends TestCase { "\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, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java index 3bbed5f40..b400ceb2a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableEnableKeys.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableEnableKeys extends TestCase { public void test_alter_first() throws Exception { @@ -38,14 +37,13 @@ public class MySqlAlterTableEnableKeys extends TestCase { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE tableName" + // + assertEquals("ALTER TABLE tableName" + "\n\tENABLE KEYS", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table tableName" + // + assertEquals("alter table tableName" + "\n\tenable keys", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java index e1cd9ce96..611d54ca4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest.java @@ -15,8 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.alterTable; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -24,13 +22,11 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.parser.Token; - import junit.framework.TestCase; -import static org.junit.Assert.*; +import java.util.List; public class MySqlAlterTableTest extends TestCase { - public void test_alter_0() throws Exception { String sql = "ALTER TABLE `test`.`tb1` CHANGE COLUMN `fname` `fname1` VARCHAR(45) NULL DEFAULT NULL ;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java index 6778bc43d..628fbe453 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest1 extends TestCase { public void test_alter_0() throws Exception { @@ -67,5 +66,4 @@ public class MySqlAlterTableTest1 extends TestCase { String output = SQLUtils.toMySqlString(stmt); assertEquals("RENAME TABLE t1 TO t2;", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java index 5c2b2f3e4..6b95f94a9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest10.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest10 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest10 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE t1" + // + assertEquals("ALTER TABLE t1" + "\n\tCHANGE COLUMN a b INTEGER;", output); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java index 128766826..433f1ca3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest11.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest11 extends TestCase { public void test_alter_first() throws Exception { @@ -45,5 +44,4 @@ public class MySqlAlterTableTest11 extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java index 40f5c2bf7..1dd145cfb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest12.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest12 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest12 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE tbl_name" + // + assertEquals("ALTER TABLE tbl_name" + "\n\tDROP FOREIGN KEY fk_symbol;", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java index c7d42c204..0fce9bc73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest13.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest13 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest13 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE tbl_name" + // + assertEquals("ALTER TABLE tbl_name" + "\n\tDISCARD TABLESPACE;", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java index 5bd364c07..786c976bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest14.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest14 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest14 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE tbl_name" + // + assertEquals("ALTER TABLE tbl_name" + "\n\tIMPORT TABLESPACE;", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java index baefe5cd9..80b34de37 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest15.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest15 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest15 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE st_jklsxxb" + // + assertEquals("ALTER TABLE st_jklsxxb" + "\n\tDISABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java index fc97c83bc..4b507548f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest16.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest16 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest16 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE st_jklsxxb" + // + assertEquals("ALTER TABLE st_jklsxxb" + "\n\tENABLE CONSTRAINT FK_ST_xxx_REFERENCE_ST_xxx", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java index 45bfa8db0..09fb9c5c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest17.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest17 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest17 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE rms.rms_Person_Event\n" + // + assertEquals("ALTER TABLE rms.rms_Person_Event\n" + "\tDROP FOREIGN KEY FKA382487726D72F65", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java index e61a7fdd9..90c7649ec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest18.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest18 extends TestCase { public void test_alter_charset() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java index e576e9cdb..fadb04f25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest19.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest19 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java index dcda2bc60..95b21d5c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest2 extends TestCase { public void test_alter_first() throws Exception { @@ -38,9 +37,8 @@ public class MySqlAlterTableTest2 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tADD COLUMN `f2` VARCHAR(45) NULL AFTER `fid`," + // + assertEquals("ALTER TABLE `test`.`tb1`" + + "\n\tADD COLUMN `f2` VARCHAR(45) NULL AFTER `fid`," + "\n\tADD COLUMN `f3` VARCHAR(45) NULL FIRST `f2`", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java index e7b90d6d8..4ce0c0572 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest20.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest20 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java index 6f41dd69b..703a58fcd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest21.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest21 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java index 778323109..775f37073 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest22.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest22 extends TestCase { public void test_alter_add_key() throws Exception { @@ -29,7 +28,7 @@ public class MySqlAlterTableTest22 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE pj_usr_auth" // + assertEquals("ALTER TABLE pj_usr_auth" + "\n\tADD CONSTRAINT FK_Reference_8 FOREIGN KEY (usr) REFERENCES usr (usr) ON DELETE RESTRICT ON UPDATE RESTRICT;", output); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java index 0bd2b5712..38bcb5fb6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest23.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest23 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java index cfd68b409..96380110b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest24.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest24 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java index 78e501337..00199bd51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest25.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest25 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java index fe4952a5d..4f02fb9c5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest26.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest26 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java index 1f1919c4e..f14e154cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest27.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest27 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java index 6301bdf72..feb7b3245 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest28.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest28 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java index 4da6d35e1..afe093bf1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest29.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest29 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java index 9aecaf002..3db5d487c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest3 extends TestCase { public void test_alter_first() throws Exception { @@ -29,10 +28,9 @@ public class MySqlAlterTableTest3 extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE `test`.`tb1`" + // - "\n\tDROP COLUMN `f3`," + // + 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); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java index f9f4888fd..5032da5b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest30.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest30 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java index c69e3b245..2c50edda0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest31_renameIndex.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest31_renameIndex extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java index 821c2762b..ab87075ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest32.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest32 extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java index 80647fed1..326d0b9fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest34_renameIndex.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest34_renameIndex extends TestCase { public void test_alter_add_key() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java index 3cfed57b5..fb13e48cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest35_multi.java @@ -17,8 +17,6 @@ package com.alibaba.druid.bvt.sql.mysql.alterTable; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java index 4edac309f..95cecf753 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest4.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.stat.TableStat.Column; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest4 extends TestCase { public void test_alter_first() throws Exception { @@ -40,12 +39,11 @@ public class MySqlAlterTableTest4 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE test" + // + assertEquals("ALTER TABLE test" + "\n\tADD COLUMN dspcode char(200)", output); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertTrue(visitor.getColumns().contains(new Column("test", "dspcode"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java index 71a5d1cf1..8010e1220 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest43.java @@ -42,5 +42,4 @@ public class MySqlAlterTableTest43 extends TestCase { assertEquals("ALTER TABLE logical_db.logical_tb\n" + "\tSET TBLPROPERTIES ('read_only' = 1) ON physical_db.physical_tb", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java index 39c3fc047..4ec7560fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest44.java @@ -42,5 +42,4 @@ public class MySqlAlterTableTest44 extends TestCase { assertEquals("ALTER TABLE logical_db.logical_tb\n" + "\tSET TBLPROPERTIES ('read_only' = 1) ON physical_db.physical_tb", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest46_add_column.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest46_add_column.java index 6df6cc770..654a0edfc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest46_add_column.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest46_add_column.java @@ -36,5 +36,4 @@ public class MySqlAlterTableTest46_add_column extends TestCase { "\tALGORITHM = copy,\n" + "\tLOCK = SHARED", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest47.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest47.java index ae9ba54b2..a9ab5755f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest47.java @@ -23,5 +23,4 @@ public class MySqlAlterTableTest47 extends TestCase { assertEquals("ALTER TABLE aaaaa\n" + "\tSET TBLPROPERTIES (RULE.BROADCAST = true)", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest48.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest48.java index 4ca7d9a7a..8782498ff 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest48.java @@ -40,5 +40,4 @@ public class MySqlAlterTableTest48 extends TestCase { "\tADD KEY `idx_odps_project` (`odps_project`(20)),\n" + "\tADD KEY `idx_odps_table` (`odps_table`(20));", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest49.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest49.java index 98c1c32c7..dd7455a31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest49.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest49.java @@ -23,5 +23,4 @@ public class MySqlAlterTableTest49 extends TestCase { assertEquals("ALTER TABLE a\n" + "\tADD COLUMN auto_id int NOT NULL PRIMARY KEY AUTO_INCREMENT BY GROUP;", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java index a8d5c8b4e..4734431a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest5.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.stat.TableStat.Column; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest5 extends TestCase { public void test_alter_first() throws Exception { @@ -40,12 +39,11 @@ public class MySqlAlterTableTest5 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE table_name" + // + assertEquals("ALTER TABLE table_name" + "\n\tCHANGE COLUMN column_name column_newname char(50)", output); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertTrue(visitor.getColumns().contains(new Column("table_name", "column_name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest50.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest50.java index aa37d903e..061f736a3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest50.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest50.java @@ -25,5 +25,4 @@ public class MySqlAlterTableTest50 extends TestCase { // "\tADD INDEX idx_name (name)\n" + // "\tLOCK = NONE;", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java index 1856cf5e4..fc4bb5cec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest51_table_options.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest51_table_options extends TestCase { public void test_0_options_no_comma_no_eq() { @@ -41,7 +40,6 @@ public class MySqlAlterTableTest51_table_options extends TestCase { assertEquals("ALTER TABLE test001\n" + "\tAUTO_INCREMENT = 1 AVG_ROW_LENGTH = 1 CHARACTER SET = utf8 CHECKSUM = 0 COLLATE = utf8_unicode_ci COMMENT = 'hehe' COMPRESSION = 'LZ4' CONNECTION = 'conn' COLLATE = 'path' DELAY_KEY_WRITE = 1 ENCRYPTION = 'N' ENGINE = innodb INSERT_METHOD = no KEY_BLOCK_SIZE = 32 MAX_ROWS = 999 MIN_ROWS = 1 PACK_KEYS = DEFAULT PASSWORD = 'psw' ROW_FORMAT = dynamic STATS_AUTO_RECALC = DEFAULT STATS_PERSISTENT = DEFAULT STATS_SAMPLE_PAGES = 10 TABLESPACE `tbs_name` STORAGE memory UNION = (tb1, tb2, tb3) AUTO_INCREMENT = 1", SQLUtils.toMySqlString(stmt)); - } public void test_0_options_comma_eq() { @@ -76,7 +74,5 @@ public class MySqlAlterTableTest51_table_options extends TestCase { assertEquals("ALTER TABLE test001\n" + "\tAUTO_INCREMENT = 2 AVG_ROW_LENGTH = 2 CHARACTER SET = utf8 CHECKSUM = 1 COLLATE = utf8_unicode_ci COMMENT = 'hehe' COMPRESSION = 'NONE' CONNECTION = 'conn' COLLATE = 'path' DELAY_KEY_WRITE = 0 ENCRYPTION = 'Y' ENGINE = innodb INSERT_METHOD = first KEY_BLOCK_SIZE = 64 MAX_ROWS = 999 MIN_ROWS = 1 PACK_KEYS = 0 PASSWORD = 'psw' ROW_FORMAT = fixed STATS_AUTO_RECALC = 1 STATS_PERSISTENT = 0 STATS_SAMPLE_PAGES = 2 TABLESPACE `tbs_name` UNION = (tb1, tb2, tb3);", SQLUtils.toMySqlString(stmt)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java index 1b1b76367..ce79aa70c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest52_primary_prefix_key.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; /** * @version 1.0 @@ -24,7 +23,5 @@ public class MySqlAlterTableTest52_primary_prefix_key extends TestCase { assertEquals("ALTER TABLE test001\n" + "\tADD PRIMARY KEY (b(4) ASC, c(8) DESC);", SQLUtils.toMySqlString(stmt)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java index e3c3b73dc..85a6b3d1f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest6.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest6 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest6 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE tableName" + // + assertEquals("ALTER TABLE tableName" + "\n\tDROP FOREIGN KEY fk_symbol", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java index 0488e4c07..d00da493c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest7.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest7 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest7 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE t1" + // + assertEquals("ALTER TABLE t1" + "\n\tENGINE = InnoDB;", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java index 772742921..4f834dd75 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest8.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest8 extends TestCase { public void test_alter_first() throws Exception { @@ -39,11 +38,10 @@ public class MySqlAlterTableTest8 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE t2" + // + assertEquals("ALTER TABLE t2" + "\n\tAUTO_INCREMENT = 3", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java index f4e9d28b9..b696dc772 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest9.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest9 extends TestCase { public void test_alter_first() throws Exception { @@ -39,12 +38,11 @@ public class MySqlAlterTableTest9 extends TestCase { // System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE t2" + // - "\n\tDROP COLUMN c," + // + assertEquals("ALTER TABLE t2" + + "\n\tDROP COLUMN c," + "\n\tDROP COLUMN d;", output); assertEquals(1, visitor.getTables().size()); assertEquals(2, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java index d6a2ab135..9ee014e52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_40_change.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.alterTable; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; @@ -27,7 +26,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest_40_change extends TestCase { public void test_alter_constraint() throws Exception { @@ -75,5 +73,4 @@ public class MySqlAlterTableTest_40_change extends TestCase { } return false; } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java index a0d1309db..c006ebb4e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_addFk.java @@ -23,11 +23,10 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static 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), " + // + String sql = "alter table Test2 add index FK4CF5DC0F5DD7C31 (test1_name), " + "add constraint FK4CF5DC0F5DD7C31 foreign key (test1_name) references Test1 (name)"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); @@ -41,13 +40,13 @@ public class MySqlAlterTableTest_addFk extends TestCase { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE Test2" + // - "\n\tADD INDEX FK4CF5DC0F5DD7C31 (test1_name)," + // + assertEquals("ALTER TABLE Test2" + + "\n\tADD INDEX FK4CF5DC0F5DD7C31 (test1_name)," + "\n\tADD CONSTRAINT FK4CF5DC0F5DD7C31 FOREIGN KEY (test1_name) REFERENCES Test1 (name)", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table Test2" + // - "\n\tadd index FK4CF5DC0F5DD7C31 (test1_name)," + // + assertEquals("alter table Test2" + + "\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)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java index 819463d12..a45ba45b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/alterTable/MySqlAlterTableTest_drop_constraint.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class MySqlAlterTableTest_drop_constraint extends TestCase { public void test_alter_constraint() throws Exception { @@ -38,14 +37,13 @@ public class MySqlAlterTableTest_drop_constraint extends TestCase { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE TUSER" + // + assertEquals("ALTER TABLE TUSER" + "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", SQLUtils.toMySqlString(stmt)); - assertEquals("alter table TUSER" + // + assertEquals("alter table TUSER" + "\n\tdrop constraint UK_084c17821a8f47e8b31fbb126b6", SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java index 52049212f..94f52fa9e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest0.java @@ -46,7 +46,7 @@ public class MySQLCreateMaterializedViewTest0 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java index d2a430582..ca3619260 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest1.java @@ -47,7 +47,7 @@ public class MySQLCreateMaterializedViewTest1 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java index 7942a82ae..34547a920 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest2.java @@ -35,7 +35,7 @@ public class MySQLCreateMaterializedViewTest2 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java index 16141fd03..aa750c348 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest3.java @@ -37,7 +37,7 @@ public class MySQLCreateMaterializedViewTest3 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java index 60870fd8e..eb46c4e91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest4.java @@ -44,7 +44,7 @@ public class MySQLCreateMaterializedViewTest4 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java index 741fafb89..e236bea39 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest5.java @@ -47,7 +47,7 @@ public class MySQLCreateMaterializedViewTest5 extends MysqlTest { "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java index 3ecb349cb..0895d9dc1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest6.java @@ -39,7 +39,6 @@ public class MySQLCreateMaterializedViewTest6 extends MysqlTest { "AS\n" + "SELECT id\n" + "FROM base;"); - } public void test2() throws Exception { @@ -63,7 +62,6 @@ public class MySQLCreateMaterializedViewTest6 extends MysqlTest { "AS\n" + "SELECT id\n" + "FROM base;"); - } public void test3() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java index 825b98c67..1f51933a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest7.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -47,7 +46,6 @@ public class MySQLCreateMaterializedViewTest7 extends MysqlTest { "AS\n" + "SELECT *\n" + "FROM base;"); - } public void test2() throws Exception { @@ -69,7 +67,6 @@ public class MySQLCreateMaterializedViewTest7 extends MysqlTest { "AS\n" + "SELECT *\n" + "FROM base;"); - } public void test3() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest8_distributed_by_with_duplicate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest8_distributed_by_with_duplicate.java index c0aef3d41..72c28e24c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest8_distributed_by_with_duplicate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest8_distributed_by_with_duplicate.java @@ -46,7 +46,7 @@ public class MySQLCreateMaterializedViewTest8_distributed_by_with_duplicate exte "ENABLE QUERY REWRITE\n" + "AS\n" + "SELECT id\n" + - "FROM base;",// + "FROM base;", SQLUtils.toSQLString(stmt, DbType.mysql, null, VisitorFeature.OutputDistributedLiteralInCreateTableStmt)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java index b435affbb..72493f56d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySQLCreateMaterializedViewTest_fail.java @@ -29,7 +29,6 @@ public class MySQLCreateMaterializedViewTest_fail extends OracleTest { "AS SELECT \n"; failed(sql); - } public void test2() throws Exception { @@ -44,7 +43,6 @@ public class MySQLCreateMaterializedViewTest_fail extends OracleTest { "AS SELECT id FROM base;"; failed(sql); - } public void test3() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java index 2051de50b..53ec344ed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateAddLogFileGroupTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java index f56a19de5..68e92818a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateDatabaseTest extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java index 1326ac868..42b92ed88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateDatabaseTest2 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java index 42fc427d2..460311ac9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateDatabaseTest3 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java index 0fbe56710..dd11b871d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java index e95424ad6..fac7dcfdb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest5.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java index 08504882b..88f7d4f57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest8_drds.java @@ -43,5 +43,4 @@ public class MySqlCreateDatabaseTest8_drds extends MysqlTest { "STORED BY (IP = '127.0.0.1', PORT = 3306, USER = 'root', PASSWORD = '123456'),\n" + "\t(IP = '127.0.0.1', PORT = 3307, USER = 'root', PASSWORD = '123456');", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java index 898bb37d5..e6334ac82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateDatabaseTest9_issue_3975.java @@ -32,4 +32,4 @@ public class MySqlCreateDatabaseTest9_issue_3975 "\ta int\n" + ") COLLATE = utf8_bin CHARSET = utf8;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java index d61fa524b..b93b5defc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java index b29354206..ebce92fc0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateEventTest1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java index cb7eab913..9d39abf9a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest1.java @@ -61,5 +61,4 @@ public class MySqlCreateExternalCatalogTest1 extends MysqlTest { + "'connection-user'=\"x'!xx\"\n" + "'connection-password'=\"x'xx\")", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java index 1b454c29d..749547bff 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateExternalCatalogTest2.java @@ -49,5 +49,4 @@ public class MySqlCreateExternalCatalogTest2 extends MysqlTest { "'connection-password'='access_key')\n" + "COMMENT 'This is a sample to create an oss connector catalog';", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java index 260f61183..133dac217 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextAnalyzerTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java index e889fa1ea..e4867ebd7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextCharFilterTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java index 37e264667..ebbbc0e04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextDictTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java index c7b3973a6..820ca5f87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenFilterTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java index e3e9bea8a..8891464f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFullTextTokenizeTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java index 372574dcb..d002ecf90 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateFunctionTest_1.java @@ -35,7 +35,7 @@ public class MySqlCreateFunctionTest_1 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(SQLUtils.toMySqlString(stmt)); @@ -53,13 +53,11 @@ public class MySqlCreateFunctionTest_1 extends MysqlTest { 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("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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java index dd0e27ad7..59cd98508 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndex2Test.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java index c9d85eea9..4d743101b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java index f81c8bdfd..67adce88c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java index f72bef266..f2cc62fdd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_11_adb.java @@ -41,5 +41,4 @@ public class MySqlCreateIndexTest_11_adb extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE CLUSTERED INDEX `g_i_seller` ON t_order (`seller_id`)", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java index c0be060ae..86f5626e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java index 82bf20e0e..3f8c96507 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateIndexTest_4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java index cf463d2b7..8bce93ed3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; public class MySqlCreateProcedureTest extends MysqlTest { public void test_0() throws Exception { @@ -62,7 +59,7 @@ public class MySqlCreateProcedureTest extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(stmt); @@ -72,8 +69,8 @@ public class MySqlCreateProcedureTest extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java index c3b9dd611..3800622a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest1.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * @author zz email:455910092@qq.com @@ -45,7 +42,7 @@ public class MySqlCreateProcedureTest1 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); @@ -53,8 +50,8 @@ public class MySqlCreateProcedureTest1 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java index 05205a9a4..032b0ebbb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest10.java @@ -29,20 +29,19 @@ public class MySqlCreateProcedureTest10 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); 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()); assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java index c7679dfee..f7e847c6b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest11.java @@ -56,22 +56,21 @@ public class MySqlCreateProcedureTest11 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); -// print(statementList); -// assertEquals(1, statementList.size()); + // print(statementList); + // assertEquals(1, statementList.size()); System.out.println(SQLUtils.toMySqlString(stmt)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); 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("Tables : " + visitor.getTables()); + // 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java index fafdd00d1..d9206d5d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest12.java @@ -19,9 +19,7 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -57,8 +55,8 @@ public class MySqlCreateProcedureTest12 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); -// print(statementList); -// assertEquals(1, statementList.size()); + // print(statementList); + // assertEquals(1, statementList.size()); System.out.println(SQLUtils.toMySqlString(stmt)); @@ -67,8 +65,8 @@ public class MySqlCreateProcedureTest12 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(3, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); @@ -80,5 +78,4 @@ public class MySqlCreateProcedureTest12 extends MysqlTest { assertTrue(visitor.containsColumn("nodes", "child")); assertTrue(visitor.containsColumn("_tmp", "node")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java index aaffc5fd5..0e0c1b95f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest13.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import org.apache.ibatis.jdbc.SQL; import java.util.List; @@ -30,7 +29,7 @@ public class MySqlCreateProcedureTest13 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(SQLUtils.toMySqlString(stmt)); @@ -46,14 +45,13 @@ public class MySqlCreateProcedureTest13 extends MysqlTest { SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); 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("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()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java index e02be632c..09e60d40e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest14.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,7 @@ public class MySqlCreateProcedureTest14 extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(SQLUtils.toMySqlString(stmt)); @@ -51,8 +50,8 @@ public class MySqlCreateProcedureTest14 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -60,5 +59,4 @@ public class MySqlCreateProcedureTest14 extends MysqlTest { assertTrue(visitor.containsColumn("mysql.user", "*")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java index 65222fcfd..4ae4b248f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java @@ -16,19 +16,11 @@ package com.alibaba.druid.bvt.sql.mysql.create; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLDataType; -import com.alibaba.druid.sql.ast.SQLParameter; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateFunctionStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateProcedureStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -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" + @@ -50,5 +42,4 @@ public class MySqlCreateProcedureTest15 extends MysqlTest { "\tRETURN 0;\n" + "END", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest16.java index f0930e248..7388f55b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest16.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateProcedureTest16 extends MysqlTest { - public void test_0() { String sql = "CREATE PROCEDURE drop_tab_index (IN db varchar(50),IN tb_name varchar(512),IN idx_type varchar(50),IN idx_name varchar(512))\n" + "BEGIN\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java index fcb35d5db..18658b8be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest2.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * @author zz email:455910092@qq.com @@ -45,7 +42,7 @@ public class MySqlCreateProcedureTest2 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); @@ -53,8 +50,8 @@ public class MySqlCreateProcedureTest2 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -77,7 +74,7 @@ public class MySqlCreateProcedureTest2 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(stmt); @@ -87,8 +84,8 @@ public class MySqlCreateProcedureTest2 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -111,16 +108,16 @@ public class MySqlCreateProcedureTest2 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java index a67bc5273..e36d27aeb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest3.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * @author zz email:455910092@qq.com @@ -46,7 +43,7 @@ public class MySqlCreateProcedureTest3 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(stmt); @@ -56,8 +53,8 @@ public class MySqlCreateProcedureTest3 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -81,16 +78,16 @@ public class MySqlCreateProcedureTest3 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -114,16 +111,16 @@ public class MySqlCreateProcedureTest3 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java index 48b60d240..3e27c253b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest4.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * @author zz email:455910092@qq.com @@ -46,7 +43,7 @@ public class MySqlCreateProcedureTest4 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(stmt); @@ -56,8 +53,8 @@ public class MySqlCreateProcedureTest4 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -81,16 +78,16 @@ public class MySqlCreateProcedureTest4 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -100,5 +97,4 @@ public class MySqlCreateProcedureTest4 extends MysqlTest { assertTrue(visitor.containsColumn("test", "id")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java index 783eeb682..1de3a76a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest5.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * Description: procedure begin-end, loop, while use label @@ -45,7 +42,7 @@ public class MySqlCreateProcedureTest5 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); System.out.println(stmt); @@ -55,8 +52,8 @@ public class MySqlCreateProcedureTest5 extends MysqlTest { 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -65,7 +62,6 @@ public class MySqlCreateProcedureTest5 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); assertTrue(visitor.containsColumn("test", "id")); -// assertTrue(visitor.containsColumn("test", "age"))); + // assertTrue(visitor.containsColumn("test", "age"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java index 7acf3ce12..ca656f9a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest6.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; + +import java.util.List; /** * @author zz email:455910092@qq.com @@ -42,7 +39,6 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); @@ -50,8 +46,6 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { 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(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); @@ -71,17 +65,11 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -100,17 +88,11 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -129,17 +111,11 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(1, visitor.getTables().size()); assertEquals(1, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -148,5 +124,4 @@ public class MySqlCreateProcedureTest6 extends MysqlTest { assertTrue(visitor.containsColumn("test", "id")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java index 151528169..50c3c3602 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -42,17 +41,11 @@ public class MySqlCreateProcedureTest7 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE PROCEDURE test11111 ()" + "\nBEGIN" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java index 6e7322a26..125cbb524 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -47,21 +46,20 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { + " 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;" + + " 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;" + + " 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); @@ -71,8 +69,6 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { 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(2, visitor.getTables().size()); assertEquals(5, visitor.getColumns().size()); @@ -88,17 +84,11 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -113,17 +103,11 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -138,17 +122,11 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -163,17 +141,11 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); @@ -188,17 +160,11 @@ public class MySqlCreateProcedureTest8 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); assertEquals(1, statementList.size()); 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()); - assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java index 902ea2a8b..fe7abd4c9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -41,16 +40,16 @@ public class MySqlCreateProcedureTest9 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); @@ -66,16 +65,16 @@ public class MySqlCreateProcedureTest9 extends MysqlTest { MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement statemen = statementList.get(0); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); 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()); assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); @@ -92,14 +91,14 @@ public class MySqlCreateProcedureTest9 extends MysqlTest { + " 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;" + + " 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;" + + " 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;"; @@ -121,5 +120,4 @@ public class MySqlCreateProcedureTest9 extends MysqlTest { assertEquals(5, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java index c65335afb..bb3a7d78e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; @@ -174,5 +173,4 @@ public class MySqlCreateResourceGroupTest String output = SQLUtils.toMySqlString(stmt); assertEquals("LIST RESOURCE GROUP", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java index ad737bdaa..8b0c6cfb5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateResourceGroupTest_hive.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; @@ -68,5 +67,4 @@ public class MySqlCreateResourceGroupTest_hive String output = SQLUtils.toMySqlString(stmt); assertEquals("DROP RESOURCE GROUP sql_thread;", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java index b60b1a446..4ee7b54d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java index f0b36e803..e5940172a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest1.java @@ -26,10 +26,10 @@ 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" + // + "CREATE SEQUENCE customers_seq" + + " START WITH 1000" + + " INCREMENT BY 1" + + " NOCACHE" + " NOCYCLE;"; List statementList = SQLUtils.parseStatements(sql, DbType.mysql); @@ -62,7 +62,7 @@ public class MySqlCreateSequenceTest1 extends OracleTest { public void test_1() throws Exception { String sql = // - "CREATE SIMPLE SEQUENCE customers_seq" + // + "CREATE SIMPLE SEQUENCE customers_seq" + " WITH CACHE;"; List statementList = SQLUtils.parseStatements(sql, DbType.mysql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java index ccc0ec9e3..2bfd01949 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateSequenceTest3.java @@ -198,5 +198,4 @@ public class MySqlCreateSequenceTest3 extends TestCase { } return null; } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java index d80df6e43..5ffd336bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateServerTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java index 61e4466bc..f33fc0f6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableSpaceTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java index b0bd50225..3459fc405 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTableUnitTest.java @@ -55,5 +55,4 @@ public class MySqlCreateTableUnitTest extends MysqlTest { } System.out.println(strBuilder.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java index 066249713..36084ba66 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_refactor_test.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -73,5 +72,4 @@ public class MySqlCreateTable_refactor_test extends MysqlTest { "TBPARTITION BY hash(b) TBPARTITIONS 4", SQLUtils.toMySqlString(statementList.get(0))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java index 56c5eb37a..29654aa9e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_repository_test.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { private SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); - public void test_0() throws Exception { repository.console("use sc00;"); @@ -51,7 +50,6 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { " KEY `k_d` (`c_char`,`c_bigint`)\n" + ") ENGINE=InnoDB AUTO_INCREMENT=1769503 DEFAULT CHARSET=utf8mb4 COMMENT='10000000'"; - repository.console(sql); MySqlCreateTableStatement createTableStmt = (MySqlCreateTableStatement) repository.findTable("test1").getStatement(); @@ -185,7 +183,6 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { repository.console("show create table test1") ); - assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + @@ -257,7 +254,6 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| c_longblob | longblob | YES | | NULL | |\n" + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n", repository.console("show columns from test1")); - repository.console("ALTER TABLE test1 DROP INDEX uk_a;"); assertEquals(18, createTableStmt.getTableElementList().size()); @@ -507,11 +503,10 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_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") + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1") ); - repository.console(" alter table test1 change c_tinyint c_tinyint_x tinyint(4) DEFAULT '1' COMMENT 'tinyint x' first;"); assertEquals("CREATE TABLE test1 (\n" + @@ -533,8 +528,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_longblob longblob COMMENT 'longblob',\n" + "\tKEY k_c (c_tinyint_x, c_int)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console(" alter table test1 drop c_tinyint_x"); @@ -556,8 +551,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_longblob longblob COMMENT 'longblob',\n" + "\tKEY k_c (c_int)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console(" alter table test1 add index name_idx(c_char,c_date);"); @@ -580,9 +575,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_longblob longblob COMMENT 'longblob',\n" + "\tKEY k_c (c_int),\n" + "\tINDEX name_idx(c_char, c_date)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); - + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + @@ -603,10 +597,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| c_text | text | YES | | NULL | |\n" + "| c_mediumtext | mediumtext | YES | | NULL | |\n" + "| c_longblob | longblob | YES | | NULL | |\n" + - "+--------------+--------------+------+-----+---------------------+-----------------------------+\n" - - , repository.console("show columns from test1")); - + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n", + repository.console("show columns from test1")); repository.console(" drop index name_idx on test1"); @@ -628,8 +620,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_longblob longblob COMMENT 'longblob',\n" + "\tKEY k_c (c_int)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("alter table test1 modify c_char char(32) after id"); @@ -651,8 +643,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_longblob longblob COMMENT 'longblob',\n" + "\tKEY k_c (c_int)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + @@ -673,10 +665,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| c_text | text | YES | | NULL | |\n" + "| c_mediumtext | mediumtext | YES | | NULL | |\n" + "| c_longblob | longblob | YES | | NULL | |\n" + - "+--------------+--------------+------+-----+---------------------+-----------------------------+\n" - - , repository.console("show columns from test1")); - + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n", + repository.console("show columns from test1")); repository.console("alter table test1 add CONSTRAINT unique name4_idx(id); "); @@ -699,9 +689,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| c_text | text | YES | | NULL | |\n" + "| c_mediumtext | mediumtext | YES | | NULL | |\n" + "| c_longblob | longblob | YES | | NULL | |\n" + - "+--------------+--------------+------+-----+---------------------+-----------------------------+\n" - - , repository.console("show columns from test1")); + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n", + repository.console("show columns from test1")); repository.console("alter table test1 add FULLTEXT name4_idx_c_longblob(c_longblob); "); @@ -725,9 +714,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tKEY k_c (c_int),\n" + "\tUNIQUE name4_idx (id),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); - + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("alter table test1 add key name5_idx(c_bigint); "); @@ -752,8 +740,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tUNIQUE name4_idx (id),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("alter table test1 drop index name4_idx"); assertEquals("CREATE TABLE test1 (\n" + @@ -776,9 +764,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("alter table test1 add primary key name5_pk(c_bigint); "); assertEquals("CREATE TABLE test1 (\n" + @@ -802,9 +789,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint),\n" + "\tPRIMARY KEY (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("alter table test1 drop primary key;"); assertEquals("CREATE TABLE test1 (\n" + @@ -827,9 +813,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("GRANT ALL PRIVILEGES ON *.* TO 'idbtmp_1208408_9'@'%' IDENTIFIED BY PASSWORD '*5E8A11FF574FCBC6440EB285D490AEE96B16E250' WITH GRANT OPTION"); @@ -855,10 +840,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint),\n" + "\tUNIQUE KEY name_idx_23 (c_char(10))\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1")); - + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); assertEquals("+--------------+--------------+------+-----+---------------------+-----------------------------+\n" + "| Field | Type | Null | Key | Default | Extra |\n" + @@ -879,9 +862,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| c_text | text | YES | | NULL | |\n" + "| c_mediumtext | mediumtext | YES | | NULL | |\n" + "| c_longblob | longblob | YES | | NULL | |\n" + - "+--------------+--------------+------+-----+---------------------+-----------------------------+\n" - - , repository.console("show columns from test1")); + "+--------------+--------------+------+-----+---------------------+-----------------------------+\n", + repository.console("show columns from test1")); repository.console("alter table test1 drop c_char;"); assertEquals("CREATE TABLE test1 (\n" + @@ -903,19 +885,16 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1")); repository.console("rename table test1 to test1_xx"); - assertEquals("ERROR 1146 (42S02): Table 'test1' doesn't exist\n" + assertEquals("ERROR 1146 (42S02): Table 'test1' doesn't exist\n", + repository.console("show create table test1")); - , repository.console("show create table test1")); - - assertEquals("ERROR 1146 (42S02): Table 'test1' doesn't exist\n" - - , repository.console("show columns from test1")); + assertEquals("ERROR 1146 (42S02): Table 'test1' doesn't exist\n", + repository.console("show columns from test1")); assertEquals("CREATE TABLE test1_xx (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + @@ -936,10 +915,8 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tKEY k_c (c_int),\n" + "\tFULLTEXT INDEX name4_idx_c_longblob(c_longblob),\n" + "\tKEY name5_idx (c_bigint)\n" + - ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'" - - , repository.console("show create table test1_xx")); - + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000'", + repository.console("show create table test1_xx")); assertEquals("CREATE TABLE test5 (\n" + "\tc_decimal_1 INT(11) NOT NULL DEFAULT NULL,\n" + @@ -959,17 +936,14 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "\tc_text text COMMENT 'text',\n" + "\tc_mediumtext mediumtext COMMENT 'mediumtext',\n" + "\tc_longblob longblob COMMENT 'longblob'\n" + - ")" - - , repository.console("show create table test5")); + ")", + repository.console("show create table test5")); repository.console("create table test5(fid bigint)"); assertEquals("CREATE TABLE test5 (\n" + "\tfid bigint\n" + - ")" - - , repository.console("show create table test5")); - + ")", + repository.console("show create table test5")); repository.console("CREATE TABLE tddl5_00.ljh_test1(be_id VARCHAR(20) NOT NULL DEFAULT '' COMMENT '企业标识')ENGINE = InnoDB, CHARACTER SET = utf8, COMMENT = '应用层-汇总销售及销售毛利表'"); @@ -977,7 +951,7 @@ public class MySqlCreateTable_showColumns_repository_test extends MysqlTest { "| Field | Type | Null | Key | Default | Extra |\n" + "+-------+-------------+------+-----+---------+-------+\n" + "| be_id | VARCHAR(20) | NO | | '' | |\n" + - "+-------+-------------+------+-----+---------+-------+\n" - , repository.console("show columns from tddl5_00.ljh_test1")); + "+-------+-------------+------+-----+---------+-------+\n", + repository.console("show columns from tddl5_00.ljh_test1")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java index 0a5eb17c5..93c62ab5d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_showColumns_test.java @@ -49,14 +49,12 @@ public class MySqlCreateTable_showColumns_test extends MysqlTest { " KEY `k_d` (`c_char`,`c_bigint`)\n" + ") ENGINE=InnoDB AUTO_INCREMENT=1769503 DEFAULT CHARSET=utf8mb4 COMMENT='10000000'"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); assertEquals(1, statementList.size()); MySqlCreateTableStatement stmt = (MySqlCreateTableStatement) statementList.get(0); - StringBuilder buf = new StringBuilder(); stmt.showColumns(buf); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java index 610427171..47b188d4a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTable_storage_type_test.java @@ -120,5 +120,4 @@ public class MySqlCreateTable_storage_type_test extends MysqlTest { "\tKEY `k_d` (`c_char`, `c_bigint`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 STORAGE_POLICY = 'hot' COMMENT '10000000'", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java index 9d7418479..1b4c56d1b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.create; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -44,5 +43,4 @@ public class MySqlCreateTriggerTest extends MysqlTest { assertEquals(1, statementList.size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java index 7cbec430c..ffe28295a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest2.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.create; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -44,5 +43,4 @@ public class MySqlCreateTriggerTest2 extends MysqlTest { assertEquals(1, statementList.size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java index b24aefe1b..a4916e3c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest3.java @@ -46,5 +46,4 @@ public class MySqlCreateTriggerTest3 extends MysqlTest { "\tVALUES (old.col1, old.col1 + 5, old.col1 + 7);\n" + "END;", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java index 0cae55e34..60fcc3930 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest4.java @@ -40,5 +40,4 @@ public class MySqlCreateTriggerTest4 extends MysqlTest { "INSERT INTO log_table\n" + "VALUES (concat('inserted into table test.t2 values: (1c, _) = (', CAST(NEW.col1 AS char(100)), ', ', convertToSqlNode(new.`_`, char(100)), ')'));", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java index 7ec1cf046..b3546e6a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateTriggerTest5.java @@ -46,5 +46,4 @@ public class MySqlCreateTriggerTest5 extends MysqlTest { "\tVALUES ('txxx', new.object_id, 'UPDATE');\n" + "END", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java index 0f4fd66d1..b84b5e7fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java index 737038882..25b6751f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java index 30d820c77..1da7281fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java index ea3e6c7f3..bf84fda94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java index 0ad0bfdf5..8de05c175 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,5 @@ public class MySqlCreateUserTest_5 extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java index 84af07f42..6cb370e4f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_6.java @@ -27,7 +27,6 @@ public class MySqlCreateUserTest_6 extends MysqlTest { assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // SQLUtils.toMySqlString(stmt)); - } public void test_1() throws Exception { @@ -37,7 +36,6 @@ public class MySqlCreateUserTest_6 extends MysqlTest { assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // SQLUtils.toMySqlString(stmt)); - } public void test_2() throws Exception { @@ -47,7 +45,5 @@ public class MySqlCreateUserTest_6 extends MysqlTest { assertEquals("CREATE USER 'jeffrey'@'localhost' IDENTIFIED BY 'password';", // SQLUtils.toMySqlString(stmt)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java index 643dfa1f1..88e0b47ce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateUserTest_7.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java index ee8afd173..184562f7b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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" + // + String sql = "CREATE OR REPLACE VIEW view_name AS\n" + + "SELECT fname\n" + + "FROM table_name\n" + "WHERE fid = ?"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java index 94fb02023..21bf61a35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java index cb7c4c8f2..ddbed5d4b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java index 64b129b21..b45de719d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest3.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java index 65f0035dd..22df2e08a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest4.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java index 1a7079548..0298ff1bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateViewTest5.java @@ -86,7 +86,7 @@ public class MySqlCreateViewTest5 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("t2", "l_suppkey"))); } public void test_1() throws Exception { - String sql="CREATE ALGORITHM=UNDEFINED " + + String sql = "CREATE ALGORITHM=UNDEFINED " + "DEFINER=`root`@`%` " + "SQL SECURITY DEFINER VIEW `test_view` AS \n" + "select `t1`.`US_USERID` AS `US_USERID`, `t1`.`US_USERNAME` AS `US_USERNAME` from `test_userinfo` `t1`"; @@ -132,5 +132,4 @@ public class MySqlCreateViewTest5 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("test_userinfo", "US_USERID"))); assertTrue(visitor.getColumns().contains(new Column("test_userinfo", "US_USERNAME"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCeateTableTest34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCeateTableTest34.java index 577181b40..815ecb6a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCeateTableTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCeateTableTest34.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -23,7 +22,7 @@ public class MySqlCeateTableTest34 extends TestCase { " \"attr_value\" varchar(500) NOT NULL COMMENT '扩展属性value',\n" + " PRIMARY KEY (\'id\'),\n" + " KEY \"idx_item_type_kv\" (\"item_id\",\"type\",\"attr_key\",\"attr_value\"(191))\n" + - ")"; // + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java index 154f36da3..d27189552 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -52,7 +51,6 @@ public class MySqlCreateTableTest extends MysqlTest { // 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'," @@ -85,7 +83,6 @@ public class MySqlCreateTableTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); } - public void test_2() throws Exception { String sql = "create table t2 as select * from t1"; @@ -123,7 +120,6 @@ public class MySqlCreateTableTest extends MysqlTest { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - } public void test_create_table_without_as_2() throws Exception { //https://dev.mysql.com/doc/refman/8.0/en/create-table-select.html @@ -143,6 +139,5 @@ public class MySqlCreateTableTest extends MysqlTest { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java index bb7284c5c..4433bf679 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest1.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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))" + // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + " ENGINE = MEMORY;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java index d4079de7d..cbb1748e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest10.java @@ -22,19 +22,18 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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)" + // + 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)" + " )"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java index 790bf13c4..1cdf44083 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest100.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -42,4 +41,4 @@ public class MySqlCreateTableTest100 extends MysqlTest { "\tCONSTRAINT FOREIGN KEY `fk_test` (`queue_id`) REFERENCES `test` (`id`)\n" + ") ENGINE = INNODB", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java index e04379367..df55bfdd0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest101_geometry.java @@ -22,4 +22,4 @@ public class MySqlCreateTableTest101_geometry extends MysqlTest { "\tg GEOMETRY NOT NULL\n" + ");", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java index 96c29241e..c5d8766e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest102.java @@ -148,4 +148,4 @@ public class MySqlCreateTableTest102 extends MysqlTest { "\tKEY `kdx_instance_all_dim` (`kp`, `port`, `db`, `logical_table`, `physical_table`, `sql_type`, `hashcode`, `scope`, `time`) COMMENT 'index_ins_perf_all_6519'\n" + ") ENGINE = XENGINE AUTO_INCREMENT = 339181584 CHARSET = utf8mb4 COMMENT 'sql_ins_perf'", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java index 35fdcba56..847912b41 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest103.java @@ -55,4 +55,4 @@ public class MySqlCreateTableTest103 extends MysqlTest { "\tKEY `Grantor` (`Grantor`)\n" + ") ENGINE = MyISAM CHARSET = utf8 COLLATE = utf8_bin COMMENT 'Procedure privileges'", stmt.clone().toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java index dabf701e5..e9d41eb52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest104.java @@ -36,4 +36,4 @@ public class MySqlCreateTableTest104 extends MysqlTest { + "PARTITION BY KEY (column_0) PARTITION NUM 0\n" + "TABLEGROUP gg", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java index 58210f820..dad03fb9d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest105.java @@ -35,4 +35,4 @@ public class MySqlCreateTableTest105 extends MysqlTest { + ")\n" + "OPTIONS (UPDATETYPE = 'realtime') COMMENT ''", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java index 9e65be76f..0ce5ef99b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest106.java @@ -28,4 +28,4 @@ public class MySqlCreateTableTest106 extends MysqlTest { "\tKEY `Grantor` (`Grantor`)\n" + ") ENGINE = MyISAM CHARSET = utf8 COLLATE = utf8_bin COMMENT 'Procedure privileges'", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java index 4df66b3fe..256ceea2a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest107.java @@ -58,4 +58,4 @@ public class MySqlCreateTableTest107 extends MysqlTest { + "SUBPARTITION OPTIONS (available_Partition_Num = 100)\n" + "TABLEGROUP aliolap152578dbopt_tg1;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java index f458f1f35..d0f66ffc6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_drds.java @@ -4,8 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -37,4 +35,4 @@ public class MySqlCreateTableTest108_drds extends MysqlTest { "DBPARTITION BY HASH(SUBS_ORDER_ID)\n" + "TBPARTITION BY UNI_HASH(PART_ID) TBPARTITIONS 12;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java index 21b80fc69..5282f34ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest108_error.java @@ -3,9 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.ParserException; public class MySqlCreateTableTest108_error extends MysqlTest { @@ -24,4 +21,4 @@ public class MySqlCreateTableTest108_error extends MysqlTest { assertNotNull(error); assertEquals("illegal name, pos 31, line 3, column 1, token DELETE", error.getMessage()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java index 2e9250153..7b04662a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest11.java @@ -21,18 +21,17 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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`)" + // + 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;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java index a67137d07..11e6ea4a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest110_drds.java @@ -24,5 +24,4 @@ public class MySqlCreateTableTest110_drds extends MysqlTest { "DBPARTITION BY hash(id) DBPARTITIONS 2\n" + "TBPARTITION BY hash(id) TBPARTITIONS 2", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java index 5910c89a1..6cea893b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest111_ann.java @@ -26,4 +26,4 @@ public class MySqlCreateTableTest111_ann extends MysqlTest { "\tfeature ARRAY ANNINDX (type = 'FLAT,FLAT_INDEX', DISTANCE = 'DotProduct', RTTYPE = 'FLAT')\n" + ")", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java index 22e690b49..4ce026c95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java @@ -47,5 +47,4 @@ public class MySqlCreateTableTest112 extends MysqlTest { assertTrue(column.isPrimaryKey()); assertEquals(Types.INTEGER, column.jdbcType()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java index b14d5df8b..5e67d1f9d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest113_drds.java @@ -56,4 +56,4 @@ public class MySqlCreateTableTest113_drds extends MysqlTest { "DBPARTITION BY YYYYMM_NOLOOP(create_time)\n" + "TBPARTITION BY YYYYMM_NOLOOP(create_time) BETWEEN 20160108 AND 20170108;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java index 97a7f174a..7b2a08468 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest114.java @@ -39,5 +39,4 @@ public class MySqlCreateTableTest114 extends MysqlTest { assertFalse(column.isPrimaryKey()); assertEquals(Types.TIMESTAMP, column.jdbcType()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java index 4cfd5b628..4657bc811 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest115.java @@ -82,5 +82,4 @@ public class MySqlCreateTableTest115 extends MysqlTest { .getStatement() .toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java index 10b56f957..12eb6bca0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest116.java @@ -1,15 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -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.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.repository.SchemaRepository; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -25,12 +19,9 @@ public class MySqlCreateTableTest116 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10)\n" + ") BROADCAST ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } public void test_1() throws Exception { @@ -55,7 +46,6 @@ public class MySqlCreateTableTest116 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `t1` (\n" + "\t`id` int NOT NULL,\n" + "\t`e_id` varchar(45) COLLATE utf8_bin NOT NULL,\n" + @@ -70,8 +60,5 @@ public class MySqlCreateTableTest116 extends MysqlTest { "\tKEY `index_m1_id` (m_id1(10)),\n" + "\tINDEX `index_m2_id`(m_id2(30))\n" + ") ENGINE = InnoDB CHARSET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java index 07cf00bcf..83d078300 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest117.java @@ -18,12 +18,9 @@ public class MySqlCreateTableTest117 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10) AUTO_INCREMENT\n" + ") ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } public void test_0() throws Exception { @@ -36,12 +33,9 @@ public class MySqlCreateTableTest117 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10) AUTO_INCREMENT BY GROUP\n" + ") AUTO_INCREMENT = 12313 ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } public void test_1() throws Exception { @@ -54,12 +48,9 @@ public class MySqlCreateTableTest117 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10) AUTO_INCREMENT BY SIMPLE\n" + ") ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } public void test_2() throws Exception { @@ -72,12 +63,9 @@ public class MySqlCreateTableTest117 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10) AUTO_INCREMENT BY SIMPLE WITH CACHE\n" + ") ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } public void test_3() throws Exception { @@ -90,12 +78,8 @@ public class MySqlCreateTableTest117 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS `Employee` (\n" + "\tid int(10) AUTO_INCREMENT BY TIME\n" + ") ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java index 58596e4fa..3eba49511 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest118.java @@ -21,13 +21,11 @@ public class MySqlCreateTableTest118 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sal_emp (\n" + "\tname int,\n" + "\tpay_by_quarter int[],\n" + "\tschedule long[256]\n" + ");", stmt.toString()); - } public void test_1() throws Exception { @@ -43,13 +41,10 @@ public class MySqlCreateTableTest118 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sal_emp (\n" + "\tname int,\n" + "\tpay_by_quarter ARRAY,\n" + "\tschedule ARRAY(256)\n" + ");", stmt.toString()); - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java index 2bbdfa4ba..aca7f7412 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest119_ann.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex; import com.alibaba.druid.util.JdbcConstants; @@ -46,4 +45,4 @@ public class MySqlCreateTableTest119_ann extends MysqlTest { assertEquals("IVF", idx.getAlgorithm()); assertEquals("ANN", idx.getIndexType()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java index 4c2f52663..f07b6f124 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest12.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java index cb0053af5..64fdd3484 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest120.java @@ -22,13 +22,11 @@ public class MySqlCreateTableTest120 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sal_emp (\n" + "\tname int AUTO_INCREMENT UNIT COUNT 2 INDEX 1 STEP 0,\n" + "\tpay_by_quarter int[],\n" + "\tschedule long[256]\n" + ");", stmt.toString()); - } public void test_1() throws Exception { @@ -44,13 +42,11 @@ public class MySqlCreateTableTest120 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sal_emp (\n" + "\tname int PRIMARY KEY AUTO_INCREMENT UNIT COUNT 666 INDEX 8 STEP 11110,\n" + "\tpay_by_quarter ARRAY,\n" + "\tschedule ARRAY(256)\n" + ");", stmt.toString()); - } public void test_2() throws Exception { @@ -67,14 +63,12 @@ public class MySqlCreateTableTest120 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sal_emp (\n" + "\tname int AUTO_INCREMENT UNIT COUNT 666 INDEX 8 STEP 11110,\n" + "\tpay_by_quarter ARRAY,\n" + "\tschedule ARRAY(256),\n" + "\tPRIMARY KEY (name)\n" + ");", stmt.toString()); - } public void test_3() throws Exception { @@ -91,14 +85,11 @@ public class MySqlCreateTableTest120 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sch1.sal_emp (\n" + "\tname int AUTO_INCREMENT UNIT COUNT 666 INDEX 8 STEP 11110,\n" + "\tpay_by_quarter ARRAY,\n" + "\tschedule ARRAY(256),\n" + "\tPRIMARY KEY (name)\n" + ");", stmt.toString()); - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java index a19dda4ad..c521ccf95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest121_fulltext.java @@ -115,5 +115,4 @@ public class MySqlCreateTableTest121_fulltext extends MysqlTest { assertFalse(column.isPrimaryKey()); assertEquals(Types.BIGINT, column.jdbcType()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java index 087f6e1c7..e03676193 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest122_ads.java @@ -17,7 +17,6 @@ public class MySqlCreateTableTest122_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE cache_table_1\n" + "OPTIONS (cache = true)\n" + "AS\n" + @@ -25,8 +24,5 @@ public class MySqlCreateTableTest122_ads extends MysqlTest { "SELECT *\n" + "FROM test_realtime1\n" + "LIMIT 200;", stmt.toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java index c04923913..1e6a1b392 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest125_drds.java @@ -1,12 +1,12 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; -import java.util.List; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import java.util.List; + public class MySqlCreateTableTest125_drds extends MysqlTest { public void test_0() throws Exception { String sql = "CREATE TABLE t_order (\n" + @@ -29,7 +29,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { 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" + @@ -43,7 +42,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { "\tUNIQUE GLOBAL `g_i_buyer` (`buyer_id`) COVERING (order_snapshot) DBPARTITION BY hash(`buyer_id`)\n" + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", stmt.toString()); - } public void test_1() throws Exception { @@ -65,7 +63,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { 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" @@ -79,7 +76,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { + "(`seller_id`) TBPARTITIONS 3\n" + ") ENGINE = InnoDB CHARSET = utf8\n" + "DBPARTITION BY hash(`order_id`);", stmt.toString()); - } public void test_2() throws Exception { @@ -101,7 +97,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { 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" @@ -115,7 +110,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { + " 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 { @@ -143,7 +137,6 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { + "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 { @@ -178,7 +171,5 @@ public class MySqlCreateTableTest125_drds extends MysqlTest { + " 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java index feaea4c3a..cac07ae46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126.java @@ -28,7 +28,6 @@ public class MySqlCreateTableTest126 extends MysqlTest { 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" @@ -36,8 +35,5 @@ public class MySqlCreateTableTest126 extends MysqlTest { + "\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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java index 04b256911..74ed22055 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest126_drds.java @@ -24,7 +24,6 @@ public class MySqlCreateTableTest126_drds extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE xx\n" + "DBPARTITION BY hash(name1)\n" + "TBPARTITION BY hash(name2) TBPARTITIONS 4\n" + @@ -33,8 +32,5 @@ public class MySqlCreateTableTest126_drds extends MysqlTest { "\tDBPARTITION yyy BY KEY('def') TBPARTITION yyy BY KEY('def'), \n" + "\tDBPARTITION yyy BY KEY('gpk')\n" + ")", stmt.toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java index ab744cd6d..62daf0522 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest127_ads_ann.java @@ -25,7 +25,6 @@ public class MySqlCreateTableTest127_ads_ann extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE adl_new_retail.adl_sec_verify_face (\n" + "\tid varchar NOT NULL COMMENT '',\n" + "\txid varchar NOT NULL COMMENT '',\n" + @@ -42,8 +41,5 @@ public class MySqlCreateTableTest127_ads_ann extends MysqlTest { "OPTIONS (UPDATETYPE = 'realtime') COMMENT 'verify photos'\n" + "PARTITION BY HASH (ComSubStr(xid, face_oss)) PARTITION NUM 16\n" + "TABLEGROUP deepvision;", stmt.toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java index b233d9290..4d2331efb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest128_quote.java @@ -29,7 +29,6 @@ public class MySqlCreateTableTest128_quote extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE \"linxi_test\".\"linxi_subpart11\" (\n" + "\t\"id\" BIGINT NOT NULL COMMENT '',\n" + "\t\"int_test\" BIGINT NOT NULL COMMENT '',\n" + @@ -41,8 +40,5 @@ public class MySqlCreateTableTest128_quote extends MysqlTest { "SUBPARTITION BY LIST (\"subcol\" BIGINT)\n" + "SUBPARTITION OPTIONS (available_Partition_Num = 100)\n" + "TABLEGROUP group2", stmt.toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java index c52b0dff1..5a6219146 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest129_ads.java @@ -18,7 +18,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE cache_table_1\n" + "OPTIONS (cache = true)\n" + "AS\n" + @@ -26,10 +25,8 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { "SELECT *\n" + "FROM test_realtime1\n" + "LIMIT 200;", stmt.toString()); - } - public void test_1() throws Exception { String sql = "CREATE TABLE employees (\n" + " id INT NOT NULL,\n" + @@ -49,7 +46,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE employees (\n" + "\tid INT NOT NULL,\n" + "\tfname VARCHAR(30),\n" + @@ -61,7 +57,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { ")\n" + "PARTITION BY HASH KEY(id)\n" + "TABLEGROUP group0;", stmt.toString()); - } public void test_2() throws Exception { @@ -91,7 +86,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE employees (\n" + "\tid INT NOT NULL,\n" + "\tfname VARCHAR(30),\n" + @@ -110,10 +104,8 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { "\tPARTITION p3 VALUES LESS THAN MAXVALUE\n" + ")\n" + "TABLEGROUP group0;", stmt.toString()); - } - public void test_3() throws Exception { String sql = "CREATE TABLE employees (\n" + " id INT NOT NULL,\n" + @@ -140,7 +132,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE employees (\n" + "\tid INT NOT NULL,\n" + "\tfname VARCHAR(30),\n" + @@ -159,7 +150,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { "\tPARTITION pCentral VALUES IN (7, 8, 15, 16)\n" + ")\n" + "TABLEGROUP group0;", stmt.toString()); - } public void test_4() throws Exception { @@ -189,7 +179,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE employees (\n" + "\tid INT NOT NULL,\n" + "\tfname VARCHAR(30),\n" + @@ -209,7 +198,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { "\tPARTITION pCentral VALUES IN (7, 8, 15, 16)\n" + ")\n" + "TABLEGROUP group0;", stmt.toString()); - } public void test_create_table_as() { @@ -228,7 +216,6 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { ");", stmt.toString()); } - public void test_create_table_new() { String sql = "select label from t"; @@ -236,6 +223,4 @@ public class MySqlCreateTableTest129_ads extends MysqlTest { System.out.println(statement.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java index 6333e53c6..2124fef49 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest13.java @@ -20,22 +20,21 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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`)" + // + 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;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java index 7540f61eb..2b8009572 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest130_ads.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -30,7 +29,6 @@ public class MySqlCreateTableTest130_ads extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS hm_crm.crm_wdk_hm_store_poi_di (\n" + "\tshop_id BIGINT COMMENT '店铺id',\n" + "\tpoi_type BIGINT COMMENT '0：家 1： 工作',\n" + @@ -42,8 +40,5 @@ public class MySqlCreateTableTest130_ads extends MysqlTest { "SUBPARTITION BY LIST KEY (biz_date) \n" + "SUBPARTITION OPTIONS (available_partition_num = 1)\n" + "TABLEGROUP crm_platform_filter", stmt.toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java index c727f64ae..b8ddca1ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest131_drds.java @@ -22,7 +22,6 @@ public class MySqlCreateTableTest131_drds extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE shard_hot_test_table (\n" + "\tid int(11) NOT NULL AUTO_INCREMENT BY GROUP,\n" + "\tname varchar(30) DEFAULT NULL,\n" + @@ -41,6 +40,4 @@ public class MySqlCreateTableTest131_drds extends MysqlTest { assertNotNull(id); assertTrue(id.isPrimaryKey()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java index cc46906b5..486446ecc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest132_drds_primaryKey.java @@ -17,16 +17,11 @@ public class MySqlCreateTableTest132_drds_primaryKey extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE gxw_test_87 (\n" + "\tid int,\n" + "\tname varchar(20),\n" + "\tPRIMARY KEY (id, name)\n" + ")\n" + "DBPARTITION BY hash(id);", stmt.toString()); - - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java index 5bae1883e..0bc761231 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest133_drds_gsi.java @@ -1,16 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import static org.junit.Assert.*; -import org.junit.Test; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import org.apache.commons.lang3.StringUtils; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; public class MySqlCreateTableTest133_drds_gsi extends MysqlTest { // Constraint XXX may not show in parsed sql, so removed it. @@ -129,5 +127,4 @@ public class MySqlCreateTableTest133_drds_gsi extends MysqlTest { System.out.println(GSI_DEFINITIONS.size() + " CREATE TABLE statement success!"); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java index 1fb26949e..ade96a3bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest134.java @@ -21,7 +21,6 @@ public class MySqlCreateTableTest134 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE xuhan3 (\n" + "\tid int NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" + "\tname char(40),\n" + @@ -37,8 +36,5 @@ public class MySqlCreateTableTest134 extends MysqlTest { "\tSimpleDate_dayofweek tinyint(4) generated always as (dayofweek(SimpleDate)) virtual,\n" + "\tkey SimpleDate_dayofweek (SimpleDate_dayofweek)\n" + ");", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135.java index 53c822b6f..6825cd209 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; -import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,7 +25,6 @@ public class MySqlCreateTableTest135 extends TestCase { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE MQ_TOPIC_RECORD (\n" + "\tTOPIC_ID bigint(11) NOT NULL,\n" + "\tBROKENNAME national VARCHAR(50),\n" + @@ -38,6 +36,5 @@ public class MySqlCreateTableTest135 extends TestCase { "\tBROKENNAME national VARCHAR(50),\n" + "\tBROKENNAME2 national CHAR(50)\n" + ");", stmt.toLowerCaseString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java index 8424182a8..76892f8ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest135_isString.java @@ -29,8 +29,5 @@ public class MySqlCreateTableTest135_isString extends MysqlTest { assertTrue(item.getDataType().isString()); } - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java index 8869a42ea..a4480d38f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest136.java @@ -23,7 +23,6 @@ public class MySqlCreateTableTest136 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `c1` (\n" + "\t`id` bigint NOT NULL AUTO_INCREMENT,\n" + "\t`d` int DEFAULT 1,\n" + @@ -39,8 +38,5 @@ public class MySqlCreateTableTest136 extends MysqlTest { "\tprimary key (`id`),\n" + "\tkey idxa2 (`d`, `b`) comment '2'\n" + ");", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java index 4965b8176..d6cc8ae16 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest137.java @@ -20,7 +20,6 @@ public class MySqlCreateTableTest137 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `c1` (\n" + "\torder bigint\n" + ");", stmt.toString()); @@ -31,18 +30,13 @@ public class MySqlCreateTableTest137 extends MysqlTest { SQLUtils.parseSingleMysqlStatement("insert into w (order) values (1)"); SQLUtils.parseSingleMysqlStatement("select order from w1 where order = 1"); - } - public void test_1() throws Exception { SQLUtils.parseSingleMysqlStatement("create table order (fid bigint)"); SQLUtils.parseSingleMysqlStatement("insert into order (f1) values (1)"); SQLStatement stmt = SQLUtils.parseSingleMysqlStatement("/*+engine=mpp*/select f1 from pt_dc.order where f1 = 1"); List hints = stmt.getHeadHintsDirect(); System.out.println(hints); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java index 602dcf702..904a3413c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest138.java @@ -1,8 +1,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -42,7 +40,6 @@ public class MySqlCreateTableTest138 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `t_push_branch3` (\n" + "\t`id` varchar(50) NOT NULL COMMENT '主键id',\n" + "\t`waybill_no` varchar(50) DEFAULT NULL COMMENT '运单号',\n" + @@ -122,8 +119,5 @@ public class MySqlCreateTableTest138 extends MysqlTest { "\tpartition PMAX values less than maxvalue\n" + "\t\tstorage engine InnoDB\n" + ");", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java index c1078aa43..9cfee030a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest139.java @@ -17,7 +17,6 @@ public class MySqlCreateTableTest139 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE IF NOT EXISTS simiao_alter_partition2 (\n" + "\tid int,\n" + "\tid2 int,\n" + @@ -67,8 +66,5 @@ public class MySqlCreateTableTest139 extends MysqlTest { "\tpartition p13 values less than maxvalue\n" + ")\n" + "dbpartition by hash(id) dbpartitions 4;", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java index d82401ebc..2d7ef0d81 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest14.java @@ -21,20 +21,19 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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" + // + 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=''"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java index be82e15f4..6659cd2bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest140.java @@ -17,7 +17,6 @@ public class MySqlCreateTableTest140 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE foo\n" + "AS\n" + "SELECT *\n" + @@ -29,8 +28,5 @@ public class MySqlCreateTableTest140 extends MysqlTest { "select *\n" + "from t\n" + "with no data", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java index 21f4e2d96..aebf8fd94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest141.java @@ -23,7 +23,6 @@ public class MySqlCreateTableTest141 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sbtest1 (\n" + "\tid INTEGER UNSIGNED NOT NULL,\n" + "\tk INTEGER UNSIGNED NOT NULL DEFAULT '0',\n" + @@ -43,8 +42,5 @@ public class MySqlCreateTableTest141 extends MysqlTest { ")\n" + "dbpartition by hash(id)\n" + "tbpartition by hash(id) tbpartitions 2", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java index 7449c8af1..b09d31ad5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest142.java @@ -36,7 +36,6 @@ public class MySqlCreateTableTest142 extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `think_member_discount` (\n" + "\t`id` bigint,\n" + "\t`uid` bigint,\n" + @@ -82,8 +81,5 @@ public class MySqlCreateTableTest142 extends MysqlTest { "options (updateType = 'realtime')\n" + "partition by hash key(id) partition num 128\n" + "tablegroup mkzhan", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java index 93d84af2f..a06301e80 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest143_position.java @@ -40,7 +40,6 @@ public class MySqlCreateTableTest143_position extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `resume_position_portrait` (\n" + "\t`resume_id` varchar(36) NOT NULL,\n" + "\t`method` varchar(50) NOT NULL,\n" + @@ -80,7 +79,5 @@ public class MySqlCreateTableTest143_position extends MysqlTest { ") engine = InnoDB charset = utf8mb4\n" + "dbpartition by hash(`resume_id`)\n" + "tbpartition by hash(`resume_id`) tbpartitions 4", stmt.toLowerCaseString()); - - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java index d84b52f20..1dc98ad49 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest144_three_backtick.java @@ -36,7 +36,6 @@ public class MySqlCreateTableTest144_three_backtick extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `dbn_product_album_info` (\n" + "\t`id` bigint(20) NOT NULL AUTO_INCREMENT,\n" + "\t`position` int(11) DEFAULT '9999',\n" + @@ -64,8 +63,5 @@ public class MySqlCreateTableTest144_three_backtick extends MysqlTest { "\tconstraint `FKDECFEBD949942C0` foreign key (`album_id`) references `dbn_product_album` (`id`),\n" + "\tconstraint `FKDECFEBDE7B82325` foreign key (`product_id`) references `dbn_products` (`id`)\n" + ") engine = InnoDB auto_increment = 317607 charset = utf8 collate = utf8_bin", stmt.toLowerCaseString()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java index 1f2fdc56f..4e16622b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest145_tail_hint.java @@ -52,7 +52,6 @@ public class MySqlCreateTableTest145_tail_hint extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `log_fake` (\n" + "\t`id` varchar(37) NOT NULL COMMENT 'uuid',\n" + "\t`merchant_id` varchar(37) DEFAULT NULL COMMENT '商户id',\n" + @@ -112,7 +111,5 @@ public class MySqlCreateTableTest145_tail_hint extends MysqlTest { " PARTITION p201811 VALUES LESS THAN (1543593600000) ENGINE = InnoDB,\n" + " PARTITION p201812 VALUES LESS THAN (1546272000000) ENGINE = InnoDB,\n" + " PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */", stmt.toLowerCaseString()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java index 0aa43755d..cb20eff92 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest146_col_def.java @@ -104,5 +104,4 @@ public class MySqlCreateTableTest146_col_def extends TestCase { "\ta varchar(10) collate utf8_general_ci not null primary key comment 'hh' as ('val') stored references tb_ref (a)\n" + ");", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java index 4469b8e8b..61d4df14e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext.java @@ -36,5 +36,4 @@ public class MySqlCreateTableTest147_fulltext extends TestCase { "\tfulltext index(b)\n" + ");", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java index a4bc2ad19..f81c3eabb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext2.java @@ -38,5 +38,4 @@ public class MySqlCreateTableTest147_fulltext2 extends TestCase { ")\n" + "distribute by hash(`id`);", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java index a1fe56fce..33dbce8ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest147_fulltext3.java @@ -102,5 +102,4 @@ public class MySqlCreateTableTest147_fulltext3 extends TestCase { ")\n" + "DISTRIBUTE BY HASH(`id`);", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java index d369716bb..55c47fb01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest148_national_char.java @@ -38,5 +38,4 @@ public class MySqlCreateTableTest148_national_char extends TestCase { "\tcol_wqq national varchar(128)\n" + ") comment 'comment'", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java index f4a9126bc..6421b3b67 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest149_collate_before_generated.java @@ -38,5 +38,4 @@ public class MySqlCreateTableTest149_collate_before_generated extends TestCase { "\tcol_oxqagw int generated always as (1 + 2) collate utf8_unicode_ci\n" + ")", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java index 12e572d9c..845159488 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest15.java @@ -20,24 +20,23 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;" + // + 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;" + ""; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java index 92d0ef4dd..789200774 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest150_eunm_set_with_charset.java @@ -54,5 +54,4 @@ public class MySqlCreateTableTest150_eunm_set_with_charset extends TestCase { "\t`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" + ") min_rows = 1 checksum = 1 compression = 'NONE'", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java index 6577fb1b5..47f8219a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest151_double_precision.java @@ -34,5 +34,4 @@ public class MySqlCreateTableTest151_double_precision extends TestCase { "\t`col_mcdw` double precision(10, 2)\n" + ")", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java index 7198fe287..3d64da904 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest152_table_options.java @@ -123,5 +123,4 @@ public class MySqlCreateTableTest152_table_options extends TestCase { "\ta int\n" + ") auto_increment = 2 avg_row_length = 2 character set = utf8 checksum = 1 collate = utf8_unicode_ci compression = 'NONE' connection = 'conn' data directory = 'path' delay_key_write = 0 encryption = 'Y' engine = innodb insert_method = first key_block_size = 64 max_rows = 999 min_rows = 1 pack_keys = 0 password = 'psw' row_format = fixed stats_auto_recalc = 1 stats_persistent = 0 stats_sample_pages = 2 tablespace `tbs_name` union = (tb1, tb2, tb3) comment 'hehe';", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java index 1d57962d9..72930fbe2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest153_collate.java @@ -42,7 +42,6 @@ public class MySqlCreateTableTest153_collate extends MysqlTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `t_file` (\n" + "\t`id` BIGINT(20) NOT NULL AUTO_INCREMENT,\n" + "\t`account_id` VARCHAR(32) COLLATE 'utf8mb4_bin' NULL DEFAULT '0' COMMENT '账户id',\n" + @@ -94,8 +93,5 @@ public class MySqlCreateTableTest153_collate extends MysqlTest { ") collate = 'utf8mb4_bin' engine = InnoDB\n" + "dbpartition by hash(`src_file_id`)\n" + "tbpartition by hash(`src_file_id`) tbpartitions 2", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java index 702b40b06..328400a40 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest154_hint.java @@ -25,7 +25,6 @@ public class MySqlCreateTableTest154_hint assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE `ngram_2_t1_1` (\n" + "\t`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,\n" + "\t`title` varchar(200) DEFAULT NULL,\n" + @@ -43,8 +42,5 @@ public class MySqlCreateTableTest154_hint "\tfulltext key `ft_content` (`content`),\n" + "\tfulltext key `ft_title` (`title`)\n" + ") engine = InnoDB auto_increment = 3 charset = gb2312", stmt.toLowerCaseString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java index 82db43534..f15bebee8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest155.java @@ -2,10 +2,7 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlCreateTableTest155 extends MysqlTest { @@ -26,4 +23,4 @@ public class MySqlCreateTableTest155 assertTrue(stmt.isPrimaryColumn("id")); assertTrue(stmt.isPrimaryColumn("`id`")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java index 744abd712..7996074a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest156_ob.java @@ -35,4 +35,4 @@ public class MySqlCreateTableTest156_ob "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`) KEY_BLOCK_SIZE = 16384\n" + ") AUTO_INCREMENT = 1000001 CHARSET = utf8mb4 COMPRESSION = 'lz4_1.0' REPLICA_NUM = 3 BLOCK_SIZE = 16384 USE_BLOOM_FILTER = false TABLET_SIZE = 134217728 PCTFREE = 10 COMMENT 'ar平台数据排行榜';", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java index 60dfd20b8..2c4a4a46e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest157_shadow.java @@ -40,4 +40,4 @@ public class MySqlCreateTableTest157_shadow extends MysqlTest { "\tKEY `idx_ranking` (`user_id`, `scene_code`, `record_type`, `record_date`) KEY_BLOCK_SIZE = 16384\n" + ") AUTO_INCREMENT = 1000001 CHARSET = utf8mb4;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java index 2abd34f9f..a57533150 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest158_asselect.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import org.junit.Test; - 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;"; @@ -389,4 +388,4 @@ public class MySqlCreateTableTest158_asselect extends MysqlTest { ") INDEX_ALL = 'Y' COMMENT 'a'\n" + "DISTRIBUTE BY HASH(`o_id`)"); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java index 11c994a75..854407011 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest159.java @@ -1,8 +1,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; public class MySqlCreateTableTest159 extends MysqlTest { @@ -46,4 +44,4 @@ public class MySqlCreateTableTest159 // assertTrue(stmt.isPrimaryColumn("id")); // assertTrue(stmt.isPrimaryColumn("`id`")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java index a9681492e..f406f4298 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest16.java @@ -21,24 +21,23 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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;" + // + 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;" + ""; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java index 42147b5c6..07972aca7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest160.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLTableLike; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; - public class MySqlCreateTableTest160 extends MysqlTest { public void test_0() throws Exception { //for ADB @@ -32,4 +31,4 @@ public class MySqlCreateTableTest160 extends MysqlTest { "\td DATE\n" + ")", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java index c3a58f6a9..cb05e3884 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest161_storage_policy.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.parser.ParserException; - public class MySqlCreateTableTest161_storage_policy extends MysqlTest { public void test_0() throws Exception { //for ADB @@ -75,4 +74,4 @@ public class MySqlCreateTableTest161_storage_policy extends MysqlTest { } } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest162_distributed_by_with_duplicate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest162_distributed_by_with_duplicate.java index fb00e8a0f..35fc44230 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest162_distributed_by_with_duplicate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest162_distributed_by_with_duplicate.java @@ -4,10 +4,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.sql.visitor.VisitorFeature; - public class MySqlCreateTableTest162_distributed_by_with_duplicate extends MysqlTest { public void test_0() throws Exception { String sql = "CREATE TABLE `test_user` ( `id` int(11) NOT NULL AUTO_INCREMENT ) DISTRIBUTE BY DUPLICATE(g1,g2);"; @@ -25,5 +23,4 @@ public class MySqlCreateTableTest162_distributed_by_with_duplicate extends Mysql assertEquals(sql, SQLUtils.toSQLString(stmt, DbType.mysql, new SQLUtils.FormatOption( VisitorFeature.OutputDistributedLiteralInCreateTableStmt, VisitorFeature.OutputUCase))); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java index 44c0fe6c8..507c756d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest17.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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)" + // + String sql = "CREATE TABLE t1 (" + + " ts TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6)" + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java index 2f2ab3ed8..9bf904d7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest18.java @@ -20,44 +20,43 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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" + // + 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); -// print(statementList); + // print(statementList); assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); statemen.accept(visitor); -// System.out.println("Tables : " + visitor.getTables()); + // 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("coditions : " + visitor.getConditions()); + // System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); assertEquals(12, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java index b26240e8a..6ca55c6e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest19.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -53,6 +52,5 @@ public class MySqlCreateTableTest19 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java index a8a292315..d7ca1b343 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java index 1a3b640db..6267ea3ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest20.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -48,6 +47,5 @@ public class MySqlCreateTableTest20 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java index 2dc7b6a9e..6e287edf1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest21.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -48,6 +47,5 @@ public class MySqlCreateTableTest21 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("new_tbl"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java index 7388a8f0b..59d1aa823 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest22.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 " + // + String sql = "CREATE TABLE t1 (" + + "c1 INT STORAGE DISK," + + "c2 INT STORAGE MEMORY " + ") TABLESPACE ts_1 ENGINE NDB;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -54,10 +53,9 @@ public class MySqlCreateTableTest22 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE t1 (" + // - "\n\tc1 INT STORAGE DISK," + // - "\n\tc2 INT STORAGE MEMORY" + // + assertEquals("CREATE TABLE t1 (" + + "\n\tc1 INT STORAGE DISK," + + "\n\tc2 INT STORAGE MEMORY" + "\n) TABLESPACE ts_1 ENGINE = NDB;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java index c10f1fc66..5156f4e9c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest23.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " ENGINE = MEMORY;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest23 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) ENGINE = MEMORY;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java index 8e42b892b..8b6579cbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest24.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " AVG_ROW_LENGTH = 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest24 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) AVG_ROW_LENGTH = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java index d345aa8ca..5496b8167 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest25.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " AVG_ROW_LENGTH 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest25 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) AVG_ROW_LENGTH = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java index ab4b77603..2efbb480a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest26.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " MAX_ROWS 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest26 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) MAX_ROWS = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java index 902d1282f..966005a13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest27.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " MAX_ROWS = 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest27 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) MAX_ROWS = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java index a5387d149..3cdfcef8d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest28.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " MIN_ROWS = 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest28 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) MIN_ROWS = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java index e43d60f43..3109ce5c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest29.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE user" + + " (id INT, INDEX USING BTREE (id))" + + " MIN_ROWS 1024;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest29 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("user"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE user (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE user (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) MIN_ROWS = 1024;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java index 9b5313f3e..34d4ce231 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest3.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java index a334c0c11..b226d1249 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest30.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " DELAY_KEY_WRITE 0;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest30 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) DELAY_KEY_WRITE = 0;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java index 026aa3a12..be726ee9a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest31.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " DELAY_KEY_WRITE = 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest31 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) DELAY_KEY_WRITE = 1;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java index 60c87dc50..105476a9b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest32.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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';"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " DATA DIRECTORY = 'aaa';"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest32 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) DATA DIRECTORY = 'aaa';", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java index 99e30d63e..14277d0dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest33.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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';"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " CONNECTION = 'aaa';"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest33 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) CONNECTION = 'aaa';", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java index 7fa681028..a8b5317a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest34.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " CHECKSUM = 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest34 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) CHECKSUM = 1;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java index f760bc53f..e84a1fbaf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest35.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " AUTO_INCREMENT = 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest35 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) AUTO_INCREMENT = 1;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java index 0d61acdc6..f9e391f31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest36.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " STATS_AUTO_RECALC = 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest36 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) STATS_AUTO_RECALC = 1;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java index ef85a15e3..a8d1c4363 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest37.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " STATS_AUTO_RECALC DEFAULT;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest37 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) STATS_AUTO_RECALC = DEFAULT;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java index df430ab84..903934853 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest38.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " STATS_PERSISTENT DEFAULT;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest38 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) STATS_PERSISTENT = DEFAULT;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java index 052ab1f78..cdccfaad9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest39.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " STATS_PERSISTENT 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,10 +52,9 @@ public class MySqlCreateTableTest39 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) STATS_PERSISTENT = 1;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java index b34556e3f..9c1a6799b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest4.java @@ -21,18 +21,17 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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), " + // + 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))"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java index c9cbad5ae..994bb4fce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest40.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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);"; // + String sql = "CREATE TABLE t1 (col1 INT, col2 CHAR(5))" + + " PARTITION BY HASH(col1);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,11 +51,10 @@ public class MySqlCreateTableTest40 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE t1 (" + // - "\n\tcol1 INT," + // - "\n\tcol2 CHAR(5)" + // + assertEquals("CREATE TABLE t1 (" + + "\n\tcol1 INT," + + "\n\tcol2 CHAR(5)" + "\n)" + "\nPARTITION BY HASH (col1);", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java index dba9b0477..d49026616 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest41.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + String sql = "CREATE TABLE tk (col1 INT, col2 CHAR(5), col3 DATE)" + + " PARTITION BY LINEAR KEY(col3)" + + " PARTITIONS 5;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -53,12 +52,11 @@ public class MySqlCreateTableTest41 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("tk"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE tk (" + // - "\n\tcol1 INT," + // - "\n\tcol2 CHAR(5)," + // - "\n\tcol3 DATE" + // + assertEquals("CREATE TABLE tk (" + + "\n\tcol1 INT," + + "\n\tcol2 CHAR(5)," + + "\n\tcol3 DATE" + "\n)" + "\nPARTITION BY LINEAR KEY (col3) PARTITIONS 5;", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java index ee152e5cf..27fff5e6e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest42.java @@ -21,22 +21,21 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // - ");"; // + 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)" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -70,6 +69,5 @@ public class MySqlCreateTableTest42 extends MysqlTest { "\tPARTITION p2 VALUES LESS THAN (MAXVALUE, 15),\n" + "\tPARTITION p3 VALUES LESS THAN (MAXVALUE, MAXVALUE)\n" + ");", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java index 3a5b0442b..6554ac809 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest43.java @@ -21,22 +21,21 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // - ");"; // + 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)" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -70,6 +69,5 @@ public class MySqlCreateTableTest43 extends MysqlTest { "\tPARTITION r2 VALUES IN (3, 7, 11, 15, 19, 23),\n" + "\tPARTITION r3 VALUES IN (4, 8, 12, 16, 20, 24)\n" + ");", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java index aea4f8a71..4caf5e0a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest44.java @@ -21,22 +21,21 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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) )" + // - ");"; // + 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) )" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -70,6 +69,5 @@ public class MySqlCreateTableTest44 extends MysqlTest { "\tPARTITION p2 VALUES IN ((1, 0), (2, 0), (2, 1), (3, 0), (3, 1)),\n" + "\tPARTITION p3 VALUES IN ((1, 3), (2, 2), (2, 3), (3, 2), (3, 3))\n" + ");", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java index 7fb360845..40c3c1131 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest45.java @@ -21,28 +21,27 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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'" + // - ");"; // + 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'" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); @@ -85,6 +84,5 @@ public class MySqlCreateTableTest45 extends MysqlTest { "\t\tDATA DIRECTORY '/var/appdata/98/data'\n" + "\t\tINDEX DIRECTORY '/var/appdata/98/idx'\n" + ");", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java index ab15c6df3..f2681f433 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest46.java @@ -21,13 +21,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static 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;"; // + String sql = "CREATE TABLE lookup" + + " (id INT, INDEX USING BTREE (id))" + + " STATS_PERSISTENT 1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -47,10 +46,9 @@ public class MySqlCreateTableTest46 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("lookup"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE lookup (" + // - "\n\tid INT," + // - "\n\tINDEX USING BTREE(id)" + // + assertEquals("CREATE TABLE lookup (" + + "\n\tid INT," + + "\n\tINDEX USING BTREE(id)" + "\n) STATS_PERSISTENT = 1", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java index 275175837..5a8600efd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest47.java @@ -21,17 +21,16 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static 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(); @@ -59,6 +58,5 @@ public class MySqlCreateTableTest47 extends MysqlTest { + "\n\tICONURL VARCHAR(255),"// + "\n\tPRIMARY KEY (ID)"// + "\n)", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java index 74cdfbc46..a2352ef89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest48.java @@ -21,18 +21,17 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; public class MySqlCreateTableTest48 extends MysqlTest { public void test_0() throws Exception { - String sql = "CREATE TABLE AO_E8B6CC_REPO_TO_CHANGESET (" // + 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"; // + + ") ENGINE=InnoDB"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -61,8 +60,7 @@ public class MySqlCreateTableTest48 extends MysqlTest { + "\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",// + + "\n) ENGINE = InnoDB", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java index 9efe33e38..d0346c58c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest49.java @@ -21,11 +21,10 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; public class MySqlCreateTableTest49 extends MysqlTest { public void test_0() throws Exception { - String sql = " create table tauth (" // + String sql = " create table tauth (" + " cid varchar(36) not null unique,"// + " cdesc varchar(200),"// + " cname varchar(100) not null,"// @@ -33,7 +32,7 @@ public class MySqlCreateTableTest49 extends MysqlTest { + " curl varchar(200),"// + " cpid varchar(36),"// + " primary key (cid)"// - + " )"; // + + " )"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -53,7 +52,7 @@ public class MySqlCreateTableTest49 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("tauth"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE tauth (" // + assertEquals("CREATE TABLE tauth (" + "\n\tcid varchar(36) NOT NULL UNIQUE,"// + "\n\tcdesc varchar(200),"// + "\n\tcname varchar(100) NOT NULL,"// @@ -61,8 +60,7 @@ public class MySqlCreateTableTest49 extends MysqlTest { + "\n\tcurl varchar(200),"// + "\n\tcpid varchar(36),"// + "\n\tPRIMARY KEY (cid)"// - + "\n)",// + + "\n)", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java index e417d87fa..cc10055c0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest5.java @@ -21,17 +21,16 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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`)" + // + 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;"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java index e7cffe910..089886122 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest50.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; public class MySqlCreateTableTest50 extends MysqlTest { public void test_0() throws Exception { - String sql = "CREATE TABLE `test`.`a` (" // + String sql = "CREATE TABLE `test`.`a` (" + " `ida` INT NOT NULL COMMENT 'aaa' ,"// + " PRIMARY KEY (`ida`) )"// - + " COMMENT = 'bb';"; // + + " COMMENT = 'bb';"; MySqlStatementParser parser = new MySqlStatementParser(sql); SQLStatement stmt = parser.parseCreateTable(); @@ -48,11 +47,10 @@ public class MySqlCreateTableTest50 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("test.a"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE `test`.`a` (" // + assertEquals("CREATE TABLE `test`.`a` (" + "\n\t`ida` INT NOT NULL COMMENT 'aaa',"// + "\n\tPRIMARY KEY (`ida`)"// - + "\n) COMMENT 'bb'",// + + "\n) COMMENT 'bb'", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java index 9da8f6ba4..1cc689a2a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest51.java @@ -21,12 +21,11 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; public class MySqlCreateTableTest51 extends MysqlTest { public void test_0() throws Exception { - String sql = "CREATE TABLE `test` (" // - + "`Id` int(11) NOT NULL," // + 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"; @@ -49,11 +48,10 @@ public class MySqlCreateTableTest51 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); // System.out.println(output); - assertEquals("CREATE TABLE `test` (" // + 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",// + + "\n) ENGINE = InnoDB CHARSET = gbk", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java index 4187f95ac..a92cce7b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest52.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; public class MySqlCreateTableTest52 extends MysqlTest { public void test_0() throws Exception { @@ -54,7 +53,7 @@ public class MySqlCreateTableTest52 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE TABLE `ins_ebay_auth` ("// - + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\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授权码',"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java index 28b3026f4..b3c690b14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest53.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest53 extends MysqlTest { @@ -56,7 +55,7 @@ public class MySqlCreateTableTest53 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE TABLE `ins_ebay_auth` ("// - + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\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授权码',"// @@ -98,7 +97,7 @@ public class MySqlCreateTableTest53 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE TABLE `ins_ebay_auth` ("// - + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\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授权码',"// @@ -141,7 +140,7 @@ public class MySqlCreateTableTest53 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE TABLE `ins_ebay_auth` ("// - + "\n\t`auth_id` int(10) NOT NULL AUTO_INCREMENT COMMENT '主键id'," // + + "\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授权码',"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java index 9fc72e99a..666a2e3a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest54.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest54 extends MysqlTest { @@ -45,7 +44,6 @@ public class MySqlCreateTableTest54 extends MysqlTest { String output = SQLUtils.toMySqlString(stmt); assertEquals("CREATE TABLE t1 (" + "\n\tyear YEAR(4)," + "\n\tmonth INT(2) UNSIGNED ZEROFILL," + "\n\tday INT(2) UNSIGNED ZEROFILL" + "\n)", output); - } @Test @@ -159,5 +157,4 @@ public class MySqlCreateTableTest54 extends MysqlTest { + "\n) engine = InnoDB charset = utf8", output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java index d7ae49e41..681f27751 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest55.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest55 extends MysqlTest { @@ -43,10 +42,9 @@ public class MySqlCreateTableTest55 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE tableA (" // - + "\n\tdatasn varchar(100) NOT NULL," // - + "\n\tPRIMARY KEY (datasn)" // + assertEquals("CREATE TABLE tableA (" + + "\n\tdatasn varchar(100) NOT NULL," + + "\n\tPRIMARY KEY (datasn)" + "\n) ENGINE = MRG_MyISAM CHARSET = utf8 UNION = (tableB)", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java index 23126f791..727bbb2bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest56.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest56 extends MysqlTest { @@ -44,16 +43,16 @@ public class MySqlCreateTableTest56 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE tableA (" // - + "\n\tdatasn varchar(100) NOT NULL," // - + "\n\tPRIMARY KEY (datasn)" // + assertEquals("CREATE TABLE tableA (" + + "\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); - assertEquals("create table tableA (" // - + "\n\tdatasn varchar(100) not null," // - + "\n\tprimary key (datasn)" // + assertEquals("create table tableA (" + + "\n\tdatasn varchar(100) not null," + + "\n\tprimary key (datasn)" + "\n) engine = MRG_MyISAM charset = utf8 union = (tableB, tableC)", output); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java index 96ace3196..9f32c9947 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest57.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest57 extends MysqlTest { @@ -54,7 +53,6 @@ public class MySqlCreateTableTest57 extends MysqlTest { + "\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); - } @Test @@ -87,6 +85,5 @@ public class MySqlCreateTableTest57 extends MysqlTest { + "\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); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java index 86849f889..202c7fa63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest58.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest58 extends MysqlTest { @@ -46,58 +45,58 @@ public class MySqlCreateTableTest58 extends MysqlTest { { String output = SQLUtils.toMySqlString(stmt); - 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" + // + 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); } { String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - 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" + // + 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); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java index d2c9fe1af..934c87f24 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest59.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest59 extends MysqlTest { @@ -35,10 +34,9 @@ public class MySqlCreateTableTest59 extends MysqlTest { stmt.accept(visitor); String output = SQLUtils.toMySqlString(stmt); - assertEquals("CREATE TABLE t3 (" // - + "\n\ta long," // - + "\n\tb long byte" // + assertEquals("CREATE TABLE t3 (" + + "\n\ta long," + + "\n\tb long byte" + "\n)", output); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java index 1fae29eb1..d49b850c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest6.java @@ -22,20 +22,19 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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" + // + 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" + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java index 1066ae4f2..ffb0c6484 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest60.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest60 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java index b19c44fe3..0f6119965 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest61.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest61 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java index d0e961e55..cc403a408 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest62.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest62 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java index f1c97eed9..909a3dc84 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest63.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest63 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java index 8f65ca988..c132e034f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest64.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest64 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java index b25201e4e..673967f7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest65.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest65 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java index d2078e0d2..9584f8d77 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest66.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest66 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java index f749be560..274cc56cf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest67.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest67 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java index 93c020327..0b062287d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest68.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest68 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java index fc31a191a..220cd95b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest69.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest69 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java index 380d5e93b..cd58ee764 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest7.java @@ -22,19 +22,18 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStateme import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; 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" + // + 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" + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java index 5201c5210..961e836c1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest70.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest70 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java index 480733cbe..d2cb1a963 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest71.java @@ -21,15 +21,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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," // - + "gmt_create datetime not null comment '创建时间'," // - + "gmt_modified datetime not null comment '修改时间', " // + String sql = "create table xx (id bigint unsigned not null comment 'aa' auto_increment," + + "gmt_create datetime not null comment '创建时间'," + + "gmt_modified datetime not null comment '修改时间', " + "primary key (id)) comment='re'"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java index a729049c4..a4fb9a0d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest72.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest72 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java index b697b31d0..02e20b8c9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest73.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest73 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java index 0b16d226d..7653644d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest74.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest74 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java index c23ea84cb..f7a615a4f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest75.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest75 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java index 818e1eb2c..ec3234bc4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest76.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import org.junit.Test; public class MySqlCreateTableTest76 extends MysqlTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java index c9fc42221..bf3235895 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest8.java @@ -22,20 +22,19 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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" + // + 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" + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java index d43a61848..c7a0c2ada 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest84.java @@ -139,7 +139,7 @@ public class MySqlCreateTableTest84 extends MysqlTest { "\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")); + ") ENGINE = InnoDB AUTO_INCREMENT = 1769503 CHARSET = utf8mb4 COMMENT '10000000';", + repository.console("show create table test")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java index 718b1bf23..6e1912ab3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest9.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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" + // + String sql = "CREATE VIEW v AS\n" + + "SELECT ProductID,ProductName\n" + + "FROM Products\n" + "WHERE Discontinued=No"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java index e501ebf7d..27b4b6a56 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest91.java @@ -3,13 +3,12 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; 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)) " + // + 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)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -20,12 +19,12 @@ public class MySqlCreateTableTest91 extends MysqlTest { } public void test_1() 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 " + // - "SUBPARTITION BY LINEAR KEY ALGORITHM=2 (id, sid) SUBPARTITIONS 2 " + // - "(PARTITION p0 (SUBPARTITION s0, SUBPARTITION s1), " + // - "PARTITION p1 (SUBPARTITION s0, SUBPARTITION s1), " + // - "PARTITION p2 (SUBPARTITION s0, SUBPARTITION s1), " + // + String sql = "CREATE TABLE tbl_name(id int, sid int, name varchar(8)) " + + "PARTITION BY LINEAR KEY ALGORITHM=2 (id, sid) PARTITIONS 4 " + + "SUBPARTITION BY LINEAR KEY ALGORITHM=2 (id, sid) SUBPARTITIONS 2 " + + "(PARTITION p0 (SUBPARTITION s0, SUBPARTITION s1), " + + "PARTITION p1 (SUBPARTITION s0, SUBPARTITION s1), " + + "PARTITION p2 (SUBPARTITION s0, SUBPARTITION s1), " + "PARTITION p3 (SUBPARTITION s0, SUBPARTITION s1))"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -34,4 +33,4 @@ public class MySqlCreateTableTest91 extends MysqlTest { assertEquals(1, statementList.size()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java index 7d8320679..d281fa22f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest92.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -23,6 +22,5 @@ public class MySqlCreateTableTest92 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals(3, statemen.getTableElementList().size()); assertEquals("`c_set` set('a', 'b', 'c') COMMENT 'set'", SQLUtils.toMySqlString(statemen.getTableElementList().get(1))); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java index 12e3a0780..65b9bd1ee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest93.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.mysql.createTable; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -64,4 +63,4 @@ public class MySqlCreateTableTest93 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals(44, stmt.getTableElementList().size()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java index aa2e1af3c..d2ce2bdd4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest94.java @@ -27,4 +27,4 @@ public class MySqlCreateTableTest94 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals(4, stmt.getTableElementList().size()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java index 0e690a757..1f57251d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest95.java @@ -28,4 +28,4 @@ public class MySqlCreateTableTest95 extends MysqlTest { "\tPRIMARY KEY (`id`)\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 1DEFAULT CHARSET = utf8mb4", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java index b7d4690ed..ed56a2ab7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest96_set.java @@ -23,4 +23,4 @@ public class MySqlCreateTableTest96_set extends MysqlTest { "\tname set('a', 'b', 'c') NOT NULL DEFAULT 'a'\n" + ");", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java index 0da4eee23..138348edf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest97.java @@ -52,4 +52,4 @@ public class MySqlCreateTableTest97 extends MysqlTest { "\tCONSTRAINT `gsp_order2_details_ibfk_2` FOREIGN KEY (`creator_id`) REFERENCES `gsp_sys_users` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION\n" + ") ENGINE = InnoDB AUTO_INCREMENT = 84608 CHARSET = utf8", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java index 62ba1d2af..4d5a03577 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest98_keyword.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlCreateTableTest98_keyword extends MysqlTest { "\tcolumn_list text,\n" + "\tsql text\n" + ")", stmt.toString()); - } public void test_1() throws Exception { @@ -57,7 +55,6 @@ public class MySqlCreateTableTest98_keyword extends MysqlTest { "\tcolumn_list text,\n" + "\tsql text\n" + ")", stmt.toString()); - } public void test_2() throws Exception { @@ -82,7 +79,6 @@ public class MySqlCreateTableTest98_keyword extends MysqlTest { "\tcolumn_list text,\n" + "\tsql text\n" + ")", stmt.toString()); - } public void test_3() throws Exception { @@ -117,7 +113,6 @@ public class MySqlCreateTableTest98_keyword extends MysqlTest { "\tcreate_time timestamp,\n" + "\tupdate_time timestamp\n" + ")", stmt.toString()); - } public void test_4() throws Exception { @@ -142,6 +137,5 @@ public class MySqlCreateTableTest98_keyword extends MysqlTest { "\tPRIMARY KEY (Host, Db, User),\n" + "\tKEY User (User)\n" + ") ENGINE = MyISAM CHARSET = utf8 COLLATE = utf8_bin COMMENT 'Database privileges'", stmt.toString()); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java index dc5a86d61..7f5ee9240 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest99.java @@ -36,4 +36,4 @@ public class MySqlCreateTableTest99 extends MysqlTest { "\tPRIMARY KEY (`id`)\n" + ") ENGINE = INNODB AUTO_INCREMENT = 10 AVG_ROW_LENGTH = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci CHECKSUM = 0 COMPRESSION = 'NONE' CONNECTION = 'connect_string' DELAY_KEY_WRITE = 0 ENCRYPTION = 'N' INSERT_METHOD = FIRST MAX_ROWS = 1000 MIN_ROWS = 10 PACK_KEYS = DEFAULT PASSWORD = '12345678' STATS_AUTO_RECALC = 0 STATS_PERSISTENT = 0 STATS_SAMPLE_PAGES = 10", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java index 0f46a87a2..afade81b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class MySql_Create_Function_0 extends MysqlTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java index ecd4ccbc9..08ce79d88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/create_function/MySql_Create_Function_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class MySql_Create_Function_1 extends MysqlTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java index 290abdc2b..f69cee7fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlDropDatabaseTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP DATABASE sonar"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java index 49195f69e..0de432645 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropDatabaseTest2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java index 6b6e28f05..20d149578 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropFunctionTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlDropFunctionTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP FUNCTION function_name"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java index beeeb30c2..d64c95497 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class MySqlDropIndexTest extends MysqlTest { public void test_0() throws Exception { String sql = "drop index index_name on table_name "; @@ -52,6 +50,5 @@ public class MySqlDropIndexTest extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("table_name"))); TableStat tableStat = visitor.getTables().get(new TableStat.Name("table_name")); assertEquals(1, tableStat.getDropIndexCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java index 76cc16851..6c749671e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest1.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -51,6 +50,5 @@ public class MySqlDropIndexTest1 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t1"))); TableStat tableStat = visitor.getTables().get(new TableStat.Name("t1")); assertEquals(1, tableStat.getDropIndexCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java index 2abd8c080..4437b38eb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropIndexTest2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -53,6 +52,5 @@ public class MySqlDropIndexTest2 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); TableStat tableStat = visitor.getTables().get(new TableStat.Name("t2")); assertEquals(1, tableStat.getDropIndexCount()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java index af4679f96..822ce193f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropProcedureTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlDropProcedureTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP PROCEDURE IF EXISTS sp_name"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java index 5b980e57d..15755e1e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class MySqlDropTableTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP TABLE IF EXISTS B,C,A;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java index c6d93552f..5615c7125 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTableTest_1_hints.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java index bf3798ba3..6b4f8e3e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespace.java @@ -17,11 +17,8 @@ package com.alibaba.druid.bvt.sql.mysql.drop; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLDropIndexStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -51,6 +48,5 @@ public class MySqlDropTablespace extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java index eb1da639d..5dfa7c0f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTablespaceTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlDropTablespaceTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP TABLESPACE tablespace_name"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java index 32947ede3..870548846 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java index 6b566ffa8..beff3af9a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropUserTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlDropUserTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP USER 'jeffrey'@'localhost';"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java index c533a1726..d3abb246f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropViewTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLDropViewStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class MySqlDropViewTest extends MysqlTest { public void test_0() throws Exception { String sql = "DROP VIEW view_name"; @@ -50,6 +48,5 @@ public class MySqlDropViewTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("view_name"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java index abca0fc32..41af0e25e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java index 29dd68216..dbf8bd122 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java index 76d2bbb17..8279fe957 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_10.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java index 8213d43fb..c63db7914 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_11.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java index 4649204c8..e20b834bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_13.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java index 815f52763..557c2a6d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_14.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java index 0990e2fe8..759380e7f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_15.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java index 5dcb6cc21..224c3d079 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_16.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java index 5ef739943..bab6debaf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_17.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java index d4204bc1e..f26fb3e27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_18.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java index fe9a386b6..84f52eba5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_19.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java index 63997a4b3..e1bd1f29e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java index 36a8df35f..24f916da2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_20.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java index 6f7100ae4..7d1f8d57f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_21.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,7 @@ public class MySqlGrantTest_21 extends MysqlTest { // 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java index 79bda26c5..8a0d5236e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_22.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,7 @@ public class MySqlGrantTest_22 extends MysqlTest { // 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java index dc0486978..39d9090ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_23.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java index 04da1aa4b..a3829f502 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_24.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java index 67d4324a4..05b8af492 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_25.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java index aa8260bae..948928c07 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_26.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -45,7 +44,6 @@ public class MySqlGrantTest_26 extends MysqlTest { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_1() throws Exception { @@ -63,6 +61,5 @@ public class MySqlGrantTest_26 extends MysqlTest { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java index e6ae6b27a..5e639e12a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_27.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java index 5c3c0cae5..1d2e1a722 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_28.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java index 17695fa8a..c9250781e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_29.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java index c0924c66e..c168034af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java index fad52e960..a0b50b8d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_30.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java index 47a204a3f..42dc2c4c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_31.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java index 8792d0654..dcf60acd5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_32.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java index ed208a4c1..da9db3d4f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_33.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java index e628d1eeb..89d303833 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_34.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLGrantStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java index 1f8597138..668f57598 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_35.java @@ -174,5 +174,4 @@ public class MySqlGrantTest_35 extends MysqlTest { assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java index 9e4a2cbf5..5066ef9cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_36.java @@ -81,5 +81,4 @@ public class MySqlGrantTest_36 extends MysqlTest { } assertNotNull(error); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java index c083588d9..af495d303 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_37.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -37,5 +36,4 @@ public class MySqlGrantTest_37 extends MysqlTest { assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java index 7f9990e40..87781eb5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java index 508aca5ec..7d2de1e7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java index 35dbe90eb..0762eea1a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_6.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java index 15fb5dd43..e14fa5138 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_7.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java index 9661cbe6b..65271ec9e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_8.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java index 786b5565b..6a2adcf32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_9.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java index d811beb65..24dc3f2fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlGrantTest_ads.java @@ -150,7 +150,6 @@ public class MySqlGrantTest_ads extends MysqlTest { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_6() throws Exception { @@ -287,7 +286,6 @@ public class MySqlGrantTest_ads extends MysqlTest { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_doc_0() throws Exception { @@ -341,5 +339,4 @@ public class MySqlGrantTest_ads extends MysqlTest { assertEquals("GRANT DESCRIBE, SELECT(col1, col2) ON db_name.table_name TO 'ALIYUN$account_name';", // stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java index 89a37868c..0d0bd6a46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/grant/MySqlRevokeTest_ads_1.java @@ -143,7 +143,5 @@ public class MySqlRevokeTest_ads_1 extends MysqlTest { stmt.toString()); assertEquals("show grants for 'user'@'localhost'", // stmt.toLowerCaseString()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java index cf35142df..1e88ae634 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_0.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; @@ -26,25 +22,27 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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" + // + 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')"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java index 77bbbca05..b2b8d70b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_1.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlInsertTest_1 extends MysqlTest { public void test_0() throws Exception { String sql = "INSERT INTO tbl_name () VALUES();"; @@ -43,7 +41,7 @@ public class MySqlInsertTest_1 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO tbl_name" + // + assertEquals("INSERT INTO tbl_name" + "\nVALUES ();", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java index 178966b70..233f0ebf0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_10.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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');"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java index 562d7d38b..df56fcdd2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_11.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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')"; @@ -50,5 +48,4 @@ public class MySqlInsertTest_11 extends MysqlTest { + "\nVALUES ('a1', 'b1')"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java index ddcc1cda3..871033649 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_12.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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')"; @@ -50,5 +48,4 @@ public class MySqlInsertTest_12 extends MysqlTest { + "\nVALUES ('A\\0\\0\\0B')"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java index 8c364f6bf..365c30655 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_13.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -49,5 +48,4 @@ public class MySqlInsertTest_13 extends MysqlTest { "VALUES (?, ?)"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java index c5cf11b06..3bd3ca2d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_14.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -54,5 +53,4 @@ public class MySqlInsertTest_14 extends MysqlTest { "ON DUPLICATE KEY UPDATE ts = UNIX_TIMESTAMP()"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java index b8d92f44f..5ee83da25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_15.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -56,5 +55,4 @@ public class MySqlInsertTest_15 extends MysqlTest { "VALUES (1, 2);"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java index e4e4daf5b..b5f0f9be0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_16_hint.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -56,5 +55,4 @@ public class MySqlInsertTest_16_hint extends MysqlTest { "VALUES (load_file('sompath'), 'str1', 2);"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java index 08139e0aa..7bb83dd8b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_17.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -80,5 +79,4 @@ public class MySqlInsertTest_17 extends MysqlTest { ") x"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java index 102077b99..6a2a9bbcc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_18_alias.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -39,5 +38,4 @@ public class MySqlInsertTest_18_alias extends MysqlTest { "VALUES ('abc')"; assertEquals(formatSql, SQLUtils.toMySqlString(insertStmt)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java index 9b779339e..5fe9a0cb8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlInsertTest_2 extends MysqlTest { public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (col1,col2) VALUES(15,col1*2);"; @@ -43,7 +41,7 @@ public class MySqlInsertTest_2 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO tbl_name (col1, col2)" + // + assertEquals("INSERT INTO tbl_name (col1, col2)" + "\nVALUES (15, col1 * 2);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java index 4288fe741..20c370645 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_25_time.java @@ -51,7 +51,5 @@ public class MySqlInsertTest_25_time extends MysqlTest { assertEquals("INSERT INTO DB1.TB2 (col1, col2, col3)\n" + "VALUES (1, TIMESTAMP '2019-01-01:12:12:21', '3')", SQLUtils.toMySqlString(insertStmt)); - - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java index 8ffb23a0e..8f854a3b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_26_special.java @@ -52,8 +52,6 @@ public class MySqlInsertTest_26_special extends MysqlTest { assertEquals("INSERT INTO SUNTEST (ID, NAME)\n" + "VALUES (1, '\\_ASDFASDF')", SQLUtils.toMySqlString(insertStmt)); - - } public void test_insert_special_1() throws Exception { @@ -80,8 +78,5 @@ public class MySqlInsertTest_26_special extends MysqlTest { assertEquals("INSERT INTO SUNTEST (ID, NAME)\n" + "VALUES (1, 'Y\"''')", SQLUtils.toMySqlString(insertStmt)); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java index dc19b7101..f02acd4ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlInsertTest_3 extends MysqlTest { public void test_0() throws Exception { String sql = "INSERT INTO tbl_name (col1,col2) VALUES(col2*2,15);"; @@ -43,7 +41,7 @@ public class MySqlInsertTest_3 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO tbl_name (col1, col2)" + // + assertEquals("INSERT INTO tbl_name (col1, col2)" + "\nVALUES (col2 * 2, 15);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java index b4356c624..ca1baae5d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_36.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; -import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; @@ -58,7 +57,6 @@ public class MySqlInsertTest_36 extends TestCase { assertEquals("INSERT INTO tablex(id, value)\n" + "VALUES (?, ?)", psql); - // System.out.println("Tables : " + visitor.getTables()); // System.out.println("fields : " + visitor.getColumns()); // System.out.println("coditions : " + visitor.getConditions()); @@ -68,6 +66,5 @@ public class MySqlInsertTest_36 extends TestCase { // assertEquals(1, visitor.getColumns().size()); // assertEquals(0, visitor.getConditions().size()); // assertEquals(0, visitor.getOrderByColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java index 3db1dbbd8..40bf99d91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_4.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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);"; @@ -47,7 +45,7 @@ public class MySqlInsertTest_4 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO tbl_name (a, b, c)" + // + 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)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java index 9a630e5a2..26d87f6a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_43.java @@ -15,9 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLParserFeature; @@ -120,7 +118,5 @@ public class MySqlInsertTest_43 extends TestCase { "\t\t\tAND t2.businessType IS NOT NULL\n" + "\tGROUP BY t1.warehouse_id, t2.businessType\n" + ") a", insertStmt.toString()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java index 5ecdbb86f..e9358ece0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_5.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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);"; @@ -45,8 +43,8 @@ public class MySqlInsertTest_5 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO tbl_name (a, b, c)" + // - "\nVALUES (1, 2, 3, 4, 5" + // + assertEquals("INSERT INTO tbl_name (a, b, c)" + + "\nVALUES (1, 2, 3, 4, 5" + "\n\t, 6, 7, 8, 9);", SQLUtils.toMySqlString(insertStmt)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java index 14eac59eb..d7716d41a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_6.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,10 +22,12 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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),?) " + // + 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)"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -47,18 +45,17 @@ public class MySqlInsertTest_6 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - 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, ?)" + // + 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)); - - 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, ?)" + // + 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)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java index 86e4c3e25..20ebff3fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_7.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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 (?, ?, ?, ?, ?, ?, ?)"; @@ -45,9 +43,9 @@ public class MySqlInsertTest_7 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); - assertEquals("INSERT INTO Apply (applicant_id, applytime, applytype, approver_id, end" + // - "\n\t, process, start)" + // - "\nVALUES (?, ?, ?, ?, ?" + // + assertEquals("INSERT INTO Apply (applicant_id, applytime, applytype, approver_id, end" + + "\n\t, process, start)" + + "\nVALUES (?, ?, ?, ?, ?" + "\n\t, ?, ?)", // SQLUtils.toMySqlString(insertStmt)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java index 61577647f..73f8ad421 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_8.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class MySqlInsertTest_8 extends MysqlTest { public void test_0() throws Exception { String sql = "insert into dd.table1(d,e) select * from bb.table3"; @@ -49,13 +47,13 @@ public class MySqlInsertTest_8 extends MysqlTest { // System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("INSERT INTO dd.table1 (d, e)" // - + "\nSELECT *" // + assertEquals("INSERT INTO dd.table1 (d, e)" + + "\nSELECT *" + "\nFROM bb.table3", // SQLUtils.toMySqlString(insertStmt)); - assertEquals("insert into dd.table1 (d, e)" // - + "\nselect *" // + assertEquals("insert into dd.table1 (d, e)" + + "\nselect *" + "\nfrom bb.table3", // SQLUtils.toMySqlString(insertStmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java index b841892a3..64d005056 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/MySqlInsertTest_9.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/UseInsertColumnsCacheTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/UseInsertColumnsCacheTest.java index 83ce46b08..bdb112c9f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/UseInsertColumnsCacheTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/insert/UseInsertColumnsCacheTest.java @@ -9,9 +9,9 @@ public class UseInsertColumnsCacheTest extends TestCase { public void test_0() throws Exception { String sql = "insert into tc_biz_mytable (f1, f2, f3, f4, f5, f6, f7, f8) values (1, 2, 3, 4, 5, 6, 7, 8)"; - SQLParserFeature[] features = {SQLParserFeature.EnableSQLBinaryOpExprGroup - , SQLParserFeature.OptimizedForParameterized - , SQLParserFeature.UseInsertColumnsCache + SQLParserFeature[] features = {SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.OptimizedForParameterized, + SQLParserFeature.UseInsertColumnsCache }; String psql1 = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue3775.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue3775.java index 2e2fe7fbd..70052cd5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue3775.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue3775.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4444.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4444.java index b2c2d0af8..529c446b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4444.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4444.java @@ -3,18 +3,12 @@ package com.alibaba.druid.bvt.sql.mysql.issues; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import org.junit.Test; -import java.util.Map; - import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; public class Issue4444 { protected final DbType dbType = DbType.mysql; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4454.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4454.java index 030fcb12b..af04034a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4454.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue4454.java @@ -3,16 +3,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import org.junit.Test; -import java.util.HashSet; -import java.util.*; +import java.util.Map; import static org.junit.Assert.assertFalse; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5219.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5219.java index 114954c91..d2a95cf2a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5219.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5219.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,9 +7,10 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; - import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -21,7 +20,6 @@ import static org.junit.Assert.assertTrue; * @see Issue来源 */ public class Issue5219 { - @Test public void test_split_table() throws Exception { // for (DbType dbType : new DbType[]{DbType.mysql, DbType.tidb}) { @@ -53,7 +51,7 @@ public class Issue5219 { SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement statement = parser.parseStatement(); System.out.println("原始的sql===" + sql); - String newSql=statement.toString().replace("\n","").replace('\'','"'); + String newSql = statement.toString().replace("\n", "").replace('\'', '"'); System.out.println("生成的sql===" + newSql); assertTrue(newSql.equalsIgnoreCase(sql)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5260.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5260.java index 31400fb86..0aad051cf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5260.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5260.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -10,9 +8,10 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Name; - import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,7 +23,6 @@ import static org.junit.Assert.assertTrue; * @see MySQL join语法 */ public class Issue5260 { - @Test public void test_natural_join() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql, DbType.oracle}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5362.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5362.java index 2da2e5b0f..d86f2f081 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5362.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5362.java @@ -1,23 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.SQLParserUtils; -import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; -import static org.junit.Assert.assertEquals; - /** * @author lizongbo * @see Issue来源 */ public class Issue5381 { - @Test public void test_select_in_parameterized() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5421.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5421.java index adb185963..6505fee45 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5421.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5421.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,10 +7,11 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; - import org.apache.commons.lang3.StringUtils; import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -22,7 +21,6 @@ import static org.junit.Assert.assertTrue; * @see Issue来源 */ public class Issue5421 { - @Test public void test_create_table_with() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql}) { @@ -34,9 +32,9 @@ public class Issue5421 { SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement statement = parser.parseStatement(); System.out.println("原始的sql===" + sql); - sql=normalizeSql(sql); + sql = normalizeSql(sql); System.out.println("归一化的sql===" + sql); - String newSql=normalizeSql(statement.toString()); + String newSql = normalizeSql(statement.toString()); System.out.println("生成的sql===" + newSql); assertTrue(newSql.equalsIgnoreCase(sql)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5498.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5498.java index 5dd20cb0b..aa9118a04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5498.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5498.java @@ -1,21 +1,11 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; - -import org.apache.commons.lang3.StringUtils; import org.junit.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * 验证 select into 语句的解析 * @@ -24,7 +14,6 @@ import static org.junit.Assert.assertTrue; * @see MySQL select into语法 */ public class Issue5498 { - @Test public void test_select_into() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql, DbType.oracle}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5642.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5642.java index f338f9407..a2b94ea6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5642.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5642.java @@ -4,7 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; /** diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5650.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5650.java index 474157564..90f571155 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5650.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5650.java @@ -4,7 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -16,7 +15,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5650 { - @Test public void test_alter_index() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5686.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5686.java index 01e32f9df..3a814f44b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5686.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5686.java @@ -2,13 +2,8 @@ package com.alibaba.druid.bvt.sql.mysql.issues; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.SQLUtils.FormatOption; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; -import com.alibaba.druid.sql.parser.SQLParserUtils; -import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -20,25 +15,23 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5686 { - @Test public void test_column_comment() throws Exception { String sql = "INSERT INTO TABLE_TEST_1(\n" + "\tDATE_ID,-- qianzhushi\n" + "\tCUS_NO -- houzhushi\n,\n" + "\tCUS_NAME\n" + ")\n" + "SELECT A.DATE_ID,\n" + "\tA.CUS_NO,\n" + "\tA.CUS_NAME\n" + "FROM TABLE_TEST_2 \n" + "WHERE COL1='1';"; System.out.println("原始的sql===" + sql); - MySqlInsertStatement sqlStatement = (MySqlInsertStatement) SQLUtils.parseSingleStatement(sql,DbType.mysql,true); - int ccc=0; + MySqlInsertStatement sqlStatement = (MySqlInsertStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql, true); + int ccc = 0; for (SQLExpr column : sqlStatement.getColumns()) { - column.addAfterComment("-- comment注释"+(ccc++)); + column.addAfterComment("-- comment注释" + (ccc++)); } System.out.println(sqlStatement); - String newSql=sqlStatement.toString(); + String newSql = sqlStatement.toString(); System.out.println("首次解析后生成的sql===" + newSql); - MySqlInsertStatement sqlStatementNew = (MySqlInsertStatement) SQLUtils.parseSingleStatement(newSql,DbType.mysql,true); + MySqlInsertStatement sqlStatementNew = (MySqlInsertStatement) SQLUtils.parseSingleStatement(newSql, DbType.mysql, true); - String newSql2=sqlStatement.toString(); + String newSql2 = sqlStatement.toString(); System.out.println("再次解析后生成的sql===" + newSql2); - assertEquals(newSql,newSql2); - + assertEquals(newSql, newSql2); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5702.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5702.java index c6ec18606..399097f36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5702.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5702.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -19,11 +18,9 @@ import static org.junit.Assert.assertEquals; * @see ... */ public class Issue5702 { - @Test public void test_alter_user_accout() throws Exception { for (DbType dbType : new DbType[]{DbType.mysql}) { - for (String sql : new String[]{ "ALTER USER 'jeffrey'@'localhost' ACCOUNT LOCK", "ALTER USER 'jeffrey'@'localhost' ACCOUNT UNLOCK", diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5761.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5761.java index 00700dc69..682c503af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5761.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5761.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,7 +16,6 @@ import static org.junit.Assert.assertEquals; * @see WITH (Common Table Expressions) */ public class Issue5761 { - @Test public void test_parse_with() { for (DbType dbType : new DbType[]{ @@ -25,7 +23,6 @@ public class Issue5761 { DbType.mariadb, }) { - for (String sql : new String[]{ "WITH\n" + " cte1 AS (SELECT a, b FROM table1),\n" @@ -232,7 +229,6 @@ public class Issue5761 { + " ) as pathbbb , qwerty\n" + " from tmp_link;", - "select\n" + " id,\n" + " (aa),\n" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5774.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5774.java index 5ed43ea76..9d4483eff 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5774.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5774.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,8 +17,6 @@ import static org.junit.Assert.assertEquals; * @see Specifying Account Names */ public class Issue5774 { - - @Test public void test_createuser_sql() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5797.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5797.java index 4882977d9..deedc9feb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5797.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5797.java @@ -1,23 +1,20 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * @author lizongbo * @see Issue来源 */ public class Issue5797 { - @Test public void test_parse_create_table() { for (DbType dbType : new DbType[]{ @@ -34,7 +31,6 @@ public class Issue5797 { // DbType.dm, DbType.kingbase, }) { - for (String sql : new String[]{ "-- 给课程表增加类型字段\n" + "alter table info_course drop column if exists course_type_id", diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5803.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5803.java index 607917b43..113f27139 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5803.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5803.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see ALTER TABLE Statement */ public class Issue5803 { - @Test public void test_parse_alter_table() { for (DbType dbType : new DbType[]{ @@ -26,7 +24,6 @@ public class Issue5803 { DbType.mariadb, }) { - for (String sql : new String[]{ "ALTER TABLE t1 ALTER INDEX i_idx INVISIBLE;", "ALTER TABLE t1 ALTER INDEX i_idx VISIBLE;", diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5813.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5813.java index 295cc5672..cd40296ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5813.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5813.java @@ -1,16 +1,15 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; 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.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -19,14 +18,12 @@ import static org.junit.Assert.assertTrue; * @see SET STATEMENT */ public class Issue5861 { - @Test public void test_parse_set_statement() { for (DbType dbType : new DbType[]{ @@ -27,7 +23,6 @@ public class Issue5861 { DbType.mysql, }) { - for (String sql : new String[]{ "SET STATEMENT max_statement_time=25 FOR select T.* from (\n" + "SELECT\n" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5894.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5894.java index e085c9544..0469732b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5894.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5894.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see CAST(expr AS type [ARRAY]) */ public class Issue5894 { - @Test public void test_parse_aschararray() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java index 5c6d34347..ccf859881 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java @@ -1,16 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.parser.Token; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +16,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5908 { - @Test public void test_parse_brackets() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5932.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5932.java index fd6ec9226..241b7b67c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5932.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5932.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,8 +16,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5932 { - - @Test public void test_parse_selectsum() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5951.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5951.java index 55dc4bef8..3e9c98ae5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5951.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5951.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,8 +16,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5951 { - - @Test public void test_parse_show() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5958.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5958.java index 2551bca85..dd8cfaa0d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5958.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5958.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -17,8 +16,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5958 { - - @Test public void test_parse_alter() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5976.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5976.java index 89c1f1ab2..76006bb65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5976.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5976.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; -import static org.junit.Assert.assertEquals; +import java.util.List; /** * @author lizongbo @@ -18,8 +15,6 @@ import static org.junit.Assert.assertEquals; * @see mysql alter table */ public class Issue5976 { - - @Test public void test_parse_alter() { for (DbType dbType : new DbType[]{DbType.mysql}) { @@ -78,7 +73,6 @@ public class Issue5976 { } } - @Test public void test_parse_rename() { for (DbType dbType : new DbType[]{DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue6102.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue6102.java index c1f3f0632..660167bee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue6102.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue6102.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertTrue; /** @@ -18,8 +17,6 @@ import static org.junit.Assert.assertTrue; * @see mysql create table */ public class Issue6102 { - - @Test public void test_parse_create() { for (DbType dbType : new DbType[]{DbType.mysql}) { @@ -40,12 +37,10 @@ public class Issue6102 { SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List statementList = parser.parseStatementList(); System.out.println(statementList); - String sqlnew=statementList.toString(); + String sqlnew = statementList.toString(); assertTrue(sqlnew.contains("DEFAULT (_utf8mb4 '{}')")); SQLParseAssertUtil.assertParseSql(sql, dbType); } } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java index 238c19a29..58408b820 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_0.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class mysql_block_0 extends OracleTest { public void test_0() throws Exception { @@ -32,7 +31,7 @@ public class mysql_block_0 extends OracleTest { " 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;"; // + " COMMIT;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); assertEquals(4, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java index af20355d9..9986ed0b5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class mysql_block_1 extends OracleTest { public void test_0() throws Exception { @@ -45,7 +44,7 @@ public class mysql_block_1 extends OracleTest { "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 FROM ktv_tmp_sqlarea WHERE dbid=?;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); assertEquals(7, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java index 87c4f81da..6ef024564 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/mysql_block_2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class mysql_block_2 extends OracleTest { public void test_0() throws Exception { @@ -45,7 +44,7 @@ public class mysql_block_2 extends OracleTest { "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 FROM ktv_tmp_sqlarea WHERE dbid=?;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); assertEquals(7, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java index dae3d30c4..8378a614a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySQLParameterizedTest.java @@ -26,7 +26,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java index ba99a0495..739019c7d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_1.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.param; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; public class MySqlParameterizedOutputVisitorTest_1 extends MySQLParameterizedTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_10.java index 9b7c84681..2f951483f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_10.java @@ -12,7 +12,6 @@ import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.List; -import static org.junit.Assert.*; /** * Created by wenshao on 16/8/23. diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_15.java index 0ac5ba8d3..fb54c01cf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_15.java @@ -38,6 +38,5 @@ public class MySqlParameterizedOutputVisitorTest_15 extends com.alibaba.druid.bv "\t, ?, ?, ?, ?, ?\n" + "\t, ?, ?, NULL, NULL, NULL\n" + "\t, ?, ?)"); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java index 9fe682c63..8350131d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_3.java @@ -17,7 +17,6 @@ package com.alibaba.druid.bvt.sql.mysql.param; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; public class MySqlParameterizedOutputVisitorTest_3 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_38_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_38_1.java index c775bb014..37606fcb6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_38_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_38_1.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_39.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_39.java index 4586666ff..4ac654a09 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_39.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java index 437dbbc46..ae80f7f23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_4.java @@ -17,16 +17,14 @@ package com.alibaba.druid.bvt.sql.mysql.param; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static 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_, " // + 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_ " // + + "user0_.password as password0_ " + "from acct_user user0_ "// + "where user0_.login_name=? limit ?"; assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL), sql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_40.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_40.java index 22cf6872b..56e1af2ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_40.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_41.java index eb1b1a21c..c4fa83f00 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_41.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java index d976d9849..e7da5685d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_42.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java index 3549dfe67..ee762285d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_43.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -10,6 +8,8 @@ import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import junit.framework.TestCase; import org.apache.commons.lang.StringUtils; @@ -31,7 +31,6 @@ public class MySqlParameterizedOutputVisitorTest_43 extends TestCase { 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" + "WHERE `feed_id` = 313825887478", restoredSql); - } public static String restore(String sql, String table, String params/*JSONArray paramsArray, JSONArray destArray*/) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java index ed2029d56..1c34952d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_44.java @@ -1,7 +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; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONWriter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java index 1d1df2d47..5e6a467bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_47_hints.java @@ -14,7 +14,6 @@ import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.SqlNodeList; -import static org.junit.Assert.*; import java.util.ArrayList; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java index c91d79e4d..f2a89f619 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_56.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Arrays; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java index af5b9dc5c..5f2aab889 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_6.java @@ -17,7 +17,6 @@ package com.alibaba.druid.bvt.sql.mysql.param; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; public class MySqlParameterizedOutputVisitorTest_6 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java index f92ad9d1b..b8fad7aa9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_61.java @@ -1,8 +1,8 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -46,5 +46,4 @@ public class MySqlParameterizedOutputVisitorTest_61 extends TestCase { "\t\t, now(), 2, 2, 1515032652532, 51\n" + "\t\t, 0, 91605449, '', 'mingguo', 0)", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java index 30de5bd61..f1b3bfbb9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_62.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -31,5 +31,4 @@ public class MySqlParameterizedOutputVisitorTest_62 extends TestCase { "\tJOIN t_1 ON abc.name = t_1.id2\n" + "WHERE t_1.fname LIKE 'hz.%'", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java index 5418f4c39..9aaa983d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_63.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java index e31274436..0a76b102d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_64.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -29,5 +29,4 @@ public class MySqlParameterizedOutputVisitorTest_64 extends TestCase { "FROM abc\n" + "WHERE id = 'abc'", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java index 9c760ad73..315701395 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_65.java @@ -19,7 +19,5 @@ public class MySqlParameterizedOutputVisitorTest_65 extends TestCase { assertEquals("select * from abc", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); assertEquals("SELECT *\n" + "FROM abc", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParams, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java index f7c5d26a1..0d2d3c0ff 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_66.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -28,5 +28,4 @@ public class MySqlParameterizedOutputVisitorTest_66 extends TestCase { "WHERE 1 = 1\n" + "\tAND id = 'abc'", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java index 9645844f5..5b25bf71e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_67.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -31,5 +31,4 @@ public class MySqlParameterizedOutputVisitorTest_67 extends TestCase { "GROUP BY dep_id\n" + "HAVING count(1) > 10", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java index 761582473..f8f89c18e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_68.java @@ -20,5 +20,4 @@ public class MySqlParameterizedOutputVisitorTest_68 extends TestCase { "ORDER BY 1;", psql); assertEquals(0, params.size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java index a37044085..82870c0af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_69.java @@ -3,10 +3,10 @@ package com.alibaba.druid.bvt.sql.mysql.param; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java index ed20c4242..9d6979cb8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_7.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; public class MySqlParameterizedOutputVisitorTest_7 extends com.alibaba.druid.bvt.sql.mysql.param.MySQLParameterizedTest { public void test_hints() throws Exception { @@ -29,7 +28,7 @@ public class MySqlParameterizedOutputVisitorTest_7 extends com.alibaba.druid.bvt String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL); - String expected = "SELECT id" // + String expected = "SELECT id" + "\nFROM t"// + "\nWHERE id = ?/*!30000union all select 2*/"; assertEquals(expected, psql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java index 7def4ee09..888e46584 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_70.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -14,9 +14,9 @@ public class MySqlParameterizedOutputVisitorTest_70 extends TestCase { String sql = "select ((0='x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2 ),ROW(3, 4)) );"; List params = new ArrayList(); - String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params - , VisitorFeature.OutputParameterizedUnMergeShardingTable - , VisitorFeature.OutputParameterizedQuesUnMergeInList + String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, + VisitorFeature.OutputParameterizedUnMergeShardingTable, + VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("SELECT ((? = ?) & ?) ^ (ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)));", psql); assertEquals(9, params.size()); @@ -27,5 +27,4 @@ public class MySqlParameterizedOutputVisitorTest_70 extends TestCase { String rsql = ParameterizedOutputVisitorUtils.restore(psql, JdbcConstants.MYSQL, params); assertEquals("SELECT ((0 = 'x6') & 31) ^ (ROW(76, 4) NOT IN (ROW(1, 2), ROW(3, 4)));", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java index acf0a6957..c7486482c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_71.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -14,9 +14,9 @@ public class MySqlParameterizedOutputVisitorTest_71 extends TestCase { String sql = "SELECT (3, 4) IN ((1, 2), (3, 4)) FROM dual"; List params = new ArrayList(); - String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params - , VisitorFeature.OutputParameterizedUnMergeShardingTable - , VisitorFeature.OutputParameterizedQuesUnMergeInList + String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, + VisitorFeature.OutputParameterizedUnMergeShardingTable, + VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("SELECT (?, ?) IN ((?, ?), (?, ?))\n" + "FROM dual", psql); @@ -26,5 +26,4 @@ public class MySqlParameterizedOutputVisitorTest_71 extends TestCase { assertEquals("SELECT (3, 4) IN ((1, 2), (3, 4))\n" + "FROM dual", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java index 475e33d2c..9d06cfd79 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_72.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -14,9 +14,9 @@ public class MySqlParameterizedOutputVisitorTest_72 extends TestCase { String sql = "create table t1(pk bigint(20) primary key, integer_test int, varchar_test varchar(20));\n"; List params = new ArrayList(); - String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params - , VisitorFeature.OutputParameterizedUnMergeShardingTable - , VisitorFeature.OutputParameterizedQuesUnMergeInList + String psql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, + VisitorFeature.OutputParameterizedUnMergeShardingTable, + VisitorFeature.OutputParameterizedQuesUnMergeInList ); assertEquals("CREATE TABLE t1 (\n" + "\tpk bigint(20) PRIMARY KEY,\n" + @@ -32,5 +32,4 @@ public class MySqlParameterizedOutputVisitorTest_72 extends TestCase { "\tvarchar_test varchar(20)\n" + ");", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java index da1a78d6e..536ebc52f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_73.java @@ -23,5 +23,4 @@ public class MySqlParameterizedOutputVisitorTest_73 extends TestCase { VisitorFeature.OutputParameterizedUnMergeShardingTable); assertEquals("REPLACE INTO t1 (pk, integer_test, varchar_test)\n" + "VALUES (?, ?, ?)", psql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java index 95061e89d..baccc705f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_74.java @@ -4,10 +4,10 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java index 5aa2d447f..f74846528 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_75_or.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -8,6 +7,7 @@ import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.ParameterizedVisitor; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java index 7780d119d..270aeba2a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_76.java @@ -1,9 +1,9 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -45,5 +45,4 @@ public class MySqlParameterizedOutputVisitorTest_76 extends TestCase { assertEquals("[1,4,49,18,1]", JSON.toJSONString(outParameters)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java index 35c96c7a5..8c32f82f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_78_nchar.java @@ -1,10 +1,10 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java index bc9a49c8b..9ff932d9c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_79_group_asc_desc.java @@ -1,10 +1,10 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import junit.framework.TestCase; import java.util.ArrayList; @@ -38,5 +38,4 @@ public class MySqlParameterizedOutputVisitorTest_79_group_asc_desc extends TestC "GROUP BY 1 DESC, 2, 3 ASC\n" + "ORDER BY 4 DESC, 3 ASC;", rsql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java index 7066f32bd..97d9927d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_8.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -44,4 +43,3 @@ public class MySqlParameterizedOutputVisitorTest_8 extends com.alibaba.druid.bvt assertEquals(1, visitor.getParameters().get(3)); } } - diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java index f3745015f..00e82e33b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/MySqlParameterizedOutputVisitorTest_9.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -42,4 +41,3 @@ public class MySqlParameterizedOutputVisitorTest_9 extends com.alibaba.druid.bvt assertEquals(4, visitor.getParameters().get(1)); } } - diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java index 03edb3814..b6d437c2d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/param/ParseUtil.java @@ -1,14 +1,18 @@ package com.alibaba.druid.bvt.sql.mysql.param; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONArray; 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.*; +import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -175,7 +179,9 @@ public class ParseUtil { public static String getSqlHash(String sql) { SQLStatement statement = getStatement(sql); - if (null == statement) return null; + if (null == statement) { + return null; + } return getSqlHash(statement); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_0.java index 44cef9edc..9f398272c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_0.java @@ -5,7 +5,11 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +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.SQLSelectStatement; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_1.java index 414c1daa4..503f4545b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/ResolveTest_1.java @@ -5,7 +5,11 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; +import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; +import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.repository.SchemaObject; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java index 0995553d1..961341468 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test.java @@ -40,7 +40,9 @@ public class Resolve_AllColumn_Test extends TestCase { final SQLSelectItem selectItem = selectList.get(i); final SQLExpr expr = selectItem.getExpr(); if (expr instanceof SQLAllColumnExpr) { + // Handle SQLAllColumnExpr } else if (expr instanceof SQLPropertyExpr && ((SQLPropertyExpr) expr).getName().equals("*")) { + // Handle SQLPropertyExpr with "*" name } } @@ -54,7 +56,6 @@ public class Resolve_AllColumn_Test extends TestCase { repository.acceptDDL("create table t_emp(emp_id bigint, name varchar(20));"); - SQLStatement stmt = SQLUtils.parseSingleMysqlStatement("select * from (select * from t_emp) x"); repository.resolve(stmt, SchemaResolveVisitor.Option.ResolveAllColumn); @@ -70,7 +71,6 @@ public class Resolve_AllColumn_Test extends TestCase { repository.acceptDDL("create table t_emp(emp_id bigint, name varchar(20));"); - SQLStatement stmt = SQLUtils.parseSingleMysqlStatement("select * from (select * from t_emp union all select * from t_emp) x"); repository.resolve(stmt, SchemaResolveVisitor.Option.ResolveAllColumn); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test_1.java index de4c75d10..7cf606230 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/Resolve_AllColumn_Test_1.java @@ -13,13 +13,10 @@ public class Resolve_AllColumn_Test_1 extends TestCase { repository.acceptDDL("create table t_emp(emp_id bigint, name varchar(20));"); - SQLStatement stmt = SQLUtils.parseSingleMysqlStatement("select 1 as tag, * from t_emp"); repository.resolve(stmt, SchemaResolveVisitor.Option.ResolveAllColumn); assertEquals("SELECT 1 AS tag, emp_id, name\n" + "FROM t_emp", stmt.toString()); - - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java index 0f2cfd2bb..8383e9a13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/resolve/TPCDS_ALL_Resolve.java @@ -53,5 +53,4 @@ public class TPCDS_ALL_Resolve extends TestCase { } } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java index 676d15178..b781f7f6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/AdsDumpTest_0.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLDumpStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -33,6 +32,4 @@ public class AdsDumpTest_0 extends MysqlTest { "\tAND (amp.buyer_add_cart_info.show_price >= 13300))\n" + "LIMIT 144800", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/CTERewriteTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/CTERewriteTest.java index 0304c962e..19c01968c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/CTERewriteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/CTERewriteTest.java @@ -3,12 +3,14 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; +import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +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.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import junit.framework.TestCase; public class CTERewriteTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTestIssue5431.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTestIssue5431.java index f21662adc..d5a747bc0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTestIssue5431.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTestIssue5431.java @@ -15,17 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import java.util.List; - -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.util.Utils; -import static org.junit.Assert.*; +import java.util.List; public class MySqlSelectTestIssue5431 extends MysqlTest { @@ -44,8 +39,7 @@ public class MySqlSelectTestIssue5431 System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); System.out.println("columns : " + visitor.getColumns()); - assertEquals(2,visitor.getColumns().size()); - + assertEquals(2, visitor.getColumns().size()); } public void test2() throws Exception { String sql = "select a from table1 group by a "; @@ -62,8 +56,6 @@ public class MySqlSelectTestIssue5431 System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); System.out.println("columns : " + visitor.getColumns()); - assertEquals(1,visitor.getColumns().size()); - + assertEquals(1, visitor.getColumns().size()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java index 97dd0102d..6cb03c6f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java index 60948c31e..c6ac4d928 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_1.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java index e3d1ba859..0210dda99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_10.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelect; @@ -23,9 +22,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -153,6 +150,4 @@ public class MySqlSelectTest_10 extends MysqlTest { // + " version bigint\n" + ")" // )); // } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java index b02650315..c6ca91225 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_100_alias.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_100_alias extends MysqlTest { public void test_2() throws Exception { String sql = "\n" + @@ -136,4 +133,4 @@ public class MySqlSelectTest_100_alias extends MysqlTest { assertEquals("SELECT true\n" + "FROM t", text); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_101_binary.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_101_binary.java index e65c322de..0c9e5a777 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_101_binary.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_101_binary.java @@ -17,16 +17,13 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_101_binary extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -51,5 +48,4 @@ public class MySqlSelectTest_101_binary extends MysqlTest { "\tAND `projects`.`namespace_id` = 61\n" + "LIMIT 1;", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_102_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_102_orderBy.java index 7cef998d6..29f1f6ae0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_102_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_102_orderBy.java @@ -16,16 +16,13 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_102_orderBy extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -51,5 +48,4 @@ public class MySqlSelectTest_102_orderBy extends MysqlTest { "FROM a3\n" + "ORDER BY a DESC;", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_103_union_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_103_union_orderBy.java index 59e942c41..57373fcce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_103_union_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_103_union_orderBy.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_103_union_orderBy extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -56,5 +55,4 @@ public class MySqlSelectTest_103_union_orderBy extends MysqlTest { "FROM a4\n" + "ORDER BY a DESC", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_104_union_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_104_union_orderBy.java index 1a2524342..faa840bfc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_104_union_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_104_union_orderBy.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_104_union_orderBy extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -59,5 +58,4 @@ public class MySqlSelectTest_104_union_orderBy extends MysqlTest { "FROM a5\n" + "ORDER BY a DESC", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_105_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_105_hints.java index ffb6a705e..29b03dabc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_105_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_105_hints.java @@ -18,12 +18,10 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_105_hints extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -40,5 +38,4 @@ public class MySqlSelectTest_105_hints extends MysqlTest { "FROM t FORCE INDEX (name_1), abc FORCE INDEX (name_2)\n" + "WHERE id = 1", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_106_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_106_hints.java index e042101ad..875663ddf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_106_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_106_hints.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_106_hints extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -116,5 +115,4 @@ public class MySqlSelectTest_106_hints extends MysqlTest { "\tAND a.pay_trades > 0\n" + "\tAND (a.during = str_to_date('2018-01-10', '%Y-%m-%d'));", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java index c5dbfe88a..873a867c1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_107_between.java @@ -18,15 +18,12 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class MySqlSelectTest_107_between extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -51,5 +48,4 @@ public class MySqlSelectTest_107_between extends MysqlTest { System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java index 4b3ad6402..55fe38b0c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_108_alias.java @@ -25,7 +25,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class MySqlSelectTest_108_alias extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -52,5 +51,4 @@ public class MySqlSelectTest_108_alias extends MysqlTest { System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_109_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_109_alias.java index b8b421e00..478e1b9d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_109_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_109_alias.java @@ -25,7 +25,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class MySqlSelectTest_109_alias extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -52,5 +51,4 @@ public class MySqlSelectTest_109_alias extends MysqlTest { System.out.println("coditions : " + visitor.getConditions()); System.out.println("orderBy : " + visitor.getOrderByColumns()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java index 632c61ad2..7651501c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_11.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -58,8 +57,8 @@ public class MySqlSelectTest_11 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("users"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT *" + // - "\nFROM users" + // + assertEquals("SELECT *" + + "\nFROM users" + "\nWHERE uid = :uid", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java index 0b0c221d7..0bdc44c5a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_110.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; @@ -67,6 +66,4 @@ public class MySqlSelectTest_110 extends TestCase { "\t)\n" + "LIMIT 0, 1;", stmt.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java index 5cc50b9ca..63f03d5f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_111_sequence.java @@ -50,6 +50,4 @@ public class MySqlSelectTest_111_sequence extends TestCase { assertEquals("SELECT *\n" + "FROM users TABLESAMPLE BERNOULLI (50);", stmt.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java index af1d6b42d..a609da3a3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_112_orderBy.java @@ -106,6 +106,4 @@ public class MySqlSelectTest_112_orderBy extends TestCase { "GROUP BY coach_id, tournament_name, tournament_id, season_id, season\n" + "ORDER BY season_id DESC", stmt.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java index 284686639..5b95a2c23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_113_time.java @@ -48,6 +48,4 @@ public class MySqlSelectTest_113_time extends TestCase { assertEquals("SELECT TIME '10:09:06', TIMESTAMP '2017-11-15 10:09:06', DATE '2017-11-15'", stmt.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java index 4c262be46..a2076bf18 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_114.java @@ -73,6 +73,4 @@ public class MySqlSelectTest_114 extends TestCase { + ") total", psql); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java index bfb919dc8..58d7a0049 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_115_collate.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; @@ -23,4 +22,4 @@ public class MySqlSelectTest_115_collate extends MysqlTest { assertEquals("SELECT name COLLATE utf8_danish_ci AS userName\n" + "FROM test_hash_tb", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java index 8dda5057d..c1cf0c3b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_116_with_cube.java @@ -24,4 +24,4 @@ public class MySqlSelectTest_116_with_cube extends MysqlTest { "GROUP BY ROLLUP (string_test, time_test)\n" + "ORDER BY sum_int, string_test, time_test", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java index 5fe51c05c..be0e9b736 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_117.java @@ -41,4 +41,4 @@ public class MySqlSelectTest_117 extends MysqlTest { "WHERE day_id IN (DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -1 DAY), '%Y%m%d'), DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -2 DAY), '%Y%m%d'), DATE_FORMAT(DATE_ADD(NOW(), INTERVAL -8 DAY), '%Y%m%d'))\n" + "LIMIT 100", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java index 0316bf7c4..472d210c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_118_timestamp.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_118_timestamp extends MysqlTest { "FROM test1\n" + "WHERE TIMESTAMP '2019-1-1 00:00:00' = timestamp_test", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java index 515516599..62fd8816f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_date.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_119_date extends MysqlTest { "FROM test1\n" + "WHERE DATE '2019-1-1' = testcol", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java index 6b579f03c..9936771b4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_119_real.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_119_real extends MysqlTest { "FROM test1\n" + "WHERE REAL '2019.3' = testcol", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java index 81b0f2cdc..9d935fe82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_12.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java index 85e7b71b8..0a9122ce2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_120_not.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_120_not extends MysqlTest { "FROM corona_broadcast\n" + "WHERE !(decimal_test BETWEEN double_test AND 62);", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java index 90bb9857c..53826694c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_121.java @@ -49,4 +49,4 @@ public class MySqlSelectTest_121 extends MysqlTest { "FROM simple_query4.orders__0\n" + "WHERE o_orderdate > '1994-09-31';", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java index ac76a2d8e..34863ec65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_122.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_122 extends MysqlTest { "FROM dual\n" + "WHERE 'test1123' LIKE '%test%'", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java index 2fc4c0bac..3691f78cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_123_mod.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -59,4 +58,4 @@ public class MySqlSelectTest_123_mod extends MysqlTest { SQLBinaryOpExpr expr = (SQLBinaryOpExpr) stmt.getSelect().getQueryBlock().getSelectList().get(0).getExpr(); assertEquals(SQLBinaryOperator.Equality, expr.getOperator()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java index 941842ac7..aab18e280 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_124_contains.java @@ -40,4 +40,4 @@ public class MySqlSelectTest_124_contains extends MysqlTest { "\tAND CONTAINS (rate_tags, '520')\n" + "GROUP BY shid, start_time_daily, end_time_daily", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java index 69c91922f..fae5200b5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_125_eq.java @@ -21,6 +21,4 @@ public class MySqlSelectTest_125_eq extends MysqlTest { "FROM test3\n" + "WHERE id / cnt = id = id;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java index 17effa13e..faee954af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_126_ads_minus.java @@ -68,6 +68,4 @@ public class MySqlSelectTest_126_ads_minus extends MysqlTest { "\tWHERE action_code = 999997)\n" + ")", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java index 0b1d96335..085c236f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_127.java @@ -30,6 +30,4 @@ public class MySqlSelectTest_127 extends MysqlTest { ")\n" + "LIMIT 500", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java index 3cebac312..6b839d6d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_129_ads.java @@ -66,6 +66,4 @@ public class MySqlSelectTest_129_ads extends MysqlTest { "\tLEFT JOIN avg_table USING (minute_id)\n" + "ORDER BY history_table.hour_id", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java index a0550bef6..03457b072 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_13.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -58,7 +57,7 @@ public class MySqlSelectTest_13 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM test/*!40101fff*/", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java index 46f7d19a2..e5b19898e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_130_ads.java @@ -105,6 +105,4 @@ public class MySqlSelectTest_130_ads extends MysqlTest { "FROM base_table\n" + "ORDER BY comm_date", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java index 40924ae0a..6d462305a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_131_div.java @@ -20,6 +20,4 @@ public class MySqlSelectTest_131_div extends MysqlTest { assertEquals("SELECT id % id % id % id / id\n" + "FROM t", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java index 4804233de..14b0b9537 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_132_not_in.java @@ -26,6 +26,4 @@ public class MySqlSelectTest_132_not_in extends MysqlTest { "FROM abc\n" + "WHERE id NOT IN (?)", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java index 2263d7344..c70b5f41d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_133.java @@ -25,6 +25,4 @@ public class MySqlSelectTest_133 extends MysqlTest { assertEquals("SELECT (~?), ((tinyint_1bit_test % integer_test % bigint_test) NOT IN (?, ?, ?, (BINARY ? = ?)))\n" + "FROM select_base_two_one_db_multi_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java index d2ad06e95..8fc7ec6a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_134.java @@ -80,4 +80,4 @@ public class MySqlSelectTest_134 extends MysqlTest { assertEquals("SELECT HEX(WEIGHT_STRING(? LEVEL 1 DESC REVERSE));", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java index de6619a91..c96e6d46a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_135.java @@ -29,6 +29,4 @@ public class MySqlSelectTest_135 extends MysqlTest { "\tAND (date_test)) IN (smallint_test, bigint_test, tinyint_1bit_test, (WEIGHT_STRING(? LEVEL 1 DESC))))\n" + "FROM select_base_two_multi_db_multi_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java index 1d4f4eff0..2eec9a535 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_136.java @@ -25,6 +25,4 @@ public class MySqlSelectTest_136 extends MysqlTest { assertEquals("SELECT `tinyint_test` / `tinyint_1bit_test` = `mediumint_test` = `decimal_test` / `double_test`\n" + "FROM `corona_one_db_one_tb`", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java index eb3e1240c..ba332bc80 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_137.java @@ -24,6 +24,4 @@ public class MySqlSelectTest_137 extends MysqlTest { assertEquals("SELECT ((decimal_test = ? / bigint_test = bigint_test) > (second(timestamp_test)))\n" + "FROM select_base_two_multi_db_one_tb", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java index e798bb5f5..faac2ddda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_138_ads_minus.java @@ -55,11 +55,8 @@ public class MySqlSelectTest_138_ads_minus extends MysqlTest { SQLUnionQuery q2 = (SQLUnionQuery) q1.getLeft(); assertTrue(q2.getRight() instanceof SQLSelectQueryBlock); - SQLUnionQuery q3 = (SQLUnionQuery) q2.getLeft(); assertTrue(q3.getRight() instanceof SQLSelectQueryBlock); assertTrue(q3.getLeft() instanceof SQLSelectQueryBlock); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java index 52eb8925a..7a3553a8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_139.java @@ -26,9 +26,7 @@ public class MySqlSelectTest_139 extends MysqlTest { "FROM corona_one_db_one_tb", stmt.toString()); assertEquals("SELECT (tinyint_test / tinyint_1bit_test) = mediumint_test = decimal_test / double_test\n" + - "FROM corona_one_db_one_tb" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM corona_one_db_one_tb", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java index 883e2d0ba..d5ee1aef5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_14.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -68,7 +67,7 @@ public class MySqlSelectTest_14 extends MysqlTest { output); String output_lcase = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select *" // + assertEquals("select *" + "\nfrom t1"// + "\nwhere column1 = ("// + "\n\tselect column1"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java index 5d30d6189..af5e16566 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_140_union.java @@ -98,9 +98,7 @@ public class MySqlSelectTest_140_union extends MysqlTest { "\tSELECT DISTINCT a0.aid\n" + "\tFROM ysf_saas.ods_abif_aid_fetched_tags_bus_ads_v a0\n" + "\tWHERE a0.pred_age_level IN (?)\n" + - ") d;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + ") d;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java index 587aa54ab..58b05658e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_141_bigunion.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallUtils; @@ -69,7 +68,6 @@ public class MySqlSelectTest_141_bigunion extends MysqlTest { ") ux_x", stmt.toString()); } - public void test_big_100000() throws Exception { StringBuilder buf = new StringBuilder(); { @@ -97,5 +95,4 @@ public class MySqlSelectTest_141_bigunion extends MysqlTest { SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(statVisitor); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java index f74afdad3..0d6634668 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_142.java @@ -113,9 +113,7 @@ public class MySqlSelectTest_142 extends MysqlTest { "\t\tAND ds = ?\n" + "\t\tAND bhv_obj_type = ?\n" + "\t\tAND brand_id IN (?)\n" + - ") d;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + ") d;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java index 8228d3a56..d69c9a01e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_143.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; @@ -140,9 +139,7 @@ public class MySqlSelectTest_143 extends MysqlTest { "\tON left_table.compare_column_source = right_table.compare_column_target\n" + "WHERE left_table.compare_column_source = ?\n" + "\tOR right_table.compare_column_target = ?\n" + - "\tOR left_table.compare_cnt_source <> right_table.compare_cnt_target" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "\tOR left_table.compare_cnt_source <> right_table.compare_cnt_target", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java index b69ba0828..6d14942a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_144_ads_values.java @@ -36,9 +36,7 @@ public class MySqlSelectTest_144_ads_values extends MysqlTest { "\tVALUES (?, ?),\n" + "\t(?, ?),\n" + "\t(?, ?)\n" + - ") AS t (id, name)" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + ") AS t (id, name)", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_145_bigand.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_145_bigand.java index 88434e62f..38437bb7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_145_bigand.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_145_bigand.java @@ -25,7 +25,6 @@ import com.alibaba.druid.wall.WallUtils; import java.util.List; - public class MySqlSelectTest_145_bigand extends MysqlTest { public void test_small_10() throws Exception { StringBuilder buf = new StringBuilder(); @@ -62,7 +61,6 @@ public class MySqlSelectTest_145_bigand extends MysqlTest { "\tAND GOODS_SID <> ?", stmt.toString()); } - public void test_big_100000() throws Exception { StringBuilder buf = new StringBuilder(); { @@ -87,4 +85,4 @@ public class MySqlSelectTest_145_bigand extends MysqlTest { SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); stmt.accept(statVisitor); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java index 4225649ed..dbcb487ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_146.java @@ -4,8 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; @@ -27,8 +25,7 @@ public class MySqlSelectTest_146 extends MysqlTest { assertEquals("SELECT ? = ? IS NOT NULL\n" + "FROM select_base_two_multi_db_multi_tb\n" + - "LIMIT ?;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "LIMIT ?;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java index 7c2a4d2fa..11c5d006b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_147_huizhi.java @@ -43,12 +43,11 @@ public class MySqlSelectTest_147_huizhi extends MysqlTest { "WHERE 1 = 1\n" + "\tAND VARCHAR20 IS NOT NULL\n" + "\tAND MISSIONID = ?\n" + - "GROUP BY VARCHAR20" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "GROUP BY VARCHAR20", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); SQLSelectQueryBlock queryBlock = stmt.getQuery().getQueryBlock(); assertEquals(3, queryBlock.getSelectList().size()); assertEquals(SQLCharExpr.class, queryBlock.getSelectList().get(2).getExpr().getClass()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java index b97d60b2b..2bd386969 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_148_extract.java @@ -3,8 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.statement.SQLInsertStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; @@ -26,14 +24,13 @@ public class MySqlSelectTest_148_extract extends MysqlTest { "FROM corona_select_one_db_one_tb", stmt.toString()); assertEquals("SELECT EXTRACT(YEAR FROM ?) >> ?\n" + - "FROM corona_select_one_db_one_tb" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM corona_select_one_db_one_tb", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); SQLSelectQueryBlock queryBlock = stmt.getSelect().getQueryBlock(); assertEquals(1, queryBlock.getSelectList().size()); - assertEquals("EXTRACT(YEAR FROM '2008-01-02') >> 3" - , queryBlock.getSelectList().get(0).getExpr().toString() + assertEquals("EXTRACT(YEAR FROM '2008-01-02') >> 3", + queryBlock.getSelectList().get(0).getExpr().toString() ); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java index f30776d6f..bdd9dac70 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_149.java @@ -25,13 +25,13 @@ public class MySqlSelectTest_149 extends MysqlTest { "FROM corona_select_one_db_one_tb", stmt.toString()); assertEquals("SELECT length(? COLLATE utf8_general_ci)\n" + - "FROM corona_select_one_db_one_tb" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM corona_select_one_db_one_tb", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); SQLSelectQueryBlock queryBlock = stmt.getSelect().getQueryBlock(); assertEquals(1, queryBlock.getSelectList().size()); - assertEquals("length('aaa' COLLATE utf8_general_ci)" - , queryBlock.getSelectList().get(0).getExpr().toString() + assertEquals("length('aaa' COLLATE utf8_general_ci)", + queryBlock.getSelectList().get(0).getExpr().toString() ); } @@ -45,13 +45,13 @@ public class MySqlSelectTest_149 extends MysqlTest { assertEquals("SELECT count(1), length('aaa' COLLATE utf8_general_ci)\n" + "FROM corona_select_one_db_one_tb", stmt.toString()); - assertEquals("SELECT count(1), length(? COLLATE utf8_general_ci)\n" + "FROM corona_select_one_db_one_tb" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + assertEquals("SELECT count(1), length(? COLLATE utf8_general_ci)\n" + "FROM corona_select_one_db_one_tb", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); SQLSelectQueryBlock queryBlock = stmt.getSelect().getQueryBlock(); assertEquals(2, queryBlock.getSelectList().size()); - assertEquals("length('aaa' COLLATE utf8_general_ci)" - , queryBlock.getSelectList().get(1).getExpr().toString() + assertEquals("length('aaa' COLLATE utf8_general_ci)", + queryBlock.getSelectList().get(1).getExpr().toString() ); } @@ -64,4 +64,4 @@ public class MySqlSelectTest_149 extends MysqlTest { System.out.println(stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java index e42210771..3b52c32aa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_15.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -58,8 +57,8 @@ public class MySqlSelectTest_15 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT 1 - -1" // - + "\nFROM t" // + assertEquals("SELECT 1 - -1" + + "\nFROM t" + "\nWHERE id = 1", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java index d81477b56..a07012fbb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_150.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; @@ -57,10 +56,7 @@ public class MySqlSelectTest_150 extends MysqlTest { "MINUS\n" + "(SELECT __aid\n" + "FROM unidesk_ads.dmj_ex_1_unidesk_tag_all\n" + - "WHERE unidesk_ads.dmj_ex_1_unidesk_tag_all.pred_career_type IN (?))" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE unidesk_ads.dmj_ex_1_unidesk_tag_all.pred_career_type IN (?))", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java index 798846c8f..ecc1667c1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_151.java @@ -22,10 +22,7 @@ public class MySqlSelectTest_151 extends MysqlTest { assertEquals("SELECT !1, !1", stmt.toString()); - assertEquals("SELECT !?, !?" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + assertEquals("SELECT !?, !?", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java index 3e989d5e5..63ef927cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_152.java @@ -24,10 +24,8 @@ public class MySqlSelectTest_152 extends MysqlTest { "FROM dual", stmt.toString()); assertEquals("SELECT (?, ?) IN (?)\n" + - "FROM dual" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "FROM dual", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } public void test_1() throws Exception { @@ -42,9 +40,7 @@ public class MySqlSelectTest_152 extends MysqlTest { "FROM dual", stmt.toString()); assertEquals("SELECT (?, ?) IN ((?, ?), (?, ?))\n" + - "FROM dual" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedQuesUnMergeInList)); - - + "FROM dual", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedQuesUnMergeInList)); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java index 809366a82..58b2b4bbf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_153.java @@ -40,10 +40,7 @@ public class MySqlSelectTest_153 extends MysqlTest { "\tWHERE ?\n" + "\t\tAND ?\n" + ") layer_0_table\n" + - "WHERE !~? IS NULL;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE !~? IS NULL;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java index 70617b478..cddcd68c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_154.java @@ -33,10 +33,7 @@ public class MySqlSelectTest_154 extends MysqlTest { assertEquals("SELECT ? IS NULL, (~(NULLIF(?, ?)))\n" + "FROM corona_select_one_db_one_tb layer_0_left_tb\n" + "\tRIGHT JOIN corona_select_multi_db_one_tb layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test = layer_0_right_tb.decimal_test\n" + - "WHERE ? + ? IS NULL != ? - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, ?, layer_0_left_tb.year_test))" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE ? + ? IS NULL != ? - layer_0_right_tb.time_test NOT IN (layer_0_left_tb.decimal_test, layer_0_right_tb.tinyint_test, layer_0_left_tb.integer_test, RPAD(NULL, ?, layer_0_left_tb.year_test))", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java index b0af75d91..868d3fbd4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_155.java @@ -28,10 +28,7 @@ public class MySqlSelectTest_155 extends MysqlTest { assertEquals("SELECT SQL_NO_CACHE (layer_0_right_tb.integer_test IS ?)\n" + "FROM corona_select_multi_db_multi_tb layer_0_left_tb\n" + "\tLEFT JOIN corona_select_one_db_one_tb layer_0_right_tb ON layer_0_right_tb.decimal_test = layer_0_left_tb.varchar_test\n" + - "WHERE ? = ? NOT BETWEEN layer_0_right_tb.tinyint_1bit_test AND ?" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE ? = ? NOT BETWEEN layer_0_right_tb.tinyint_1bit_test AND ?", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java index 7a98a4ef0..6b76a605c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_156.java @@ -32,10 +32,7 @@ public class MySqlSelectTest_156 extends MysqlTest { assertEquals("SELECT SQL_SMALL_RESULT (NULL IS NOT ?)\n" + "FROM corona_select_multi_db_one_tb layer_0_left_tb\n" + "\tRIGHT JOIN corona_select_one_db_multi_tb layer_0_right_tb ON layer_0_right_tb.smallint_test = layer_0_right_tb.date_test\n" + - "WHERE layer_0_right_tb.time_test = ? NOT BETWEEN ? AND layer_0_right_tb.bigint_test;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE layer_0_right_tb.time_test = ? NOT BETWEEN ? AND layer_0_right_tb.bigint_test;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java index 89cd60ad6..6aa339750 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_157.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; import com.alibaba.druid.sql.ast.expr.SQLInListExpr; @@ -24,11 +23,11 @@ public class MySqlSelectTest_157 extends MysqlTest { // List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); - String sqlNew=stmt.toString(); + String sqlNew = stmt.toString(); System.out.println(sqlNew); statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, SQLParserFeature.TDDLHint); SQLSelectStatement stmtNew2 = (SQLSelectStatement) statementList.get(0); - String sqlNew2=stmtNew2.toString(); + String sqlNew2 = stmtNew2.toString(); System.out.println(sqlNew2); assertEquals(sqlNew, sqlNew2); assertEquals(1, statementList.size()); @@ -44,10 +43,7 @@ public class MySqlSelectTest_157 extends MysqlTest { assertEquals("SELECT ?\n" + "FROM corona_select_one_db_one_tb layer_0_left_tb\n" + "\tRIGHT JOIN corona_select_multi_db_multi_tb layer_0_right_tb ON layer_0_right_tb.mediumint_test = layer_0_right_tb.char_test\n" + - "WHERE (layer_0_right_tb.timestamp_test BETWEEN ? AND ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)))" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); - - + "WHERE (layer_0_right_tb.timestamp_test BETWEEN ? AND ROW(?, ?) NOT IN (ROW(?, ?), ROW(?, ?)))", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java index 92d6ca161..e00c35209 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_158.java @@ -1,16 +1,14 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr; -import com.alibaba.druid.sql.ast.expr.SQLInListExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; @@ -28,18 +26,15 @@ public class MySqlSelectTest_158 extends MysqlTest { "FROM t;", stmt.toString()); assertEquals("SELECT f1 RLIKE ?\n" + - "FROM t;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM t;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); List params = new ArrayList(); assertEquals("SELECT f1 RLIKE ?\n" + - "FROM t;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM t;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); assertEquals(1, params.size()); assertEquals("[\"\\n+b\"]", JSON.toJSONString(params)); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java index 78f62d6ad..54a91dc5a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_159.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +8,7 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ public class MySqlSelectTest_159 extends MysqlTest { "\t\t, CASE WHEN '0' <> '0' THEN CAST(brand_id AS bigint) ELSE CAST(-1 AS bigint) END AS 品牌ID\n" + "\t\t, CASE WHEN '0' <> '0' THEN brand_name ELSE '-' END AS 品牌名称, SUM(abs(trade_paid_money) - abs(refund_paid_money)) AS 订单实付, SUM(abs(trade_paid_money) - abs(refund_paid_money) + abs(trade_shop_coupon_biz_burden_fee) - abs(refund_shop_coupon_biz_burden_fee) + abs(trade_shop_coupon_other_biz_burden_fee) - abs(refund_shop_coupon_other_biz_burden_fee) + abs(trade_tmall_coupon_not_gold_biz_burden_fee) - abs(refund_tmall_coupon_not_gold_biz_burden_fee) + abs(trade_tmall_coupon_gold1_biz_burden_fee) - abs(refund_tmall_coupon_gold1_biz_burden_fee) + abs(trade_tmall_coupon_gold2_biz_burden_fee) - abs(refund_tmall_coupon_gold2_biz_burden_fee) + abs(trade_tmall_vip_biz_burden_fee) - abs(refund_tmall_vip_biz_burden_fee) + abs(trade_susidy_fee) - abs(refund_susidy_fee) + abs(trade_shop_coupon_supp_burden_fee) - abs(refund_shop_coupon_supp_burden_fee) + abs(trade_shop_coupon_other_supp_burden_fee) - abs(refund_shop_coupon_other_supp_burden_fee) + abs(trade_tmall_coupon_not_gold_supp_burden_fee) - abs(refund_tmall_coupon_not_gold_supp_burden_fee) + abs(trade_tmall_coupon_gold1_supp_burden_fee) - abs(refund_tmall_coupon_gold1_supp_burden_fee) + abs(trade_tmall_coupon_gold2_supp_burden_fee) - abs(refund_tmall_coupon_gold2_supp_burden_fee) + (abs(trade_tmall_vip_supp_burden_fee) - abs(refund_tmall_vip_supp_burden_fee))) AS 理论成交, SUM(abs(trade_paid_money) - abs(refund_paid_money) - abs(trade_payment_amount) + abs(trade_marketing_fee) + abs(taoke_trade_money) + abs(refund_payment_amount) - abs(refund_marketing_fee) - abs(taoke_refund_money) + abs(trade_shop_coupon_biz_burden_fee) - abs(refund_shop_coupon_biz_burden_fee) + abs(trade_shop_coupon_other_biz_burden_fee) - abs(refund_shop_coupon_other_biz_burden_fee) + abs(trade_tmall_coupon_not_gold_biz_burden_fee) - abs(refund_tmall_coupon_not_gold_biz_burden_fee) + abs(trade_tmall_coupon_gold1_biz_burden_fee) - abs(refund_tmall_coupon_gold1_biz_burden_fee) + abs(trade_tmall_coupon_gold2_biz_burden_fee) - abs(refund_tmall_coupon_gold2_biz_burden_fee) + abs(trade_tmall_vip_biz_burden_fee) - abs(refund_tmall_vip_biz_burden_fee) + (abs(trade_susidy_fee) - abs(refund_susidy_fee))) AS 折前毛利 , SUM(abs(trade_shop_coupon_biz_burden_fee) - abs(refund_shop_coupon_biz_burden_fee)) AS 猫超承担店铺优惠券金额, SUM(abs(trade_shop_coupon_other_biz_burden_fee) - abs(refund_shop_coupon_other_biz_burden_fee)) AS 猫超承担店铺优惠券其他金额, SUM(abs(trade_tmall_coupon_not_gold_biz_burden_fee) - abs(refund_tmall_coupon_not_gold_biz_burden_fee)) AS 猫超承担跨店优惠非金本位, SUM(abs(trade_tmall_coupon_gold1_biz_burden_fee) - abs(refund_tmall_coupon_gold1_biz_burden_fee) + abs(trade_tmall_coupon_gold2_biz_burden_fee) - abs(refund_tmall_coupon_gold2_biz_burden_fee)) AS 猫超承担跨店优惠金本位, SUM(abs(trade_tmall_vip_biz_burden_fee) - abs(refund_tmall_vip_biz_burden_fee)) AS 超级会员折扣 , SUM(abs(trade_susidy_fee) - abs(refund_susidy_fee)) AS 猫超承担补贴金额, SUM(abs(trade_paid_money) - abs(refund_paid_money) - abs(trade_payment_amount) + abs(trade_marketing_fee) + abs(taoke_trade_money) + abs(refund_payment_amount) - abs(refund_marketing_fee) - abs(taoke_refund_money)) AS 折后毛利, '-' AS 物流成本, '-' AS 物流成本占比, SUM(abs(trade_postfee_share)) AS 物流收入 , SUM(abs(taoke_trade_money) - abs(taoke_refund_money)) AS 淘客收入, '-' AS 免费货收入, SUM(trade_payment_amount) AS 正向分账金额, SUM(refund_payment_amount) AS 逆向分账金额, SUM(trade_marketing_fee) AS 正向营销费用 , SUM(refund_marketing_fee) AS 逆向营销费用 \n" + "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); @@ -257,8 +257,8 @@ public class MySqlSelectTest_159 extends MysqlTest { "\t) 成本汇总\n" + "\t\tLEFT JOIN dim_channel_maochao dcm ON 成本汇总.渠道 = dcm.id\n" + "\t\tLEFT JOIN dim_city_maochao dcm1 ON CAST(成本汇总.城市 AS bigint) = dcm1.id\n" + - ") quark_t1" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + ") quark_t1", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); List params = new ArrayList(); assertEquals("SELECT COUNT(*) AS COUNT\n" + @@ -372,13 +372,10 @@ public class MySqlSelectTest_159 extends MysqlTest { "\t) 成本汇总\n" + "\t\tLEFT JOIN dim_channel_maochao dcm ON 成本汇总.渠道 = dcm.id\n" + "\t\tLEFT JOIN dim_city_maochao dcm1 ON CAST(成本汇总.城市 AS bigint) = dcm1.id\n" + - ") quark_t1" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + ") quark_t1", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); assertEquals(112, params.size()); assertEquals("[100,6,100,6,100,6,100,6,\"%\",100,6,6,\"%\",100,6,6,\"%\",100,6,100,6,\"%\",100,6,100,6,\"%\",100,6,100,6,\"%\",100,6,100,6,\"%\",100,6,100,6,\"%\",100,6,100,6,\"%\",100,6,100,6,100,6,100,6,\"%\",100,6,100,6,100,6,100,6,\"0\",\"0\",-1,\"0\",\"0\",\"-\",\"0\",\"0\",\"-1\",\"0\",\"0\",\"-\",\"0\",\"0\",\"-\",\"0\",\"0\",-1,\"0\",\"0\",\"-\",\"-\",\"-\",\"-\",\"119079\",\"20170401\",\"20180228\",\"0\",\"0\",-1,\"0\",\"0\",\"-\",\"0\",\"0\",\"-1\",\"0\",\"0\",\"-\",\"0\",\"0\",\"-\",\"0\",\"0\",-1,\"0\",\"0\",\"-\"]", JSON.toJSONString(params)); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java index 37cd50c3e..f3d02d5fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_16.java @@ -28,7 +28,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -57,7 +56,6 @@ public class MySqlSelectTest_16 extends MysqlTest { assertTrue(binaryWhere.getRight() instanceof SQLNotExpr); } - assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java index fbc1c2be4..a7e840ef3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_160.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +8,7 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; @@ -24,17 +24,14 @@ public class MySqlSelectTest_160 extends MysqlTest { assertEquals("SELECT quote('''abc''')", stmt.toString()); - assertEquals("SELECT quote(?)" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + assertEquals("SELECT quote(?)", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); List params = new ArrayList(); - assertEquals("SELECT quote(?)" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + assertEquals("SELECT quote(?)", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); assertEquals(1, params.size()); assertEquals("\"'abc'\"", JSON.toJSONString(params.get(0))); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java index ab76f23a6..51796683d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_161.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +8,7 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; @@ -34,20 +34,17 @@ public class MySqlSelectTest_161 extends MysqlTest { assertEquals("SELECT DATE_FORMAT(FROM_UNIXTIME(`time` / ?), '%Y-%m-%d %H:%i:%s')\n" + "\t, `time`\n" + "FROM pvtz_day\n" + - "ORDER BY `time` DESC" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "ORDER BY `time` DESC", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); List params = new ArrayList(); assertEquals("SELECT DATE_FORMAT(FROM_UNIXTIME(`time` / ?), '%Y-%m-%d %H:%i:%s')\n" + "\t, `time`\n" + "FROM pvtz_day\n" + - "ORDER BY `time` DESC" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "ORDER BY `time` DESC", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); assertEquals(1, params.size()); assertEquals("1000", JSON.toJSONString(params.get(0))); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java index d582ddaa4..91674676f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_162.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.fastjson2.JSON; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,6 +8,7 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.fastjson2.JSON; import java.util.ArrayList; import java.util.List; @@ -44,8 +44,8 @@ public class MySqlSelectTest_162 extends MysqlTest { "\t\tFROM cte\n" + "\t)\n" + "SELECT /*+ MAX_EXECUTION_TIME(1000) */ *\n" + - "FROM cte;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM cte;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); List params = new ArrayList(); assertEquals("WITH RECURSIVE cte (n) AS (\n" + @@ -55,13 +55,10 @@ public class MySqlSelectTest_162 extends MysqlTest { "\t\tFROM cte\n" + "\t)\n" + "SELECT /*+ MAX_EXECUTION_TIME(1000) */ *\n" + - "FROM cte;" - , ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); + "FROM cte;", + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, params, VisitorFeature.OutputParameterizedZeroReplaceNotUseOriginalSql)); assertEquals(2, params.size()); assertEquals("1", JSON.toJSONString(params.get(0))); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java index 0fdb1ab08..2e1fa4656 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_163.java @@ -4,9 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; -import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -28,8 +25,5 @@ public class MySqlSelectTest_163 extends MysqlTest { assertEquals("SELECT val, ROW_NUMBER() OVER (ORDER BY val) AS \"row_number\", RANK() OVER (ORDER BY val) AS \"rank\"\n" + "\t, DENSE_RANK() OVER (ORDER BY val) AS \"dense_rank\"\n" + "FROM numbers;", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java index 3fc50d6b0..48ba41927 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_164_window.java @@ -26,8 +26,5 @@ public class MySqlSelectTest_164_window extends MysqlTest { assertEquals("SELECT val, ROW_NUMBER() OVER w AS \"row_number\", RANK() OVER w AS \"rank\", DENSE_RANK() OVER w AS \"dense_rank\"\n" + "FROM numbers\n" + "WINDOW w AS (ORDER BY val);", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java index e9bc3ff7b..935ff64c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_165_json.java @@ -23,8 +23,5 @@ public class MySqlSelectTest_165_json extends MysqlTest { "WHERE l_shipdate BETWEEN '1997-01-27' AND '1997-02-20'\n" + "\tAND json_extract(l_comment, '$.id') = JSON '1997-01-2810'\n" + "LIMIT 3", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java index 91093e709..08e315e5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_166_xor.java @@ -55,7 +55,5 @@ public class MySqlSelectTest_166_xor extends MysqlTest { "FROM corona_select_one_db_multi_tb layer_1_left_tb\n" + "\tRIGHT JOIN corona_select_multi_db_one_tb layer_1_right_tb ON layer_1_right_tb.datetime_test = layer_1_left_tb.datetime_test\n" + "\tRIGHT JOIN corona_select_one_db_multi_tb layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test = layer_1_left_tb.tinyint_1bit_test;", stmt.toString()); - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java index c8070bb34..e58ab9174 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_167.java @@ -19,5 +19,4 @@ public class MySqlSelectTest_167 extends MysqlTest { assertEquals("SELECT 1 AS 30days", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java index 3d97a3f8b..9674dc372 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_decimal.java @@ -19,5 +19,4 @@ public class MySqlSelectTest_168_decimal extends MysqlTest { assertEquals("SELECT ceiling(DECIMAL '123456789012345678');", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java index 124e91fba..3c4001fc6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_int.java @@ -120,6 +120,4 @@ public class MySqlSelectTest_168_int extends MysqlTest { assertEquals("/*+engine=MPP*/\n" + "SELECT floor(CAST(NULL AS DECIMAL(25, 5)))", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java index f5a409e79..b73c7e06c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_168_union.java @@ -24,5 +24,4 @@ public class MySqlSelectTest_168_union extends MysqlTest { "FROM tb2\n" + "ORDER BY id1);", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java index a5257699a..c838aef16 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_between.java @@ -34,5 +34,4 @@ public class MySqlSelectTest_169_not_between extends MysqlTest { assertEquals("SELECT (a\n" + "\tAND b) NOT BETWEEN 1 AND 2;", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java index 33b620196..3823bfe57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_not_in.java @@ -5,13 +5,10 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.assertEquals; - public class MySqlSelectTest_169_not_in extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT ((10)!=(( (HEX ('abc' )) is FALSE )) ),( (( (( (( 'a')&& (null )) " @@ -22,13 +19,13 @@ public class MySqlSelectTest_169_not_in extends MysqlTest { List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLSelectStatement stmt = (SQLSelectStatement) statementList.get(0); - String newSql=stmt.toString(); + String newSql = stmt.toString(); System.out.println("首次解析后生成的sql===" + newSql); - SQLSelectStatement sqlStatementNew = (SQLSelectStatement) SQLUtils.parseSingleStatement(newSql, DbType.mysql,true); + SQLSelectStatement sqlStatementNew = (SQLSelectStatement) SQLUtils.parseSingleStatement(newSql, DbType.mysql, true); - String newSql2=sqlStatementNew.toString(); + String newSql2 = sqlStatementNew.toString(); System.out.println("再次解析后生成的sql===" + newSql2); - assertEquals(newSql,newSql2); + assertEquals(newSql, newSql2); assertEquals(1, statementList.size()); assertEquals("SELECT (10 != ((HEX('abc')) IS false)), (((('a'\n" + @@ -37,4 +34,4 @@ public class MySqlSelectTest_169_not_in extends MysqlTest { "\tRIGHT JOIN corona_select_multi_db_one_tb layer_1_right_tb ON layer_1_right_tb.datetime_test = layer_1_left_tb.datetime_test\n" + "\tRIGHT JOIN corona_select_one_db_multi_tb layer_0_right_tb ON layer_0_right_tb.tinyint_1bit_test = layer_1_left_tb.tinyint_1bit_test;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java index f8204115d..1d69d12d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_169_values.java @@ -33,5 +33,4 @@ public class MySqlSelectTest_169_values extends MysqlTest { 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()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java index e22db369e..38e0fb3b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_17.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java index 63ac4f2c4..56ac80950 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_170_tddl_hint.java @@ -61,4 +61,4 @@ public class MySqlSelectTest_170_tddl_hint extends MysqlTest { assertSame(TDDLHint.Type.Function, hint.getType()); assertEquals("UNDO_LOG_LIMIT", hint.getFunctions().get(0).getName()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java index 6de3792f3..a4d5b4373 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_171_multi_error.java @@ -2,8 +2,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.util.JdbcConstants; @@ -19,4 +17,4 @@ public class MySqlSelectTest_171_multi_error extends MysqlTest { } assertNotNull(error); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java index 5132654cd..183333f83 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_172_trim.java @@ -156,4 +156,4 @@ public class MySqlSelectTest_172_trim extends MysqlTest { assertEquals("\"", stmt.getSelect().getQueryBlock().getSelectItem(0).getAlias2()); assertEquals("'", stmt.getSelect().getQueryBlock().getSelectItem(1).getAlias2()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java index 2d9ddbb33..125b9a2d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_173.java @@ -133,8 +133,5 @@ public class MySqlSelectTest_173 extends MysqlTest { + "\tEND))\n" + "ORDER BY t_s_secyear.customer_id ASC, t_s_secyear.customer_first_name ASC, t_s_secyear.customer_last_name ASC, t_s_secyear.customer_preferred_cust_flag ASC\n" + "LIMIT 100", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java index 892c10856..e1449f461 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_174_union.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.SQLUnionDataType; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.util.JdbcConstants; @@ -34,5 +33,4 @@ public class MySqlSelectTest_174_union extends MysqlTest { SQLLimit limit = union.getLimit(); assertNotNull(limit); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java index 0d5b091e2..e89acfc1f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_175_hints.java @@ -2,10 +2,8 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLLimit; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.util.JdbcConstants; @@ -36,7 +34,6 @@ public class MySqlSelectTest_175_hints extends MysqlTest { "\t\twhere id = 1\n" + "\t", stmt.toLowerCaseString()); - assertEquals("SELECT /*TDDL:t1.id=1 and t2.id=1*/ *\n" + "FROM t1\n" + "\tINNER JOIN \n" + @@ -45,5 +42,4 @@ public class MySqlSelectTest_175_hints extends MysqlTest { "\t\tWHERE id = ?\n" + "\t", stmt.toParameterizedString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java index ef6f2cebf..94de0a0de 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_176_hints.java @@ -4,9 +4,7 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -47,7 +45,6 @@ public class MySqlSelectTest_176_hints extends MysqlTest { "order by act_id desc\n" + "limit 1", stmt.toLowerCaseString()); - assertEquals("SELECT a.*, b.start_time, b.end_time, b.user_limit, b.member_limit\n" + "\t, b.attributes, b.merchant_code, b.terminal\n" + "FROM wdk_buygift_item a, wdk_online_activity b\n" + @@ -61,6 +58,4 @@ public class MySqlSelectTest_176_hints extends MysqlTest { "ORDER BY act_id DESC\n" + "LIMIT ?", stmt.toParameterizedString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java index 0da5049e8..f948b03fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_177_hints.java @@ -2,21 +2,16 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLReplaceStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlExplainStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.parser.SQLType; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.VisitorFeature; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import org.junit.Test; import java.util.ArrayList; @@ -39,7 +34,7 @@ public class MySqlSelectTest_177_hints extends MysqlTest { 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, @@ -99,6 +94,4 @@ public class MySqlSelectTest_177_hints extends MysqlTest { } } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java index 5870d7feb..eec8ab1bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_178.java @@ -28,7 +28,6 @@ public class MySqlSelectTest_178 extends MysqlTest { "from rt_dws_csn_sta_lgt_ord_ri\n" + "\tcross join rt_dws_csn_sta_lgt_ord_mi;", stmt.toLowerCaseString()); - assertEquals("SELECT rt_dws_csn_sta_lgt_ord_ri.metrics_id AS yujiu\n" + "FROM rt_dws_csn_sta_lgt_ord_ri\n" + "\tCROSS JOIN rt_dws_csn_sta_lgt_ord_mi;", stmt.toParameterizedString()); @@ -37,6 +36,4 @@ public class MySqlSelectTest_178 extends MysqlTest { assertEquals(SQLJoinTableSource.JoinType.CROSS_JOIN, join.getJoinType()); assertNull(join.getLeft().getAlias()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java index a62c96b42..c0b3c3df1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_179.java @@ -18,8 +18,6 @@ public class MySqlSelectTest_179 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("SELECT zip(ARRAY[1, 2], ARRAY['1b', NULL, '3b'])", stmt.toString()); - - } public void test_1() throws Exception { @@ -31,8 +29,6 @@ public class MySqlSelectTest_179 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("SELECT transform(ARRAY[], x -> x + 1);", stmt.toString()); - - } public void test_2() throws Exception { @@ -43,8 +39,5 @@ public class MySqlSelectTest_179 extends MysqlTest { System.out.println(stmt.toString()); assertEquals(1, statementList.size()); assertEquals("SELECT reduce(ARRAY[5, 20, NULL, 50], 0, (s, x) -> IF(x IS NULL, s, s + x), s -> s);", stmt.toString()); - - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java index 7190ff96a..bd675468f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_18.java @@ -20,26 +20,25 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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" // - + ", host.node_id as nodeId" // - + ", host.node_type as nodeType" // - + ", host.begin_time as beginTime" // - + ", host.end_time as endTime" // - + ", host.gmt_create as gmtCreate" // - + ", host.gmt_modify as gmtModify" // - + ", host.reason as reason" // - + ", host.creator_id as creatorId" // - + ", host.modifier_id as modifierId" // - + ", user.name as creator" // - + ", user.name as modifier" // - + ", user.nick_name as nickName " // + String sql = "SELECT host.id as id" + + ", host.item_id as itemId" + + ", host.node_id as nodeId" + + ", host.node_type as nodeType" + + ", host.begin_time as beginTime" + + ", host.end_time as endTime" + + ", host.gmt_create as gmtCreate" + + ", host.gmt_modify as gmtModify" + + ", host.reason as reason" + + ", host.creator_id as creatorId" + + ", host.modifier_id as modifierId" + + ", user.name as creator" + + ", user.name as modifier" + + ", user.nick_name as nickName " + " FROM notice_close_node host left join sys_user user on user.id = host.modifier_id"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java index a27343207..151f3a2f9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_180_extract.java @@ -85,4 +85,4 @@ public class MySqlSelectTest_180_extract extends MysqlTest { assertEquals("SELECT EXTRACT(YOW FROM '2001-08-22 03:04:05.321');", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java index 2ffc285b1..b6cebdf1c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_181_limit.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java index 7a07896c5..ca480e18c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_183_mpp.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -25,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.repository.SchemaRepository; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java index 114034993..bb0ddfeef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_184.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java index 6591b890a..68de602fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_185.java @@ -89,5 +89,4 @@ public class MySqlSelectTest_185 extends MysqlTest { "ORDER BY product.sort ASC", // output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java index b6238f330..80ed52ee6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_186.java @@ -18,9 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; @@ -64,5 +61,4 @@ public class MySqlSelectTest_186 extends MysqlTest { ") tmp_count", // output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java index 4c5b3b15f..adb287e57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_187.java @@ -114,5 +114,4 @@ public class MySqlSelectTest_187 extends MysqlTest { "ORDER BY season_id DESC", // output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java index b3d5412af..72726e378 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_188.java @@ -147,4 +147,4 @@ public class MySqlSelectTest_188 extends MysqlTest { "\tOR (a.account_certify_type IS NULL\n" + "\t\tAND b.account_certify_type = 'personal')))", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java index 12d19f2de..9e6e4c99d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_189.java @@ -21,4 +21,4 @@ public class MySqlSelectTest_189 extends MysqlTest { assertEquals("SELECT 10 / (2 * 2) / 2;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java index c9c43b7aa..8034d61db 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_19.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java index 84158b660..3ebbb78a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_190_drds.java @@ -28,4 +28,4 @@ public class MySqlSelectTest_190_drds extends MysqlTest { "SELECT *\n" + "FROM xxx_tb;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java index f3b5e2812..d0c41dd52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_191_specialName.java @@ -22,4 +22,4 @@ public class MySqlSelectTest_191_specialName extends MysqlTest { assertEquals("SELECT *\n" + "FROM t$c t", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java index c24c7e522..b9fccb58d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_192_ibatis.java @@ -24,4 +24,4 @@ public class MySqlSelectTest_192_ibatis extends MysqlTest { "FROM ${table_name}\n" + "WHERE ${column_name} IN (#{valueList})", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java index b1f92c500..504913935 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_193_ibatis.java @@ -23,4 +23,4 @@ public class MySqlSelectTest_193_ibatis extends MysqlTest { "FROM x\n" + "WHERE a IN (${x})", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java index 3ac5bfe7b..5432fd131 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_196_wall.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.ParserException; @@ -22,4 +21,4 @@ public class MySqlSelectTest_196_wall extends MysqlTest { assertNotNull(error); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java index 96010902b..d07be652a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_197.java @@ -68,7 +68,6 @@ public class MySqlSelectTest_197 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("SELECT '''1''''' AS a;", stmt.toString()); - } public void test_4() throws Exception { @@ -83,6 +82,5 @@ public class MySqlSelectTest_197 extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("SELECT '''1''''' AS a;", stmt.toString()); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java index 030ea4647..5c5af67d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_198.java @@ -30,4 +30,4 @@ public class MySqlSelectTest_198 extends MysqlTest { "from hive.oa1013022312866336_bj_tpch_10x_oss.orders_text_date\n" + "limit 1000", stmt.toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java index 4d34282a4..a6b6a7845 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_199_hint.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; -import static org.junit.Assert.*; import java.util.List; @@ -31,12 +30,10 @@ public class MySqlSelectTest_199_hint extends MysqlTest { String sql = " SELECT NAME \n" + " FROM CUSTOMER \n" + " INNER JOIN ORDERS ON\n" + " CUSTOMER.CUSTKEY = ORDERS.CUSTKEY /*+ dynamicFilter = true */\n"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - { String output = SQLUtils.toMySqlString(stmt); assertEquals("SELECT NAME\n" + "FROM CUSTOMER\n" @@ -426,7 +423,6 @@ public class MySqlSelectTest_199_hint extends MysqlTest { } } - public void test_13() throws Exception { String sql = " explain (FORMAT detail) SELECT customer.NAME, MAX(customer.CUSTKEY) MAXKEY" + " FROM CUSTOMER," + @@ -475,7 +471,6 @@ public class MySqlSelectTest_199_hint extends MysqlTest { "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=partition*/" + "LIMIT 100"; - ; SQLStatement stmt = SQLUtils.parseSingleStatement( sql, @@ -501,7 +496,6 @@ public class MySqlSelectTest_199_hint extends MysqlTest { "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=repartition*/" + "LIMIT 100"; - ; SQLStatement stmt = SQLUtils.parseSingleStatement( sql, @@ -527,7 +521,6 @@ public class MySqlSelectTest_199_hint extends MysqlTest { "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distributionType=broadcast*/" + "LIMIT 100"; - ; SQLStatement stmt = SQLUtils.parseSingleStatement( sql, @@ -553,7 +546,6 @@ public class MySqlSelectTest_199_hint extends MysqlTest { "JOIN lineitem l " + "ON o.orderkey = l.orderkey /*+distribution_type=broadcast*/" + "LIMIT 100"; - ; SQLStatement stmt = SQLUtils.parseSingleStatement( sql, diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java index 0cbb9327d..4056d0bad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java index 477f82aef..8bd23cf12 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_20 extends MysqlTest { + " 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java index 66e404146..f1a1fbd79 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_200_presto.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -49,5 +47,4 @@ public class MySqlSelectTest_200_presto extends MysqlTest { output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java index bd0939c67..78cbcebe0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_201.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -55,5 +53,4 @@ public class MySqlSelectTest_201 extends MysqlTest { output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java index 8f6b29f23..544304dd4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_20190424_01.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_20190424_01 extends MysqlTest { public void test_0() throws Exception { String sql = "/*+ engine= MPP, dump-header= [DUMP DATA]*/\n" + @@ -98,6 +97,4 @@ public class MySqlSelectTest_20190424_01 extends MysqlTest { "\tOR (t3.sum_score = 1986\n" + "\t\tAND t3.sim_aid % 100 < 97)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java index c5d4ae637..0bb75e0ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_205_drds_group_concat.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_205_drds_group_concat extends MysqlTest { " FROM student\n" + " GROUP BY student_name;"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -55,5 +53,4 @@ public class MySqlSelectTest_205_drds_group_concat extends MysqlTest { output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java index b58abd9d9..b8c7a6daf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_206_union.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; @@ -28,7 +27,6 @@ public class MySqlSelectTest_206_union extends MysqlTest { 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); @@ -57,8 +55,5 @@ public class MySqlSelectTest_206_union extends MysqlTest { assertEquals(8, visitor.getColumns().size()); assertEquals(2, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java index 5d1497876..e423cf99a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_207_cast.java @@ -36,7 +36,6 @@ public class MySqlSelectTest_207_cast extends MysqlTest { " AND b.com_id = a.com_id\n" + " AND a.key_stats_cd = 'Y'"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -58,8 +57,5 @@ public class MySqlSelectTest_207_cast extends MysqlTest { assertEquals(9, visitor.getColumns().size()); assertEquals(4, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java index 58d889afe..4bb4cf285 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_209_not.java @@ -18,7 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLNotExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; @@ -29,7 +28,6 @@ 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); @@ -52,8 +50,5 @@ public class MySqlSelectTest_209_not extends MysqlTest { SQLNotExpr notExpr = (SQLNotExpr) ((SQLSelectStatement) stmt).getSelect().getQueryBlock().getWhere(); assertNotNull(notExpr.getParent()); assertNotNull(notExpr.getExpr().getParent()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java index a727c03b0..6936f0bd5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_21.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -27,7 +26,6 @@ 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); @@ -49,11 +47,9 @@ public class MySqlSelectTest_21 extends MysqlTest { 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java index f7097e543..bacbe2dc9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_210_union.java @@ -17,8 +17,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLNotExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; @@ -44,7 +42,6 @@ public class MySqlSelectTest_210_union extends MysqlTest { " )\n" + ")"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -76,8 +73,5 @@ public class MySqlSelectTest_210_union extends MysqlTest { assertEquals(4, visitor.getColumns().size()); assertEquals(5, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java index dc582b2c4..dbc995cc0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_211_union.java @@ -26,7 +26,6 @@ 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); @@ -54,8 +53,5 @@ public class MySqlSelectTest_211_union extends MysqlTest { assertEquals(3, visitor.getColumns().size()); assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java index 7f324819e..ecedfe46a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_212_alias.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_212_alias extends MysqlTest { public void test_2() throws Exception { String sql = "SELECT count(1) from information_schema.tables;"; @@ -40,7 +39,6 @@ public class MySqlSelectTest_212_alias extends MysqlTest { "FROM information_schema.tables;", stmt.toString()); } - public void test_3() throws Exception { String sql = "select count(Distinct id) from t"; @@ -53,6 +51,4 @@ public class MySqlSelectTest_212_alias extends MysqlTest { assertEquals("SELECT count(DISTINCT id) AS `count(Distinct id)`\n" + "FROM t", text); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java index b00caf302..2ca233be0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_213.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_213 extends MysqlTest { public void test_0() throws Exception { String sql = "select 'a\\'b\\'c\\'d\\'e' from t"; @@ -39,4 +38,4 @@ public class MySqlSelectTest_213 extends MysqlTest { assertEquals("SELECT 'a''b''c''d''e'\n" + "FROM t", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java index 7dc91424d..74834adab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_214.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_214 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT numbers, animals, n, a\n" + @@ -82,4 +81,4 @@ public class MySqlSelectTest_214 extends MysqlTest { "from (values (ARRAY[2, 5], ARRAY['dog', 'cat', 'bird']), (ARRAY[7, 8, 9], ARRAY['cow', 'pig'])) as x (numbers, animals)\n" + "\tcross join unnest(numbers, animals) as t (n, a);", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java index 1f7dc130a..fc48c6bc3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_215.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - public class MySqlSelectTest_215 extends MysqlTest { public void test_0() throws Exception { String sql = "select 7777777777777777777777777777777777777 * 10 from t1;"; @@ -43,6 +39,5 @@ public class MySqlSelectTest_215 extends MysqlTest { assertEquals("select 7777777777777777777777777777777777777 * 10\n" + "from t1;", stmt.clone().toLowerCaseString()); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java index c201fc3af..80bcdc852 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_216.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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"; @@ -77,6 +75,5 @@ public class MySqlSelectTest_216 extends MysqlTest { ") t1, t_jifen_account t2\n" + "where t1.id = t2.id\n" + "\tand t2.sellerId = 15142801667171005", stmt.clone().toLowerCaseString()); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java index 8c6dca75a..db991cbcb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_217_unnest.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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)"; @@ -41,6 +39,5 @@ public class MySqlSelectTest_217_unnest extends MysqlTest { assertEquals("select x\n" + "from unnest(array[1, 2, 3]) as t (x)", stmt.clone().toLowerCaseString()); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java index cc2eb985b..934795e42 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_218_jdbc.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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'}"; @@ -40,4 +38,4 @@ public class MySqlSelectTest_218_jdbc extends MysqlTest { assertEquals("select date '2018-07-24', time '12:34:56', timestamp '2018-07-24 12:34:56'", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java index 2bccb79da..6b1d9f202 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_219_jdbc_fn.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_219_jdbc_fn extends MysqlTest { public void test_0() throws Exception { String sql = "select {fn POWER(2,2)}"; @@ -39,4 +38,4 @@ public class MySqlSelectTest_219_jdbc_fn extends MysqlTest { assertEquals("select POWER(2, 2)", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java index f9a1bc9e8..7316ad144 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_22.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -27,7 +26,6 @@ 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); @@ -48,6 +46,4 @@ public class MySqlSelectTest_22 extends MysqlTest { assertEquals(1, visitor.getConditions().size()); assertEquals(1, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java index 982800083..f8117a0ed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_220_jdbc_fn.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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" + @@ -47,4 +46,4 @@ public class MySqlSelectTest_220_jdbc_fn extends MysqlTest { "from `calcs`\n" + "group by 1", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java index 0edb8b1b1..efba07c46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_221.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_221 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT\n" + @@ -85,4 +84,4 @@ public class MySqlSelectTest_221 extends MysqlTest { "from `calcs`\n" + "group by 1", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java index 1ff72e26e..8b01e8c6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_222.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_222 extends MysqlTest { public void test_0() throws Exception { String sql = "/*+engine=mpp*/ (select close from linxi1 where id = 3)"; @@ -45,4 +44,4 @@ public class MySqlSelectTest_222 extends MysqlTest { "from linxi1\n" + "where id = 3)", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java index 1003ec5bb..a07faae7b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_223_jdbc_fn.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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" + @@ -47,4 +46,4 @@ public class MySqlSelectTest_223_jdbc_fn extends MysqlTest { "from `calcs`\n" + "group by 1", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java index 8be8ef171..921351fac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_224.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_224 extends MysqlTest { public void test_0() throws Exception { String sql = "select userid, order, unionid from t"; @@ -41,4 +40,4 @@ public class MySqlSelectTest_224 extends MysqlTest { assertEquals("select userid, order, unionid\n" + "from t", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java index 087be25f6..833804a1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_225_reg.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_225_reg extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT regexp_extract_all('1a 2b 14m', '\\\\d+')"; @@ -39,4 +38,4 @@ public class MySqlSelectTest_225_reg extends MysqlTest { assertEquals("select regexp_extract_all('1a 2b 14m', '\\\\d+')", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java index 727e14a9e..accdb2127 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_226.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.List; - public class MySqlSelectTest_226 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT sum(`price`) AS aggregate, `aa` \n" + @@ -57,4 +56,4 @@ public class MySqlSelectTest_226 extends MysqlTest { // assertEquals("select userid, order, unionid\n" + // "from t", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java index e47371c96..1031e1bf5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_227.java @@ -18,11 +18,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - public class MySqlSelectTest_227 extends MysqlTest { public void test_0() throws Exception { @@ -37,4 +32,4 @@ public class MySqlSelectTest_227 extends MysqlTest { } assertNotNull(error); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java index 89e0ee54f..32e92db13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_228.java @@ -19,15 +19,11 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.List; - public class MySqlSelectTest_228 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT *\n" + @@ -77,5 +73,4 @@ public class MySqlSelectTest_228 extends MysqlTest { assertEquals("SELECT cardinality(regexp_extract_all('test', '\"meid\":\"')) AS `cardinality(regexp_extract_all('test', '\"meid\":\"'))`;", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java index a7420a6b0..378a8e70f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_229_interval.java @@ -17,14 +17,10 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; import java.util.List; - public class MySqlSelectTest_229_interval extends MysqlTest { public void test_0() throws Exception { String sql = "select DATE_ADD(utc_date(), INTERVAL -'5' DAY)"; @@ -59,4 +55,4 @@ public class MySqlSelectTest_229_interval extends MysqlTest { assertEquals("select DATE_ADD(utc_date(), interval +5 day)", stmt.clone().toLowerCaseString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java index a960d82a7..c583ee8d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_230.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; import java.util.List; - 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"; @@ -40,6 +36,4 @@ public class MySqlSelectTest_230 extends MysqlTest { assertEquals("SELECT CAST('test collated returns' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin AS anon_1", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java index 296f9540b..ed518b6d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_231_keywords.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - 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"; @@ -38,6 +37,4 @@ public class MySqlSelectTest_231_keywords extends MysqlTest { // assertEquals("SELECT CONDITION\n" + // "FROM t", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java index 109c4cade..8242b9b5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_232.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_232 extends MysqlTest { public void test_0() throws Exception { String sql = "select * from tb where id = '1'-1;"; @@ -40,7 +39,6 @@ public class MySqlSelectTest_232 extends MysqlTest { "WHERE id = '1' - 1;", stmt.toString()); } - public void test_1() throws Exception { String sql = "select '1' - 1 from tb"; @@ -56,6 +54,4 @@ public class MySqlSelectTest_232 extends MysqlTest { assertEquals("SELECT '1' - 1\n" + "FROM tb", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java index c789edf65..2159301f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_233.java @@ -17,15 +17,10 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -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.SQLUnionQuery; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; - public class MySqlSelectTest_233 extends MysqlTest { public void test_0() throws Exception { @@ -35,7 +30,6 @@ public class MySqlSelectTest_233 extends MysqlTest { "select f2\n" + "from t2"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); SQLUnionQuery query = (SQLUnionQuery) stmt.getSelect().getQuery(); @@ -53,6 +47,4 @@ public class MySqlSelectTest_233 extends MysqlTest { "FROM t2\n" + "ORDER BY f1)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java index 5dfd52f3c..77f44dec8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_234.java @@ -17,11 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; - public class MySqlSelectTest_234 extends MysqlTest { public void test_0() throws Exception { @@ -33,7 +29,6 @@ public class MySqlSelectTest_234 extends MysqlTest { + " union \n" + " SELECT ema_user_id, 1 as o FROM g170_user WHERE `g_distinct_id`= '' LIMIT 1 ) ORDER BY o"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT ema_user_id\n" + @@ -50,6 +45,4 @@ public class MySqlSelectTest_234 extends MysqlTest { ")\n" + "ORDER BY o", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java index 32551bd9f..c96c5ee8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_235.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_235 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT ema_user_id\n" @@ -31,7 +30,6 @@ public class MySqlSelectTest_235 extends MysqlTest { + " SELECT ema_user_id, 1 as o FROM g170_user WHERE `g_distinct_id`= '' LIMIT 1 ) ORDER BY o\n" + "/*+ xxx */"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT ema_user_id\n" + @@ -48,6 +46,4 @@ public class MySqlSelectTest_235 extends MysqlTest { ")\n" + "ORDER BY o/*+ xxx */", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java index b608e39d5..a456bfcb3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_236.java @@ -19,12 +19,10 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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\"})*/"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT count(1) AS userCount, count(t.telephone) AS userWithPhoneCount\n" + @@ -39,6 +37,4 @@ public class MySqlSelectTest_236 extends MysqlTest { "\t\tINNER JOIN dw_user_property_wide_table_merged_v2 dw ON t.user_id = dw.userid\n" + ") t /*+META({\"s\": \"com.qunhe.logcomplex.userinformation.mapper.ads.UserPropertyMapper.countUser\"})*/", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java index c39508025..cda09f403 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_237.java @@ -19,17 +19,13 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_237 extends MysqlTest { public void test_0() throws Exception { String sql = "select distinct (f1) from t3;"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT DISTINCT f1\n" + "FROM t3;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java index 4d6df4828..231adecee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_238.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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" + @@ -40,7 +39,6 @@ public class MySqlSelectTest_238 extends MysqlTest { " and s.cat_id in (127234002 )\n" + ") a"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT a.cat_id1, a.cat_name1, a.cat_id2, a.cat_name2, a.cat_id3\n" + @@ -74,6 +72,4 @@ public class MySqlSelectTest_238 extends MysqlTest { "\t\tAND s.cat_id IN (127234002)\n" + ") a", stmt.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java index f9b359dad..cf38e3cd9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_239.java @@ -19,18 +19,14 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT group_concat('\"', NODE_IP, '\"')\n" + "FROM `tiansuan_node`\n" + "WHERE `GROUP_ID` = 4", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java index 54855ec6d..cd144a050 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_24.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -68,6 +66,4 @@ public class MySqlSelectTest_24 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java index 9f84bfef4..d81d91af1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_240.java @@ -19,18 +19,14 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT sum(file_size / 1024. / 1024.) / 1024.\n" + "FROM mssql_oss_download_list", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java index 6c7e1bd01..fd59b7fde 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_241.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - 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" + @@ -29,7 +28,6 @@ public class MySqlSelectTest_241 extends MysqlTest { " SELECT '1' as job_name\n" + ") job_name_all) as job_names on job_names.job_name = org.job_name"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT job_names.job_name\n" + @@ -42,10 +40,7 @@ public class MySqlSelectTest_241 extends MysqlTest { "\t) job_names\n" + "\tON job_names.job_name = org.job_name", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java index 12206ab39..910f28db4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_242.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - public class MySqlSelectTest_242 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT ip.*\n" + @@ -28,7 +27,6 @@ public class MySqlSelectTest_242 extends MysqlTest { "WHERE connect.siteId = 2844001\n" + " AND connect.cnId = ip.cnId;"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleMysqlStatement(sql); assertEquals("SELECT ip.*\n" + @@ -36,10 +34,7 @@ public class MySqlSelectTest_242 extends MysqlTest { "WHERE connect.siteId = 2844001\n" + "\tAND connect.cnId = ip.cnId;", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java index 6784c99d0..cf1579703 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_243.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - public class MySqlSelectTest_243 extends MysqlTest { public void test_0() throws Exception { String sql = "Select DISTINCT buyer_id,\n" + @@ -38,7 +37,6 @@ public class MySqlSelectTest_243 extends MysqlTest { "LIMIT 0,\n" + " 10"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.elastic_search); assertEquals( @@ -56,6 +54,4 @@ public class MySqlSelectTest_243 extends MysqlTest { MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java index 78ac16827..c1af5429d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_244.java @@ -21,22 +21,17 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - 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"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT concat('if((order.logisticsCompanyID!=null && order.logisticsCompanyID==\"', substring_index(name, '诚信通促销打折', 1)) AS a\n" + "FROM `alc_promotion`\n" + "WHERE id = 1000000000129", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java index 39b5ad92f..8db950cfa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_245.java @@ -21,22 +21,17 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - public class MySqlSelectTest_245 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM tt ORDER BY c1 NULLS LAST"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT *\n" + "FROM tt\n" + "ORDER BY c1 NULLS LAST", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java index 2f4675c16..f13ffaf63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_246.java @@ -21,20 +21,15 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - 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))"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT -CAST(10 AS decimal(10, 2)), +CAST(10 AS decimal(10, 2))", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java index 1daee6ec3..afa0daa33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_247.java @@ -21,16 +21,12 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; -import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; - public class MySqlSelectTest_247 extends MysqlTest { public void test_0() throws Exception { String sql = "select CONVERT(id, char(20))"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT CONVERT(id, char(20))", stmt.toString()); @@ -39,6 +35,4 @@ public class MySqlSelectTest_247 extends MysqlTest { SQLExpr arg1 = convert.getArguments().get(1); assertEquals(SQLDataTypeRefExpr.class, arg1.getClass()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java index a78cbbc88..a29df48e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_248.java @@ -18,22 +18,15 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLDataTypeRefExpr; -import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_248 extends MysqlTest { public void test_0() throws Exception { String sql = "select top.* from t1 top"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT top.*\n" + "FROM t1 top", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java index 0f5979f66..bd8781af5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_249.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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) )"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT CAST(t.a AS ROW(v1 varchar,v2 varchar))\n" + @@ -37,6 +35,4 @@ public class MySqlSelectTest_249 extends MysqlTest { "\t\tCROSS JOIN UNNEST(package_array) AS t (a)\n" + ")", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java index 9efbe4841..ff4a4c5e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_25.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -68,6 +66,4 @@ public class MySqlSelectTest_25 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java index b8081b04c..5af5bf73d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_250.java @@ -20,16 +20,12 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_250 extends MysqlTest { public void test_0() throws Exception { String sql = "select concat(@@version, ' ', @@version_comment)"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT concat(@@version, ' ', @@version_comment)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java index 330b39f06..06789b1b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_251.java @@ -20,16 +20,12 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_251 extends MysqlTest { public void test_0() throws Exception { String sql = "select tinyint '--127', smallint '--127', INTEGER '--128', bigint '--127'"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT TINYINT '127', SMALLINT '127', 128, BIGINT '127'", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java index 08014994e..f38c1c26a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_252.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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)"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, DbType.mysql); assertEquals("SELECT *\n" + @@ -36,6 +34,4 @@ public class MySqlSelectTest_252 extends MysqlTest { "\t\tVALUES (2)\n" + "\t) AS b ON IF(a.x = 1, true, false)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java index 32d9340bc..88703c4fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_253.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_253 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT a FROM t1 GROUP BY ()"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_253 extends MysqlTest { "FROM t1\n" + "GROUP BY ()", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java index df24f0979..cd63ff4fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_254.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_254 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT 'a', (VALUES 1) GROUP BY 1"; @@ -33,6 +32,4 @@ public class MySqlSelectTest_254 extends MysqlTest { "\t)\n" + "GROUP BY 1", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java index b433295a9..a0fc837c0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_255.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_255 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM t1 WHERE t1.a <= ALL (VALUES 10, 20)"; @@ -33,6 +32,4 @@ public class MySqlSelectTest_255 extends MysqlTest { "\tVALUES 10, 20\n" + ")", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java index 6f13eb539..b48ef11b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_256.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - 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"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_256 extends MysqlTest { "FROM t1\n" + "GROUP BY b", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java index 70613f7f7..2358d67e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_257.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_257 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS 0.5 PRECEDING)"; @@ -29,6 +28,4 @@ public class MySqlSelectTest_257 extends MysqlTest { assertEquals("SELECT rank() OVER ( ROWS 0.5 PRECEDING)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java index d3fe1db96..4157fca21 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_258.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_258 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS 'foo' PRECEDING)"; @@ -29,6 +28,4 @@ public class MySqlSelectTest_258 extends MysqlTest { assertEquals("SELECT rank() OVER ( ROWS 'foo' PRECEDING)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java index 7dcf2a6af..1cf378f7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_259.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; - public class MySqlSelectTest_259 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT rank() OVER (ROWS BETWEEN CURRENT ROW AND 'foo' FOLLOWING)"; @@ -29,6 +28,4 @@ public class MySqlSelectTest_259 extends MysqlTest { assertEquals("SELECT rank() OVER ( ROWS BETWEEN CURRENT ROW AND 'foo' FOLLOWING)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java index 5f57f3858..c05248ef3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_26.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -60,6 +58,4 @@ public class MySqlSelectTest_26 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java index a76d4958b..2332fe395 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_260.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_260 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT x.c as x\n" + @@ -37,6 +36,4 @@ public class MySqlSelectTest_260 extends MysqlTest { ") AS x (c)\n" + "ORDER BY x1.c", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java index 7b8d1c076..f2af19173 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_261.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_261 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM t CROSS JOIN UNNEST(a) WITH ORDINALITY"; @@ -33,6 +32,4 @@ public class MySqlSelectTest_261 extends MysqlTest { "FROM t\n" + "\tCROSS JOIN UNNEST(a) WITH ORDINALITY", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java index 4b991c9ef..aad7ed0d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_262.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_262 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT s.acctbal,\n" + @@ -56,6 +55,4 @@ public class MySqlSelectTest_262 extends MysqlTest { "ORDER BY s.acctbal DESC, n.name, s.name, p.partkey\n" + "LIMIT 100", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java index 37d28a5b1..8dbbcbdca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_263.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_263 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT 0<18446744073709551500"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_263 extends MysqlTest { assertEquals("SELECT 0 < 18446744073709551500", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java index 81530956b..543bafb88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_264.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_264 extends MysqlTest { public void test_0() throws Exception { String sql = "select json from t1"; @@ -32,6 +31,4 @@ public class MySqlSelectTest_264 extends MysqlTest { assertEquals("SELECT json\n" + "FROM t1", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java index 276be977d..f3744d721 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_265.java @@ -21,20 +21,17 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_265 extends MysqlTest { public void test_0() throws Exception { String sql = "select timediff(\"12:00:00\", a) from test_booleancheck\n"; SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils - .parseSingleStatement(sql, DbType.mysql - , SQLParserFeature.KeepSourceLocation - , SQLParserFeature.EnableSQLBinaryOpExprGroup + .parseSingleStatement(sql, DbType.mysql, + SQLParserFeature.KeepSourceLocation, + SQLParserFeature.EnableSQLBinaryOpExprGroup ); assertEquals("SELECT timediff('12:00:00', a)\n" + "FROM test_booleancheck", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java index a53ba685c..a53909597 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_266.java @@ -19,10 +19,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_266 extends MysqlTest { public void test_0() throws Exception { String sql = "EXPLAIN (FORMAT DETAIL)\n" + @@ -42,9 +40,9 @@ public class MySqlSelectTest_266 extends MysqlTest { "LIMIT 1\n"; SQLStatement stmt = SQLUtils - .parseSingleStatement(sql, DbType.mysql - , SQLParserFeature.KeepSourceLocation - , SQLParserFeature.EnableSQLBinaryOpExprGroup + .parseSingleStatement(sql, DbType.mysql, + SQLParserFeature.KeepSourceLocation, + SQLParserFeature.EnableSQLBinaryOpExprGroup ); assertEquals( @@ -60,6 +58,4 @@ public class MySqlSelectTest_266 extends MysqlTest { + "LIMIT 1", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java index e1e4f1d35..797c06b33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_267.java @@ -19,8 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_267 extends MysqlTest { public void test_0() throws Exception { @@ -38,6 +36,4 @@ public class MySqlSelectTest_267 extends MysqlTest { "WHERE TABLE_SCHEMA = 'test_schema'\n" + "\tAND TABLE_NAME = 'test_table'", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java index 383592581..342b92285 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_268.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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;"; @@ -44,6 +43,4 @@ public class MySqlSelectTest_268 extends MysqlTest { "\t\tFROM mm\n" + "\t) b;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java index ab2153aa7..a583ff5ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_269.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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"; @@ -36,6 +35,4 @@ public class MySqlSelectTest_269 extends MysqlTest { "WHERE 1 = 1\n" + "LIMIT 65", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java index b94310727..b76fddae3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_27.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -62,6 +60,4 @@ public class MySqlSelectTest_27 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java index f79e2217e..cfc33e633 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_270.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_270 extends MysqlTest { public void test_0() throws Exception { String sql = "select '\\0', \"\\0\""; @@ -41,6 +40,4 @@ public class MySqlSelectTest_270 extends MysqlTest { assertEquals("SELECT strcmp('', '\\0')", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java index 3661abb29..ce03ccf6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_271.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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" + @@ -56,6 +55,4 @@ public class MySqlSelectTest_271 extends MysqlTest { "ORDER BY 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, 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\n" + "LIMIT 100", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java index 91f121753..9e69993d9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_272.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_272 extends MysqlTest { public void test_0() throws Exception { String sql = "select * from (select product from mysql_olap_t1 \n" + @@ -47,6 +46,4 @@ public class MySqlSelectTest_272 extends MysqlTest { ") tmp\n" + "ORDER BY 1", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java index d04bad54d..77356fe15 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_273.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_273 extends MysqlTest { public void test_0() throws Exception { String sql = "/*+ engine= MPP, dump-header= [DUMP DATA]*/\n" + @@ -98,6 +97,4 @@ public class MySqlSelectTest_273 extends MysqlTest { "\tOR (t3.sum_score = 1986\n" + "\t\tAND t3.sim_aid % 100 < 97)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java index 8227cb580..09b183147 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_274.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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"; @@ -34,6 +33,4 @@ public class MySqlSelectTest_274 extends MysqlTest { "SELECT *\n" + "FROM t2", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java index 99e90f6cd..df67a3721 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_275.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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" + @@ -37,7 +36,6 @@ public class MySqlSelectTest_275 extends MysqlTest { "LIMIT 10", stmt.toString()); } - public void test_1() throws Exception { String sql = "(select id from test4dmp.test_odps where id >100) order by id limit 10\n" + "\n"; @@ -51,6 +49,4 @@ public class MySqlSelectTest_275 extends MysqlTest { "ORDER BY id\n" + "LIMIT 10)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java index bb2ab0f00..64993970d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_276.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_276 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT x '日期' from t"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_276 extends MysqlTest { assertEquals("SELECT x AS '日期'\n" + "FROM t", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java index 41627f2cf..f59df1c36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_277.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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"; @@ -33,6 +32,4 @@ public class MySqlSelectTest_277 extends MysqlTest { "FROM test_datatype_list\n" + "ORDER BY 1, 2, 3", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java index d8cc61faa..cb7ca197c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_278.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_278 extends MysqlTest { public void test_0() throws Exception { String sql = "select GROUP_CONCAT(\"\\\"\" + code + \"\\\"\") from district_t\n" + @@ -33,6 +32,4 @@ public class MySqlSelectTest_278 extends MysqlTest { "FROM district_t\n" + "WHERE code LIKE '98%'", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java index 863c48e1d..e4e8c98f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_279.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_279 extends MysqlTest { public void test_0() throws Exception { String sql = "select l.*\n" + @@ -78,6 +77,4 @@ public class MySqlSelectTest_279 extends MysqlTest { ") l\n" + "ORDER BY '区划'", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java index c53adba86..236e878c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_28.java @@ -31,7 +31,6 @@ public class MySqlSelectTest_28 extends MysqlTest { + "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); @@ -71,6 +70,4 @@ public class MySqlSelectTest_28 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java index 7f1ce4caf..504794e5c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_280.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_280 extends MysqlTest { public void test_0() throws Exception { String sql = "select date(created_at)创建日期,\n" + @@ -73,6 +72,4 @@ public class MySqlSelectTest_280 extends MysqlTest { "\tAND date(created_at) <= date_sub(curdate(), INTERVAL 1 DAY)\n" + "GROUP BY date(created_at)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java index 41e448a20..2c3f51870 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_281.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - 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;"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_281 extends MysqlTest { assertEquals("SELECT decode_unicode('おはようございます') AS a;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java index 85b71a115..63888899f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_282.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_282 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT 1.0E10"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_282 extends MysqlTest { assertEquals("SELECT 1.0E10", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java index bfb8f1baa..5e25aae3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_283_current_user.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - 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"; @@ -52,6 +51,4 @@ public class MySqlSelectTest_283_current_user extends MysqlTest { "from t\n" + "where u = current_user", stmt.toLowerCaseString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java index 4dd503710..0155fdeee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_284.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_284 extends MysqlTest { public void test_0() throws Exception { String sql = "select count(*) t_router_device_info;"; @@ -31,6 +30,4 @@ public class MySqlSelectTest_284 extends MysqlTest { assertEquals("SELECT count(*) AS t_router_device_info;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java index fb20af7f4..5aa540f02 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_285.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - 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;"; @@ -38,6 +37,4 @@ public class MySqlSelectTest_285 extends MysqlTest { "ORDER BY 3\n" + "LIMIT 5;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java index 50bc0c83f..ba0fa2ce1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_286.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_286 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT a " + @@ -38,6 +37,4 @@ public class MySqlSelectTest_286 extends MysqlTest { "GROUP BY DISTINCT a\n" + "\tGROUPING SETS ((), (t.a))", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java index 8d1a62167..241a4f936 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_287.java @@ -19,8 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.SQLParserFeature; - public class MySqlSelectTest_287 extends MysqlTest { public void test_0() throws Exception { @@ -34,6 +32,4 @@ public class MySqlSelectTest_287 extends MysqlTest { "\tVALUES (1, 1)\n" + ") AS t (x, y)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java index 972027690..5aaf20e12 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_288.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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" + @@ -242,6 +241,4 @@ public class MySqlSelectTest_288 extends MysqlTest { "\t) back\n" + "\tON d.server_id = back.server_id)", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java index e75193af5..e4375d91a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_289.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - 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" + @@ -106,6 +105,4 @@ public class MySqlSelectTest_289 extends MysqlTest { ") t1\n" + "ORDER BY 1, 2, 3, 4, 5;", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java index fb8259a2a..1e2852221 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_29.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,6 @@ public class MySqlSelectTest_29 extends MysqlTest { + "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); @@ -80,6 +78,4 @@ public class MySqlSelectTest_29 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java index 5a3b66ac0..93bb86efa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_290.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_290 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT\n" + @@ -705,12 +704,10 @@ public class MySqlSelectTest_290 extends MysqlTest { SQLStatement stmt = SQLUtils .parseSingleStatement(sql, DbType.mysql); - System.out.println("第一次生成的sql==="+stmt.toString()); + System.out.println("第一次生成的sql===" + stmt.toString()); SQLStatement stmt2 = SQLUtils .parseSingleStatement(stmt.toString(), DbType.mysql); - System.out.println("第二次生成的sql==="+stmt2.toString()); + System.out.println("第二次生成的sql===" + stmt2.toString()); assertEquals(stmt.toString().replace('\"', '\''), stmt2.toString().replace('\"', '\'')); - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java index 9b54c7b5c..7ef25f820 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_292_lateral.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_292_lateral extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM t CROSS JOIN LATERAL (VALUES 1) "; @@ -87,6 +86,4 @@ public class MySqlSelectTest_292_lateral extends MysqlTest { System.out.println(stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java index a939a8554..3dcd91095 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_group_concat_clone.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_293_group_concat_clone extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT student_name,\n" + @@ -39,8 +38,5 @@ public class MySqlSelectTest_293_group_concat_clone extends MysqlTest { assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')\n" + "FROM student\n" + "GROUP BY student_name;", stmt.clone().toString()); - } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java index 62babe3e6..f67af8f52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_293_operator_precedence.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; - public class MySqlSelectTest_293_operator_precedence extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT ALL + + ( + col1 ) \n" + @@ -37,7 +36,6 @@ public class MySqlSelectTest_293_operator_precedence extends MysqlTest { System.out.println(stmt.toString()); } - public void test_1() throws Exception { String sql = "SELECT - CAST( 73 AS SIGNED ) + 60 AS col0"; @@ -154,5 +152,4 @@ public class MySqlSelectTest_293_operator_precedence extends MysqlTest { System.out.println(stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java index 18747b1db..6d99cbe74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_294_dla.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; 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" + @@ -98,7 +97,6 @@ public class MySqlSelectTest_294_dla extends MysqlTest { System.out.println(stmt.toString()); } - public void testRemoveBackQuoteFromSql() { String ret = SQLUtils.parseSingleStatement("select * from `hello`.`world`", DbType.mysql, SQLParserFeature.IgnoreNameQuotes).toString(); assertEquals( @@ -107,4 +105,4 @@ public class MySqlSelectTest_294_dla extends MysqlTest { ret ); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java index 46bd2142c..aca59aebf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_295.java @@ -71,6 +71,4 @@ public class MySqlSelectTest_295 assertEquals("SELECT CAST(row(1, row(2, 3)) AS ROW(varchar,ROW(integer)));", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java index 1a5334939..4aadb1eb3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_296.java @@ -41,6 +41,4 @@ public class MySqlSelectTest_296 ") AS t (x, y)\n" + "GROUP BY GROUPING SETS ((), (x))", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java index 379691487..a6a47f5a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_297.java @@ -36,7 +36,6 @@ public class MySqlSelectTest_297 "\tAND (properties -> '$.idkp' = '1647796581073291')", stmt.toString()); } - public void test_1() throws Exception { String sql = "select `current_date`, 1 + `current_date`"; @@ -111,4 +110,4 @@ public class MySqlSelectTest_297 assertEquals("SELECT `current_user`, a, `localtime`, b, `localtimestamp`\n" + "FROM t", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java index 30c883052..11d9b4b73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_298.java @@ -261,7 +261,6 @@ public class MySqlSelectTest_298 "WHERE cid BETWEEN 18 AND 19\n" + "ORDER BY id", stmt.toString()); - SQLStatement stmt2 = SQLUtils .parseSingleStatement(sql, DbType.mysql); @@ -278,4 +277,4 @@ public class MySqlSelectTest_298 "WHERE cid BETWEEN 18 AND 19\n" + "ORDER BY id", stmt2.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java index 062cc509b..1ed290044 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_299_mtr.java @@ -18,12 +18,7 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.sql.parser.SQLExprParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.parser.SQLParserUtils; public class MySqlSelectTest_299_mtr extends MysqlTest { @@ -35,4 +30,4 @@ public class MySqlSelectTest_299_mtr assertEquals("SELECT HEX('\u0012㑖碚'), _utf16 x'0123456789A';", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java index 8aa6e7e56..b02e85946 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_3.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java index aa818c8c1..626278129 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_30.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -64,6 +62,4 @@ public class MySqlSelectTest_30 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java index 50c20aaaa..f42ca4b3d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_300_genAlias.java @@ -75,4 +75,4 @@ public class MySqlSelectTest_300_genAlias "\t\t)\n" + "\t);", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java index e36a492a8..05c99ae01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_301_dla.java @@ -221,6 +221,4 @@ public class MySqlSelectTest_301_dla "WHERE `operation_wrong_longest` IS NOT NULL\n" + "\tAND `operation_wrong_longest` > 0", stmt.toString()); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java index 43d95a11a..7ccc0d1b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_302_agg.java @@ -71,5 +71,4 @@ public class MySqlSelectTest_302_agg assertEquals("SELECT db.sum(1)\n" + "FROM test", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java index e36d06439..8099b85d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_304_adb_hints.java @@ -282,7 +282,6 @@ public class MySqlSelectTest_304_adb_hints "LIMIT 100", stmt.toString()); } - public void test_13() throws Exception { String sql = "SELECT COUNT(*)\n" + "FROM t1, t2\n" + @@ -600,4 +599,4 @@ public class MySqlSelectTest_304_adb_hints "WHERE l.shipdate BETWEEN DATE '1995-01-01' AND DATE '1996-12-31'/*+output_rows=1*/\n" + "\tAND c.custkey = o.custkey", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java index cc99a8fba..d509be78e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_305_dla.java @@ -35,4 +35,4 @@ public class MySqlSelectTest_305_dla ")\n" + "LIMIT 1;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java index 4ddb23086..53edcb658 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_306_outer_orderby.java @@ -18,10 +18,7 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLCharExpr; -import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; public class MySqlSelectTest_306_outer_orderby extends MysqlTest { @@ -168,4 +165,4 @@ public class MySqlSelectTest_306_outer_orderby "\tORDER BY a\n" + ")", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java index 7efd91d98..1a738c2ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_307_lateralview.java @@ -129,4 +129,4 @@ public class MySqlSelectTest_307_lateralview ") t\n" + "\tLATERAL VIEW stack(2, 'A', 10, DATE '2015-01-01', 'B', 20, DATE '2016-01-01') tf AS col0, col1, col2;", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java index 009d0281e..d25e5301d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_308_mtr.java @@ -33,4 +33,4 @@ public class MySqlSelectTest_308_mtr "\tJOIN t2\n" + "\tSTRAIGHT_JOIN t3 ON (t1.a = t3.c);", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java index 044fc84e2..70514203c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_309.java @@ -36,4 +36,4 @@ public class MySqlSelectTest_309 } catch (Exception e) { } } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java index f271dba62..dae391fca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_31.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -64,6 +62,4 @@ public class MySqlSelectTest_31 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java index aa9b19ebe..131db3c06 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_310.java @@ -109,4 +109,4 @@ public class MySqlSelectTest_310 assertEquals("SELECT 1 -- abc", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java index c5ba0d369..844ef3d0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_311_issue.java @@ -35,4 +35,4 @@ public class MySqlSelectTest_311_issue // "\t\tAND a.ds = 20200201\n" + // "\t\tAND a.aid IS NOT NULL", statement.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java index a95118562..a619ea5f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_313.java @@ -47,4 +47,4 @@ public class MySqlSelectTest_313 System.out.println(stmt); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_315_issue_3960.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_315_issue_3960.java index 088c35c79..08b27ab74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_315_issue_3960.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_315_issue_3960.java @@ -20,9 +20,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.util.Utils; - -import java.util.List; public class MySqlSelectTest_315_issue_3960 extends MysqlTest { @@ -45,4 +42,4 @@ public class MySqlSelectTest_315_issue_3960 assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_316_json_table.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_316_json_table.java index e8f35044a..99b6272bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_316_json_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_316_json_table.java @@ -227,4 +227,4 @@ public class MySqlSelectTest_316_json_table assertEquals(0, visitor.getConditions().size()); assertEquals(0, visitor.getOrderByColumns().size()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java index 14965289f..417483c6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_32.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ 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); @@ -62,6 +60,4 @@ public class MySqlSelectTest_32 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java index 33a7d7202..7c03502f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_33.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,6 @@ public class MySqlSelectTest_33 extends MysqlTest { "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); @@ -78,6 +76,4 @@ public class MySqlSelectTest_33 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java index 76e492456..c0688a50e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_34.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_34 extends MysqlTest { "order by -ABS(10 - level) desc\n" + "limit 0,100"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -72,6 +70,4 @@ public class MySqlSelectTest_34 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java index 467073f8e..e7a6b8668 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_35.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_35 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM t1 natural LEFT JOIN t2;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -62,6 +60,4 @@ public class MySqlSelectTest_35 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java index 8ad6f3233..73b4fff80 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_36.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_36 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM mytable t1 natural LEFT JOIN t2;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -62,6 +60,4 @@ public class MySqlSelectTest_36 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java index 9afdf60d3..18b64fa87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_37.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_37 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM mytable where md5=x'AD9133D47CEB2222A68662BD7600D890'"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -78,6 +76,4 @@ public class MySqlSelectTest_37 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java index 252a39f37..79e26fc81 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_38.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_38 extends MysqlTest { public void test_0() throws Exception { String sql = "select full full from t1"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -61,6 +59,4 @@ public class MySqlSelectTest_38 extends MysqlTest { } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java index fdf33aafd..f5df3f2f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_39.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_39 extends MysqlTest { public void test_0() throws Exception { String sql = "select DATE_ADD(now(),INTERVAL -1 day);"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL); SQLStatement stmt = statementList.get(0); @@ -59,6 +57,4 @@ public class MySqlSelectTest_39 extends MysqlTest { } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java index 543850ccb..1e35298a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_4.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java index cc4c96e23..802e59e51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_40.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_40 extends MysqlTest { public void test_0() throws Exception { String sql = "/*0abcde*/select max(id) from base_request_log"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java index 01bc73c97..0a4fe1c08 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_41.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_41 extends MysqlTest { public void test_0() throws Exception { String sql = "/*0abcde*/select max(id) from base_request_log"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java index 85a3ef001..6202c1c3e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_42_with_cte.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_42_with_cte extends MysqlTest { "SELECT b, d FROM cte1 JOIN cte2\n" + "WHERE cte1.a = cte2.c;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java index eba5b5330..d417eb306 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_43_with_cte.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_43_with_cte extends MysqlTest { "SELECT b, d FROM cte1 JOIN cte2\n" + "WHERE cte1.a = cte2.c;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java index 9e5fb4ba0..ef852b7d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_44_with_cte.java @@ -33,7 +33,6 @@ public class MySqlSelectTest_44_with_cte extends MysqlTest { ")\n" + "SELECT * FROM cte;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java index 50357e937..ff5e794cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_45_subquery_scalar_operand.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,6 @@ public class MySqlSelectTest_45_subquery_scalar_operand extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT (SELECT s1 FROM t2) FROM t1;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java index 63a08db4d..373beb6b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_46_group_concat.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -31,7 +30,6 @@ public class MySqlSelectTest_46_group_concat extends MysqlTest { " FROM student\n" + " GROUP BY student_name;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java index a7f088528..f3890db7b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_47_group_concat.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_47_group_concat extends MysqlTest { " FROM student\n" + " GROUP BY student_name;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java index 65da32a08..40311a25b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_48_union.java @@ -44,7 +44,6 @@ public class MySqlSelectTest_48_union extends MysqlTest { "cast(b.paid_date as varchar(10))<='2017-06-30' and b.state=1 and a.acct_day='03'\n" + ")hd"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java index baf812377..cf3cb02e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_49_for_update_no_wait.java @@ -30,7 +30,6 @@ public class MySqlSelectTest_49_for_update_no_wait extends MysqlTest { "where tnt_inst_id = ?" + " and ar_no in ( ? ) for update no_wait"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java index 51ac7f70d..b6eaa9e16 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_5.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java index c47d672ad..547a77b27 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_50_union.java @@ -31,7 +31,6 @@ public class MySqlSelectTest_50_union extends MysqlTest { "select seller_name from a where id < 100\n" + ") as temp limit 10"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java index 8c5a7d2f7..6e6f671bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_51_open.java @@ -27,7 +27,6 @@ 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"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java index 860b6817e..40d1b11ad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_52_comment.java @@ -43,7 +43,6 @@ public class MySqlSelectTest_52_comment extends MysqlTest { " ORDER BY created_at DESC\n" + " LIMIT 10, 10"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java index 30f434247..9b9f7eff9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_53_match.java @@ -25,16 +25,15 @@ import java.util.List; public class MySqlSelectTest_53_match extends MysqlTest { public void test_0() throws Exception { - 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) " + // - " AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174') > 1 " + // + 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) " + + " AGAINST('2015431867 2636826089 3807520117 2796321160 2615920174') > 1 " + "ORDER BY score DESC, agree_count DESC LIMIT 10"; System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java index a724f7128..19a7d7322 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_54.java @@ -29,7 +29,6 @@ public class MySqlSelectTest_54 extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java index 3a69708e5..4855b736c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_55.java @@ -40,7 +40,6 @@ public class MySqlSelectTest_55 extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java index edf877c6b..0e784d25b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_56.java @@ -33,7 +33,6 @@ public class MySqlSelectTest_56 extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java index ac223d950..7c99e506f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_57.java @@ -29,7 +29,6 @@ public class MySqlSelectTest_57 extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java index f76ad4ec4..d7df8cbdd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_58_alias_dot.java @@ -30,7 +30,6 @@ public class MySqlSelectTest_58_alias_dot extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java index 621b12807..465571bd4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_59_neq.java @@ -29,7 +29,6 @@ public class MySqlSelectTest_59_neq extends MysqlTest { System.out.println(sql); - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java index 2a3829d71..5ad2dcf57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_6.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java index 2443cb32c..aae862aad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_7.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java index ac0c22225..65357e9d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_8.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java index 35ea1e07d..122124104 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_9.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java index 5ed77b6b6..5fbb35b47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_90.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import java.util.List; public class MySqlSelectTest_90 extends MysqlTest { public void test_0() throws Exception { @@ -36,4 +33,4 @@ public class MySqlSelectTest_90 extends MysqlTest { String text = output(statementList); assertEquals("SELECT *\nFROM tbl_name USE INDEX (idx1) USE INDEX (idx2)", text); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java index 7e26d230d..e6d875be6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_92.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java index 291b4e6e4..a2255713d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94.java @@ -15,9 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; @@ -39,7 +37,6 @@ public class MySqlSelectTest_94 extends MysqlTest { assertEquals("SELECT *\n" + "FROM test\n" + "WHERE name = 'cail1';", stmt.toString()); } - public void test_2() throws Exception { String sql = "select * from test where name = 'cail\\\\1';"; @@ -158,5 +155,4 @@ public class MySqlSelectTest_94 extends MysqlTest { + "\tPRIMARY KEY (key)\n" + ");", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java index 8f75b876d..452225bb0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_94_error.java @@ -17,7 +17,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.ParserException; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java index 457c9f452..22d126542 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_95_soundsLike.java @@ -18,11 +18,9 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; - public class MySqlSelectTest_95_soundsLike extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + @@ -38,4 +36,4 @@ public class MySqlSelectTest_95_soundsLike extends MysqlTest { "FROM student\n" + "WHERE first_name SOUNDS LIKE 'sudipto';", text); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java index db26cc3c5..395b38c3b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_96_istrue.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_96_istrue extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + @@ -52,4 +51,4 @@ public class MySqlSelectTest_96_istrue extends MysqlTest { "FROM student\n" + "WHERE id = 123 IS true", text); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java index 843050625..b45c25dc7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_97_alias.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import java.util.List; - public class MySqlSelectTest_97_alias extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT * FROM student \n" + @@ -54,5 +53,4 @@ public class MySqlSelectTest_97_alias extends MysqlTest { "\tJOIN test_hash_tb c ON b.id = c.id\n" + "WHERE a.id = 'xx'", text); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java index dab7d678a..b9e3d836a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_98.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -55,7 +54,6 @@ public class MySqlSelectTest_98 extends MysqlTest { "               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); @@ -124,6 +122,4 @@ public class MySqlSelectTest_98 extends MysqlTest { output); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java index e55615594..d3b22d1bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_99_union_order.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java index 8078208b0..1beb79763 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_BinaryConcat.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; 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" + // + String sql = "select campaignId from Campaign" + + " where advertiserId = ?" + + " and deleteStatus = false" + " and campaignName like binary CONCAT('%',?,'%')"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java index fbc2f0b77..a4c131089 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_POSITION.java @@ -23,19 +23,18 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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, " + // + 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"; MySqlStatementParser parser = new MySqlStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java index b3d5ea82d..75dc37398 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords.java @@ -28,7 +28,6 @@ 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); @@ -51,8 +50,5 @@ public class MySqlSelectTest_ads_keywords extends MysqlTest { SQLNotExpr notExpr = (SQLNotExpr) ((SQLSelectStatement) stmt).getSelect().getQueryBlock().getWhere(); assertNotNull(notExpr.getParent()); assertNotNull(notExpr.getExpr().getParent()); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java index f38844e35..4c06de1d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_0.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -43,7 +42,6 @@ public class MySqlSelectTest_ads_keywords_0 extends MysqlTest { MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery(); assertNull(queryBlock.getOrderBy()); - assertEquals(1, statementList.size()); MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java index ba53aceea..c12f5c377 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_ads_keywords_1.java @@ -17,14 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.ParserException; -import com.alibaba.druid.stat.TableStat; public class MySqlSelectTest_ads_keywords_1 extends MysqlTest { String[] keywords = new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java index afa8a0350..74ad5098a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_clearLimit.java @@ -19,11 +19,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLLimit; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.parser.SQLParserFeature; public class MySqlSelectTest_clearLimit extends MysqlTest { public void test_0() throws Exception { @@ -94,8 +89,6 @@ public class MySqlSelectTest_clearLimit extends MysqlTest { Object[] objects = SQLUtils.clearLimit(sql, DbType.mysql); assertEquals("LIMIT 10, 10", objects[1].toString()); - - } public void test_getLimit() { @@ -110,7 +103,6 @@ public class MySqlSelectTest_clearLimit extends MysqlTest { assertEquals("LIMIT 1", limit.toString()); - limit = SQLUtils.getLimit("select * from 1", DbType.mysql); assertNull(limit); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java index c4a57af08..7dc2840ad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comma_src.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,6 @@ public class MySqlSelectTest_comma_src extends MysqlTest { public void test_0() throws Exception { String sql = "select * from t1, t2, t3"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL, true); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java index 3509b9922..bb48aea52 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_comment.java @@ -28,10 +28,7 @@ public class MySqlSelectTest_comment SQLStatement stmt = SQLUtils .parseSingleStatement(sql, DbType.mysql); - assertEquals("SELECT xxx AS comment, xxx AS comment\n" + "FROM t", stmt.toString()); - } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java index 71ea23bdb..c7f812045 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_crossjoin.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -54,7 +53,7 @@ public class MySqlSelectTest_crossjoin extends MysqlTest { System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); // System.out.println("orderBy : " + visitor.getOrderByColumns()); -// +// assertEquals(2, visitor.getTables().size()); assertEquals(10, visitor.getColumns().size()); assertEquals(3, visitor.getConditions().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java index 1b9003030..d206c23c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_eq_null_parameterized.java @@ -33,5 +33,4 @@ public class MySqlSelectTest_eq_null_parameterized extends MysqlTest { "FROM test_null_shard\n" + "WHERE id = ?;", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java index db0df2495..db290cbd6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_equals.java @@ -33,7 +33,6 @@ public class MySqlSelectTest_equals extends MysqlTest { SQLSelectQuery queryBlock2 = getQueryBlock(sql2); assertNotSame(queryBlock, queryBlock2); - } public void test_1() throws Exception { @@ -45,7 +44,6 @@ public class MySqlSelectTest_equals extends MysqlTest { SQLSelectQuery queryBlock2 = getQueryBlock(sql2); assertEquals(queryBlock, queryBlock2); - } private SQLSelectQuery getQueryBlock(String sql) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java index 672f4e7eb..effd90db9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_exportTables.java @@ -32,7 +32,6 @@ public class MySqlSelectTest_exportTables extends MysqlTest { "order by -ABS(10 - level) desc\n" + "limit 0,100"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -46,7 +45,6 @@ public class MySqlSelectTest_exportTables extends MysqlTest { stmt.accept(visitor); - assertEquals("SELECT *\n" + "FROM my_table\n" + "WHERE level BETWEEN 10 - 5 AND 10 + 5\n" + @@ -62,7 +60,6 @@ public class MySqlSelectTest_exportTables extends MysqlTest { public void test_1() throws Exception { String sql = "SELECT * FROM table1 INNER JOIN table2 ON table1.id = table2.id;"; - MySqlStatementParser parser = new MySqlStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -76,7 +73,6 @@ public class MySqlSelectTest_exportTables extends MysqlTest { stmt.accept(visitor); - assertEquals("SELECT *\n" + "FROM table1\n" + "\tINNER JOIN table2 ON table1.id = table2.id;", // @@ -86,5 +82,4 @@ public class MySqlSelectTest_exportTables extends MysqlTest { assertEquals(2, visitor.getTables().size()); assertEquals("[table1, table2]", visitor.getTables().toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java index 207ab1c40..231ed0d04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_forADB.java @@ -16,10 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSelectTest_forADB extends MysqlTest { public void test_0() throws Exception { @@ -100,6 +96,4 @@ public class MySqlSelectTest_forADB extends MysqlTest { // // parseTrue(sql, ""); // } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java index 7bcc472b5..c00ab4088 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_func_in_order_by.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -39,5 +38,4 @@ public class MySqlSelectTest_func_in_order_by extends MysqlTest { assertTrue(expr.getArguments().get(1) instanceof SQLDataTypeRefExpr); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java index 2720b0131..240fbfe94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat.java @@ -24,16 +24,15 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 '%爱丽%' " // + String sql = "SELECT GROUP_CONCAT(ext_customer_id Separator '.') " + + "from ad_texts " + + "where customer_id=13001 " + + "and description1 like '%爱丽%' " + "order by id asc;"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -54,7 +53,6 @@ public class MySqlSelectTest_group_concat extends MysqlTest { 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()); @@ -68,10 +66,10 @@ public class MySqlSelectTest_group_concat extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("ad_texts"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT GROUP_CONCAT(ext_customer_id SEPARATOR '.')" // - + "\nFROM ad_texts" // - + "\nWHERE customer_id = 13001" // - + "\n\tAND description1 LIKE '%爱丽%'" // + assertEquals("SELECT GROUP_CONCAT(ext_customer_id SEPARATOR '.')" + + "\nFROM ad_texts" + + "\nWHERE customer_id = 13001" + + "\n\tAND description1 LIKE '%爱丽%'" + "\nORDER BY id ASC;", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java index 0e15ecf9f..a998e9194 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_group_concat_2.java @@ -24,16 +24,15 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 " // + String sql = "SELECT student_name, " + + "GROUP_CONCAT(DISTINCT test_score " + + " ORDER BY test_score DESC SEPARATOR ' ') " + + "FROM student " + "GROUP BY student_name"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -62,8 +61,8 @@ public class MySqlSelectTest_group_concat_2 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("student"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')" // - + "\nFROM student" // + assertEquals("SELECT student_name, GROUP_CONCAT(DISTINCT test_score ORDER BY test_score DESC SEPARATOR ' ')" + + "\nFROM student" + "\nGROUP BY student_name", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java index 080d3603f..0419c94a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_jinyuan.java @@ -32,4 +32,4 @@ public class MySqlSelectTest_jinyuan extends MysqlTest { "\tAND app = ?\n" + "LIMIT 0, 1", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java index 2b29ddeac..7a6eb7486 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_json.java @@ -16,9 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class MySqlSelectTest_json extends MysqlTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java index 03e13a1f3..3983fc910 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_mtr.java @@ -503,7 +503,7 @@ public class MySqlSelectTest_mtr + "SELECT *\n" + "FROM parser_t1_58\n" + "\tLEFT JOIN parser_t2_59 ON parser_t1_58.a1 = parser_t2_59.a3\n" - + "WHERE parser_t1_58.a2 > 10;\n"+ + + "WHERE parser_t1_58.a2 > 10;\n" + "\n", builder.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_partition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_partition.java index cf55451e1..57a222d86 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_partition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_partition.java @@ -1,13 +1,12 @@ package com.alibaba.druid.bvt.sql.mysql.select; -import java.util.List; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import java.util.List; + public class MySqlSelectTest_partition extends MysqlTest { public void test_0() throws Exception { String sql = "select\n" @@ -41,4 +40,4 @@ public class MySqlSelectTest_partition extends MysqlTest { + "ORDER BY p.update_time ASC\n" + "LIMIT 5", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java index a0a5a3725..614b75694 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_ques.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -25,7 +24,5 @@ public class MySqlSelectTest_plus_ques extends MysqlTest { assertEquals(1, statementList.size()); assertEquals("SELECT +?;", stmt.toString()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java index 5d244f71b..71b15d2a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_plus_sub_comment.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java index c4345f491..b8d910093 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_straight_join.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java index 81ae45eea..517de433d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_trim.java @@ -23,7 +23,6 @@ public class MySqlSelectTest_trim extends MysqlTest { //assertEquals("SELECT trim('x')", stmt.toString()); - List outParameters = new ArrayList(); String parameterizeSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParameters, VisitorFeature.OutputParameterizedQuesUnMergeInList, @@ -41,7 +40,6 @@ public class MySqlSelectTest_trim extends MysqlTest { //assertEquals("SELECT trim('x')", stmt.toString()); - outParameters = new ArrayList(); parameterizeSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParameters, VisitorFeature.OutputParameterizedQuesUnMergeInList, @@ -58,7 +56,6 @@ public class MySqlSelectTest_trim extends MysqlTest { //assertEquals("SELECT trim('x')", stmt.toString()); - outParameters = new ArrayList(); parameterizeSql = ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.MYSQL, outParameters, VisitorFeature.OutputParameterizedQuesUnMergeInList, @@ -68,5 +65,4 @@ public class MySqlSelectTest_trim extends MysqlTest { System.out.println(parameterizeSql); System.out.println(outParameters); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java index fe2fdf026..9ee358598 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java index a2f755e43..8534a47a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_with_20433301.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - public class MySqlSelectTest_with_20433301 extends MysqlTest { public void test_0() throws Exception { String sql = "WITH total AS(\n" + @@ -58,7 +57,6 @@ public class MySqlSelectTest_with_20433301 extends MysqlTest { " where fcst.week_day= 1\n" + " order by detail.scheduleCnt desc"; - SQLSelectStatement stmt = (SQLSelectStatement) SQLUtils.parseSingleStatement(sql, JdbcConstants.MYSQL); assertEquals("WITH total AS (\n" + @@ -95,10 +93,7 @@ public class MySqlSelectTest_with_20433301 extends MysqlTest { "WHERE fcst.week_day = 1\n" + "ORDER BY detail.scheduleCnt DESC", stmt.toString()); - MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); stmt.accept(visitor); } - - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java index a266973b6..88bafdc33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlResolveTest.java @@ -3,18 +3,13 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.ast.statement.*; +import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; import com.alibaba.druid.sql.repository.SchemaRepository; -import com.alibaba.druid.util.JdbcConstants; import org.junit.Test; import java.util.List; -import static junit.framework.TestCase.assertNotNull; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; /** * TODO 功能描述 diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_issue_5140.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_issue_5140.java index 1e3c57338..21564a98d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_issue_5140.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MysqlSelectTest_issue_5140.java @@ -18,9 +18,7 @@ package com.alibaba.druid.bvt.sql.mysql.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.ParserException; - import org.junit.Test; import static org.junit.Assert.assertThrows; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java index 1929d8870..5d0e67e05 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowFieldsTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -48,6 +47,5 @@ public class MySqlShowFieldsTest extends MysqlTest { // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_price"))); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java index 59a84280d..5f866d567 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTestMaterializedView.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java index 62dc0f231..24c215bd0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_0.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -47,7 +46,6 @@ public class MySqlShowTest_0 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } public void test_1() throws Exception { @@ -73,6 +71,5 @@ public class MySqlShowTest_0 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java index 1822cbc01..80469822d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_1.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -47,6 +46,5 @@ public class MySqlShowTest_1 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java index fd3fee824..ff97f0f46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_10_broadcasts.java @@ -36,6 +36,5 @@ public class MySqlShowTest_10_broadcasts extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java index 668c95a56..0e3271543 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_11_datasources.java @@ -36,6 +36,5 @@ public class MySqlShowTest_11_datasources extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java index 814e68c7b..49d689a87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_12_node.java @@ -36,6 +36,5 @@ public class MySqlShowTest_12_node extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java index 77a6e3598..fc2d4f799 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_13_help.java @@ -36,6 +36,5 @@ public class MySqlShowTest_13_help extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java index 187ac401d..0871696da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_14_slow.java @@ -36,6 +36,5 @@ public class MySqlShowTest_14_slow extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java index 7fb401b16..7f147c8ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_outlines.java @@ -40,7 +40,6 @@ public class MySqlShowTest_15_outlines extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_1() throws Exception { @@ -58,7 +57,5 @@ public class MySqlShowTest_15_outlines extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java index 321c270f9..257e21d75 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_15_queryTask.java @@ -45,7 +45,6 @@ public class MySqlShowTest_15_queryTask extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_1() throws Exception { @@ -90,7 +89,6 @@ public class MySqlShowTest_15_queryTask extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_3() throws Exception { @@ -108,6 +106,5 @@ public class MySqlShowTest_15_queryTask extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java index acfc2c3f9..cb827cd87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_17_recyclebin.java @@ -42,6 +42,5 @@ public class MySqlShowTest_17_recyclebin extends MysqlTest { assertEquals("SHOW RECYCLEBIN", stmt.toString()); assertEquals("show recyclebin", stmt.toLowerCaseString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java index fbdbd4049..d2e1e0211 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_18.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlShowHMSMetaStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java index c26b80a64..c9273427a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -47,6 +46,5 @@ public class MySqlShowTest_2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java index 54bbeda84..a83206dad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_27_plancache.java @@ -45,5 +45,4 @@ public class MySqlShowTest_27_plancache extends MysqlTest { assertEquals("SHOW PLANCACHE STATUS", stmt.toString()); assertEquals("show plancache status", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java index e77e97ac8..714dfd107 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_28_config.java @@ -45,5 +45,4 @@ public class MySqlShowTest_28_config extends MysqlTest { assertEquals("SHOW CONFIG a.b.c", stmt.toString()); assertEquals("show config a.b.c", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java index ca88ec251..e5d1324c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_29_plancache.java @@ -49,5 +49,4 @@ public class MySqlShowTest_29_plancache extends MysqlTest { "select *\n" + "from table1;", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java index dd90ac7f6..e680d7a39 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_3.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -47,6 +46,5 @@ public class MySqlShowTest_3 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java index 5f104664b..c62c62a0e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_30_hints.java @@ -48,5 +48,4 @@ public class MySqlShowTest_30_hints extends MysqlTest { assertEquals("/*+TDDL:scan()*/\n" + "show tables;", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java index bb6a13b9b..b00f0118d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_31_hints.java @@ -48,5 +48,4 @@ public class MySqlShowTest_31_hints extends MysqlTest { assertEquals("/*+TDDL:scan()*/\n" + "show create table t;", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java index e03644639..9df70f2dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_32_hints.java @@ -48,5 +48,4 @@ public class MySqlShowTest_32_hints extends MysqlTest { assertEquals("/*+TDDL:scan()*/\n" + "show index from drds_shard;", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java index 84fc35734..623847b21 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_34_stats.java @@ -69,5 +69,4 @@ public class MySqlShowTest_34_stats extends MysqlTest { assertEquals("SHOW FULL STATS", stmt.toString()); assertEquals("show full stats", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java index 985704e4b..03bbe347f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_35_PHYSICAL_PROCESSLIST.java @@ -69,5 +69,4 @@ public class MySqlShowTest_35_PHYSICAL_PROCESSLIST extends MysqlTest { assertEquals("SHOW FULL PHYSICAL_PROCESSLIST", stmt.toString()); assertEquals("show full physical_processlist", stmt.toLowerCaseString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java index 11369b861..184cdf243 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_37_hints.java @@ -14,7 +14,7 @@ import java.util.List; public class MySqlShowTest_37_hints extends MysqlTest { 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/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java index 579afc51a..da156d919 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_38_hints.java @@ -14,7 +14,7 @@ import java.util.List; public class MySqlShowTest_38_hints extends MysqlTest { 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 table status from corona_qatest_0;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java index 852c83eff..32ee8669a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -51,6 +50,5 @@ public class MySqlShowTest_4 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java index 2a51bfa57..28ce37265 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_40_partitions.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java index dff62a922..71d10c204 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java index 3aa484c80..140808f40 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_41_partitions.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java index 9a4fe9573..7a8073a71 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_42_dla.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java index ed48f4f00..0e9e17c13 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -51,6 +50,5 @@ public class MySqlShowTest_5 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java index 08f5aa3d7..84a7b3775 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_6.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -51,6 +50,5 @@ public class MySqlShowTest_6 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java index 5cc6cfb46..9f4624a9b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_7_show_rule.java @@ -36,7 +36,6 @@ public class MySqlShowTest_7_show_rule extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_1() throws Exception { @@ -53,6 +52,5 @@ public class MySqlShowTest_7_show_rule extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java index 040fcf47a..a5bfebfa7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_8_topology.java @@ -36,7 +36,6 @@ public class MySqlShowTest_8_topology extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } public void test_1() throws Exception { @@ -53,6 +52,5 @@ public class MySqlShowTest_8_topology extends MysqlTest { assertEquals(0, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java index 8ecf67919..c5d173530 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_9_partitions.java @@ -36,6 +36,5 @@ public class MySqlShowTest_9_partitions extends MysqlTest { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java index 4ae9b693b..258d4ee42 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_mappings.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.ast.statement.SQLShowDatabasesStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java index 8f6f3b5c8..745cf1031 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java index aad5bee51..e4dd89243 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java index 541fc4a5c..b78b810b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_table3.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java index b74ca86d7..aa4c68787 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/MySqlShowTest_users.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java index 69877172f..fad3b56e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_COLUMNS_Syntax_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java index e557f119c..1d1d7a2ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_DATABASES_Syntax_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java index 945791a73..39238cd63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_STATUS_Syntax_Test.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java index c61872fda..89208b4ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_TABLES_Syntax_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -86,7 +85,5 @@ public class SHOW_TABLES_Syntax_Test extends TestCase { stmtList = parser.parseStatementList(); text = SQLUtils.toSQLString(stmtList, JdbcConstants.MYSQL); assertEquals("SHOW FULL TABLES FROM SUNTEST WHERE NAME = 'DDD'", text); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java index a93b574f7..d01afb819 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/show/SHOW_WARNINGS_Syntax_Test.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -69,5 +68,4 @@ public class SHOW_WARNINGS_Syntax_Test extends TestCase { assertEquals("SHOW WARNINGS LIMIT 10, 10;", text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java index b44c8e204..cb0cee5a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_0.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlUpdateTest_0 extends MysqlTest { public void test_0() throws Exception { String sql = "UPDATE `z_code` SET `key`='INTRANT_NOTALLOWED_CATEGORY_C'"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java index 1983b3fdc..fce37130f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_1.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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 " + // + 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"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -53,6 +51,5 @@ public class MySqlUpdateTest_1 extends MysqlTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_price"))); assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java index da2615bf8..5929cba57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_10.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java index 4952f0cef..ba8470d1b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_11_using.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java index ec54ab06f..13cae5df7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_12.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java index ca3d0c9d5..5622afbc6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_13_force_partition.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java index b97606cf8..89371ae7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_14_force_partition.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java index ed325148b..f6fa6d8ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_17.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.mysql.update; import com.alibaba.druid.sql.MysqlTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; @@ -63,7 +62,6 @@ public class MySqlUpdateTest_17 extends MysqlTest { "where group_id = ?", // stmt.toLowerCaseString()); - assertTrue(WallUtils.isValidateMySql(sql)); { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java index e2c6d637f..d06e224d2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlUpdateTest_2 extends MysqlTest { public void test_0() throws Exception { String sql = "UPDATE `z_code` SET (f1, f2) = (1, 2)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java index 40bee1d80..82990ba5d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlUpdateTest_3 extends MysqlTest { public void test_0() throws Exception { - String sql = "update scheme.table set col_1 = 1, col2 = '2' " // + String sql = "update scheme.table set col_1 = 1, col2 = '2' " + "where col_3 = 3 and (length(col_4) > 4 or col_5 <> '5')"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -57,10 +55,10 @@ public class MySqlUpdateTest_3 extends MysqlTest { assertTrue(visitor.getColumns().contains(new Column("scheme.table", "col2"))); String output = SQLUtils.toMySqlString(stmt); - assertEquals("UPDATE scheme.table" // + assertEquals("UPDATE scheme.table" + "\nSET col_1 = 1, col2 = '2'"// - + "\nWHERE col_3 = 3" // - + "\n\tAND (length(col_4) > 4" // + + "\nWHERE col_3 = 3" + + "\n\tAND (length(col_4) > 4" + "\n\t\tOR col_5 <> '5')", // output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java index e7dc2b046..056fd0cec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_4.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + 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()"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java index f8e973d10..54c16e169 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_5.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + 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"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java index 474e251b7..41284c791 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_6.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java index e32c111c9..772b3e25b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_7.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlUpdateTest_7 extends MysqlTest { public void test_0() throws Exception { String sql = "UPDATE ROLLBACK_ON_FAIL TARGET_AFFECT_ROW 1 " diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java index 7654016f7..eb23042aa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_8.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.mysql.update; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import java.util.List; + public class MySqlUpdateTest_8 extends MysqlTest { public void test_0() throws Exception { String sql = "update haskell_function set `arity` = arity-'1' where id = 1;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java index 7d9d42064..d5e3c829a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java index a61642371..3fcf98147 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlParameterizedOutputVisitorTest.java @@ -66,5 +66,4 @@ public class MySqlParameterizedOutputVisitorTest extends TestCase { System.out.println(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.SQL_SERVER)); System.out.println("-----------------------"); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java index 23cc83c0a..5c2617ff6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest1.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest1 extends TestCase { public void test_0() throws Exception { @@ -52,7 +49,6 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); - } public void test_1() throws Exception { @@ -88,6 +84,5 @@ public class MySqlSchemaStatVisitorTest1 extends TestCase { assertTrue(visitor.getColumn("usergroups", "id").isJoin()); assertTrue(visitor.getColumn("users", "groupId").isWhere()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java index 504ff3a45..04a7c003a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest2.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest2 extends TestCase { public void test_0() throws Exception { @@ -49,7 +46,6 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } public void test_2() throws Exception { @@ -74,7 +70,6 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } public void test_3() throws Exception { @@ -99,6 +94,5 @@ public class MySqlSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java index ec5b95583..b6538d4d4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest3 extends TestCase { public void test_0() throws Exception { @@ -52,7 +50,5 @@ public class MySqlSchemaStatVisitorTest3 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); assertEquals(true, visitor.getColumns().contains(new Column("users2", "name2"))); assertEquals(true, visitor.getColumns().contains(new Column("users2", "id2"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java index fbeb19076..7a7bd6fa3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest4 extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class MySqlSchemaStatVisitorTest4 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java index 8222496bf..17583c7e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class MySqlSchemaStatVisitorTest5 extends TestCase { + " 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 = ?)"; + // 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); @@ -54,7 +53,5 @@ public class MySqlSchemaStatVisitorTest5 extends TestCase { // Column("users", "id"))); // assertEquals(true, visitor.getFields().contains(new // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java index 251f99f7b..7009ddfd7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest6.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -27,7 +26,7 @@ public class MySqlSchemaStatVisitorTest6 extends TestCase { 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 = ?)"; + // 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); @@ -49,7 +48,5 @@ public class MySqlSchemaStatVisitorTest6 extends TestCase { // Column("users", "id"))); // assertEquals(true, visitor.getFields().contains(new // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java index b65205fd5..9941e2dc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -27,7 +26,7 @@ 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"; -// sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; + // 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); @@ -52,13 +51,12 @@ public class MySqlSchemaStatVisitorTest7 extends TestCase { 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))"; -// sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; + // 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); @@ -77,15 +75,14 @@ public class MySqlSchemaStatVisitorTest7 extends TestCase { assertEquals("CURRENT_DATE", visitor.getConditions().get(0).getValues().get(0)); assertEquals(1, 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.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"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java index 0810d33c2..18a466e66 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest7_between.java @@ -26,7 +26,7 @@ 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"; -// sql = "select columnName from table1 where id in (select id from table3 where name = ?)"; + // 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); @@ -50,7 +50,5 @@ public class MySqlSchemaStatVisitorTest7_between extends TestCase { assertEquals(true, visitor.containsColumn("student", "name")); // assertEquals(true, visitor.getFields().contains(new // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java index b57f6a1b2..650e751a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest8.java @@ -31,7 +31,7 @@ public class MySqlSchemaStatVisitorTest8 extends TestCase { "(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 = ?)"; + // 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); @@ -43,7 +43,7 @@ public class MySqlSchemaStatVisitorTest8 extends TestCase { System.out.println(stmt.toString()); -// System.out.println(sql); + // System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); System.out.println(visitor.getConditions()); @@ -58,7 +58,5 @@ public class MySqlSchemaStatVisitorTest8 extends TestCase { assertEquals(true, visitor.containsColumn("warn_condition_strategy", "strategy_state")); // assertEquals(true, visitor.getFields().contains(new // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java index cb60ad531..acb857e0b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest9_in.java @@ -26,7 +26,7 @@ public class MySqlSchemaStatVisitorTest9_in extends TestCase { 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 = ?)"; + // 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); @@ -38,7 +38,7 @@ public class MySqlSchemaStatVisitorTest9_in extends TestCase { System.out.println(stmt.toString()); -// System.out.println(sql); + // System.out.println(sql); System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); System.out.println(visitor.getConditions()); @@ -46,7 +46,5 @@ public class MySqlSchemaStatVisitorTest9_in extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals("[employee.no IN (\"1\", \"2\")]", visitor.getConditions().toString()); // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java index fbfdfd481..96d61920f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Alter.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -52,7 +51,5 @@ public class MySqlSchemaStatVisitorTest_Alter extends TestCase { assertTrue(visitor.getColumns().contains(new Column("sql_perf", "item"))); assertTrue(visitor.getColumns().contains(new Column("sql_perf", "time"))); assertTrue(visitor.getColumns().contains(new Column("sql_perf", "value"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java index 0b3fd1960..bdd231828 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest_Delete extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class MySqlSchemaStatVisitorTest_Delete extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java index 88b7b7183..f94f63ded 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest_Subquery extends TestCase { public void test_0() throws Exception { @@ -50,7 +48,5 @@ public class MySqlSchemaStatVisitorTest_Subquery extends TestCase { assertEquals(4, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java index 44491bd4b..008e73205 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest_Subquery2 extends TestCase { public void test_0() throws Exception { @@ -52,7 +50,5 @@ public class MySqlSchemaStatVisitorTest_Subquery2 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); assertEquals(true, visitor.getColumns().contains(new Column("groups", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("groups", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java index 3f9d6286c..17b27cbfe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class MySqlSchemaStatVisitorTest_Update extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class MySqlSchemaStatVisitorTest_Update extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java index 3f9885ab4..184326af1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_pk_0.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -53,7 +52,7 @@ public class MySqlSchemaStatVisitorTest_pk_0 extends TestCase { " 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 = ?)"; + // 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); @@ -100,7 +99,5 @@ public class MySqlSchemaStatVisitorTest_pk_0 extends TestCase { // Column("users", "id"))); // assertEquals(true, visitor.getFields().contains(new // Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java index 68fad263c..3189d4ee7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableAddPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE members ADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));"; // + String sql = "ALTER TABLE members ADD PARTITION (PARTITION p3 VALUES LESS THAN (2000));"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -62,6 +60,5 @@ public class OceanbaseAlterTableAddPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java index 2e99c9916..3cf1c211d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAddPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableAddPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "alter table clients add partition partitions 18;"; // + String sql = "alter table clients add partition partitions 18;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableAddPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java index b24fc5a52..dd2915cf6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableAnalyzePartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1;"; // + String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -60,6 +58,5 @@ public class OceanbaseAlterTableAnalyzePartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java index 887591755..02abca477 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableAnalyzePartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange ANALYZE PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange ANALYZE PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableAnalyzePartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java index 8e381783a..2234af1f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableAnalyzePartitionTest3.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableAnalyzePartitionTest3 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1, p2;"; // + String sql = "ALTER TABLE tnrange ANALYZE PARTITION p1, p2;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -60,6 +58,5 @@ public class OceanbaseAlterTableAnalyzePartitionTest3 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java index 69aac663f..84450b725 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableCheckPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange CHECK PARTITION p1;"; // + String sql = "ALTER TABLE tnrange CHECK PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableCheckPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java index de83f32da..c78a3e93f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCheckPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableCheckPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange CHECK PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange CHECK PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -60,6 +58,5 @@ public class OceanbaseAlterTableCheckPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java index c6073693e..43bb10261 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableCoalescePartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableCoalescePartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE clients COALESCE PARTITION 6"; // + String sql = "ALTER TABLE clients COALESCE PARTITION 6"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableCoalescePartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java index 62190f23a..e0dde6a4b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableDiscardPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange DISCARD PARTITION p1;"; // + String sql = "ALTER TABLE tnrange DISCARD PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableDiscardPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java index d92f3e08a..976733629 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDiscardPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableDiscardPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange DISCARD PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange DISCARD PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableDiscardPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java index ba947e3a9..5c31ea639 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableDropPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableDropPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange DROP PARTITION p1;"; // + String sql = "ALTER TABLE tnrange DROP PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -35,12 +33,12 @@ public class OceanbaseAlterTableDropPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE tnrange" + // + assertEquals("ALTER TABLE tnrange" + "\n\tDROP PARTITION p1;", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("alter table tnrange" + // + assertEquals("alter table tnrange" + "\n\tdrop partition p1;", result); } @@ -59,6 +57,5 @@ public class OceanbaseAlterTableDropPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java index 0552ad4de..39e8c0073 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableImportPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange IMPORT PARTITION p1;"; // + String sql = "ALTER TABLE tnrange IMPORT PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableImportPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java index c2fa0f64e..b31dbcb97 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableImportPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableImportPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange IMPORT PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange IMPORT PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableImportPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java index 6a3aaa4fe..68f915146 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableOptimizePartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION p1;"; // + String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableOptimizePartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java index d0d00680e..dfa27469f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableOptimizePartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableOptimizePartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange OPTIMIZE PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableOptimizePartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java index 0016209eb..6946c01c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest.java @@ -15,33 +15,31 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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) );"; // + + "REORGANIZE PARTITION p0 INTO ( PARTITION s0 VALUES LESS THAN (1960), PARTITION s1 VALUES LESS THAN (1970) );"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); SQLStatement stmt = stmtList.get(0); { String result = SQLUtils.toMySqlString(stmt); - assertEquals("ALTER TABLE members" // + assertEquals("ALTER TABLE members" + "\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); - assertEquals("alter table members" // + assertEquals("alter table members" + "\n\treorganize p0 into (partition s0 values less than (1960), partition s1 values less than (1970));", result); } @@ -61,6 +59,5 @@ public class OceanbaseAlterTableReOrganizePartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java index e3f68f2a4..d6f4ecf68 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableReOrganizePartitionTest2.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableReOrganizePartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE members " // + String sql = "ALTER TABLE members " + "REORGANIZE PARTITION s0,s1,p1,p2,p3 INTO ( "// - + " PARTITION m0 VALUES LESS THAN (1980), " // - + " PARTITION m1 VALUES LESS THAN (2000)" // - + ");"; // + + " PARTITION m0 VALUES LESS THAN (1980), " + + " PARTITION m1 VALUES LESS THAN (2000)" + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -65,6 +63,5 @@ public class OceanbaseAlterTableReOrganizePartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java index bf7ca0c85..8b1787546 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableRebuildPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange REBUILD PARTITION p1;"; // + String sql = "ALTER TABLE tnrange REBUILD PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableRebuildPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java index 789b3fe61..4f311f30d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRebuildPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableRebuildPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange REBUILD PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange REBUILD PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableRebuildPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java index c0121086d..8022e8902 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRemovePartitioningTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableRemovePartitioningTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange REMOVE PARTITIONING;"; // + String sql = "ALTER TABLE tnrange REMOVE PARTITIONING;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableRemovePartitioningTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java index 61512e1e8..5c157cbb9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableRepairPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange REPAIR PARTITION p1;"; // + String sql = "ALTER TABLE tnrange REPAIR PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableRepairPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java index 382884fef..e174c1a69 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableRepairPartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableRepairPartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange REPAIR PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange REPAIR PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableRepairPartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java index e099ef872..ed9599946 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableTruncatePartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange TRUNCATE PARTITION p1;"; // + String sql = "ALTER TABLE tnrange TRUNCATE PARTITION p1;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableTruncatePartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java index bd3376931..63d8b755b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableTruncatePartitionTest2.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableTruncatePartitionTest2 extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange TRUNCATE PARTITION ALL;"; // + String sql = "ALTER TABLE tnrange TRUNCATE PARTITION ALL;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableTruncatePartitionTest2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java index 10144aeae..baf1bc39b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseAlterTableUpgradePartitioningTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseAlterTableUpgradePartitioningTest extends MysqlTest { public void test_0() throws Exception { - String sql = "ALTER TABLE tnrange UPGRADE PARTITIONING;"; // + String sql = "ALTER TABLE tnrange UPGRADE PARTITIONING;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -61,6 +59,5 @@ public class OceanbaseAlterTableUpgradePartitioningTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_Index_Global.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_Index_Global.java index a0745b033..946eff02b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_Index_Global.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_Index_Global.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java index 4c74d6010..a9676a079 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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;"; // + String sql = "CREATE TABLE tnhash ( id INT, name VARCHAR(5) ) PARTITION BY HASH(id) PARTITIONS 2;"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -67,6 +65,5 @@ public class OceanbaseCreateTableTest_partitionByHash extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java index 782c148cd..3baadabe4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByHash2.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseCreateTableTest_partitionByHash2 extends MysqlTest { public void test_0() throws Exception { - String sql = "CREATE TABLE employees ( " // - + "id INT NOT NULL, fname VARCHAR(30), " // - + "lname VARCHAR(30), " // - + "hired DATE NOT NULL DEFAULT '1970-01-01', " // - + "separated DATE NOT NULL DEFAULT '9999-12-31', " // - + "job_code INT, " // + String sql = "CREATE TABLE employees ( " + + "id INT NOT NULL, fname VARCHAR(30), " + + "lname VARCHAR(30), " + + "hired DATE NOT NULL DEFAULT '1970-01-01', " + + "separated DATE NOT NULL DEFAULT '9999-12-31', " + + "job_code INT, " + "store_id INT ) " - + "PARTITION BY HASH(YEAR(hired)) PARTITIONS 4"; // + + "PARTITION BY HASH(YEAR(hired)) PARTITIONS 4"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -84,6 +82,5 @@ public class OceanbaseCreateTableTest_partitionByHash2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java index 794db96f2..024fb73e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_partitionByKey.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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"; // + String sql = "create table k2(id int primary key, name varchar(20)) partition by key() partitions 2"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -67,6 +65,5 @@ public class OceanbaseCreateTableTest_partitionByKey extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java index 74c44d76e..31eac697a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition.java @@ -20,21 +20,20 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; 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)," // - + " lname VARCHAR(30), hired DATE NOT NULL DEFAULT '1970-01-01'," // + String sql = "CREATE TABLE employees (" + + " id INT NOT NULL, fname VARCHAR(30)," + + " lname VARCHAR(30), hired DATE NOT NULL DEFAULT '1970-01-01'," + " separated DATE NOT NULL DEFAULT '9999-12-31', job_code INT NOT NULL," - + " store_id INT NOT NULL" // - + " ) PARTITION BY RANGE (store_id) " // - + "( PARTITION p0 VALUES LESS THAN (6), " // - + "PARTITION p1 VALUES LESS THAN (11), " // - + "PARTITION p2 VALUES LESS THAN (16), " // + + " store_id INT NOT NULL" + + " ) PARTITION BY RANGE (store_id) " + + "( PARTITION p0 VALUES LESS THAN (6), " + + "PARTITION p1 VALUES LESS THAN (11), " + + "PARTITION p2 VALUES LESS THAN (16), " + "PARTITION p3 VALUES LESS THAN (21) )"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -95,6 +94,5 @@ public class OceanbaseCreateTableTest_rangePartition extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java index 0570256ad..25665189e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition2.java @@ -20,24 +20,23 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; 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, " // - + "fname VARCHAR(30), " // - + "lname VARCHAR(30), " // - + "hired DATE NOT NULL DEFAULT '1970-01-01', " // - + "separated DATE NOT NULL DEFAULT '9999-12-31', " // - + "job_code INT NOT NULL,store_id INT NOT NULL " // - + ") PARTITION BY RANGE (store_id) " // - + "( PARTITION p0 VALUES LESS THAN (6), " // - + "PARTITION p1 VALUES LESS THAN (11), " // - + "PARTITION p2 VALUES LESS THAN (16), " // - + "PARTITION p3 VALUES LESS THAN MAXVALUE " // + String sql = "CREATE TABLE employees ( " + + "id INT NOT NULL, " + + "fname VARCHAR(30), " + + "lname VARCHAR(30), " + + "hired DATE NOT NULL DEFAULT '1970-01-01', " + + "separated DATE NOT NULL DEFAULT '9999-12-31', " + + "job_code INT NOT NULL,store_id INT NOT NULL " + + ") PARTITION BY RANGE (store_id) " + + "( PARTITION p0 VALUES LESS THAN (6), " + + "PARTITION p1 VALUES LESS THAN (11), " + + "PARTITION p2 VALUES LESS THAN (16), " + + "PARTITION p3 VALUES LESS THAN MAXVALUE " + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); @@ -98,6 +97,5 @@ public class OceanbaseCreateTableTest_rangePartition2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java index 14ff9ce1a..e9b689e55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition3.java @@ -20,24 +20,23 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; 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, " // - + "fname VARCHAR(30), " // - + "lname VARCHAR(30), " // - + "hired DATE NOT NULL DEFAULT '1970-01-01', " // - + "separated DATE NOT NULL DEFAULT '9999-12-31', " // - + "job_code INT NOT NULL, store_id INT NOT NULL " // - + ") PARTITION BY RANGE (job_code) " // - + "( PARTITION p0 VALUES LESS THAN (100), " // - + "PARTITION p1 VALUES LESS THAN (1000), " // + String sql = "CREATE TABLE employees ( " + + "id INT NOT NULL, " + + "fname VARCHAR(30), " + + "lname VARCHAR(30), " + + "hired DATE NOT NULL DEFAULT '1970-01-01', " + + "separated DATE NOT NULL DEFAULT '9999-12-31', " + + "job_code INT NOT NULL, store_id INT NOT NULL " + + ") PARTITION BY RANGE (job_code) " + + "( PARTITION p0 VALUES LESS THAN (100), " + + "PARTITION p1 VALUES LESS THAN (1000), " + "PARTITION p2 VALUES LESS THAN (10000) " - + ")"; // + + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -95,6 +94,5 @@ public class OceanbaseCreateTableTest_rangePartition3 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java index 747aa66e1..39cd90afb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition4.java @@ -15,30 +15,28 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseCreateTableTest_rangePartition4 extends MysqlTest { public void test_0() throws Exception { - String sql = "CREATE TABLE employees ( " // - + "id INT NOT NULL, " // - + "fname VARCHAR(30), " // - + "lname VARCHAR(30), " // - + "hired DATE NOT NULL DEFAULT '1970-01-01', " // - + "separated DATE NOT NULL DEFAULT '9999-12-31', " // - + "job_code INT, store_id INT " // - + ") PARTITION BY RANGE (YEAR(separated)) ( " // - + "PARTITION p0 VALUES LESS THAN (1991), " // + String sql = "CREATE TABLE employees ( " + + "id INT NOT NULL, " + + "fname VARCHAR(30), " + + "lname VARCHAR(30), " + + "hired DATE NOT NULL DEFAULT '1970-01-01', " + + "separated DATE NOT NULL DEFAULT '9999-12-31', " + + "job_code INT, store_id INT " + + ") PARTITION BY RANGE (YEAR(separated)) ( " + + "PARTITION p0 VALUES LESS THAN (1991), " + "PARTITION p1 VALUES LESS THAN (1996), " + "PARTITION p2 VALUES LESS THAN (2001), " - + "PARTITION p3 VALUES LESS THAN MAXVALUE )"; // + + "PARTITION p3 VALUES LESS THAN MAXVALUE )"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -98,6 +96,5 @@ public class OceanbaseCreateTableTest_rangePartition4 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java index 3c6e4def4..2d6400460 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_rangePartition5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class OceanbaseCreateTableTest_rangePartition5 extends MysqlTest { + " PARTITION BY RANGE(id) ( " + " PARTITION p1 VALUES LESS THAN (1), " + " PARTITION p2 VALUES LESS THAN MAXVALUE" - + ");"; // + + ");"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -76,6 +75,5 @@ public class OceanbaseCreateTableTest_rangePartition5 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java index 9808db0eb..d0f6bf78b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition.java @@ -15,25 +15,23 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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)) " // - + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " // - + "SUBPARTITIONS 2 ( " // - + "PARTITION p0 VALUES LESS THAN (1990), " // - + "PARTITION p1 VALUES LESS THAN (2000), " // - + "PARTITION p2 VALUES LESS THAN MAXVALUE )"; // + String sql = "CREATE TABLE ts (id INT, purchased DATE) " + + "PARTITION BY RANGE(YEAR(purchased)) " + + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " + + "SUBPARTITIONS 2 ( " + + "PARTITION p0 VALUES LESS THAN (1990), " + + "PARTITION p1 VALUES LESS THAN (2000), " + + "PARTITION p2 VALUES LESS THAN MAXVALUE )"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -83,6 +81,5 @@ public class OceanbaseCreateTableTest_subPartition extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java index 2177e3bd0..e0669ae6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition2.java @@ -15,28 +15,26 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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)) " // - + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " // + String sql = "CREATE TABLE ts (id INT, purchased DATE) " + + "PARTITION BY RANGE(YEAR(purchased)) " + + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " + "( " - + " PARTITION p0 VALUES LESS THAN (1990) " // - + " ( SUBPARTITION s0, SUBPARTITION s1 ), " // - + " PARTITION p1 VALUES LESS THAN (2000) " // - + " (SUBPARTITION s2, SUBPARTITION s3), " // - + " PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s4, SUBPARTITION s5 ) " // - + ")"; // + + " PARTITION p0 VALUES LESS THAN (1990) " + + " ( SUBPARTITION s0, SUBPARTITION s1 ), " + + " PARTITION p1 VALUES LESS THAN (2000) " + + " (SUBPARTITION s2, SUBPARTITION s3), " + + " PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s4, SUBPARTITION s5 ) " + + ")"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -104,6 +102,5 @@ public class OceanbaseCreateTableTest_subPartition2 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java index 9af23ebf1..fdb39b9cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition3.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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)) " // - + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " // - + "( PARTITION p0 VALUES LESS THAN (1990) " // - + "( SUBPARTITION s0, SUBPARTITION s1 ), PARTITION p1 VALUES LESS THAN (2000), PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s2, SUBPARTITION s3 ) )"; // + String sql = "CREATE TABLE ts (id INT, purchased DATE) " // + + "PARTITION BY RANGE(YEAR(purchased)) " + + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " + + "( PARTITION p0 VALUES LESS THAN (1990) " + + "( SUBPARTITION s0, SUBPARTITION s1 ), PARTITION p1 VALUES LESS THAN (2000), PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s2, SUBPARTITION s3 ) )"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -72,6 +70,5 @@ public class OceanbaseCreateTableTest_subPartition3 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java index e1de6a86e..5a1593042 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseCreateTableTest_subPartition4.java @@ -15,24 +15,22 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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)) " // - + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " // - + "( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0, SUBPARTITION s1 ), " // - + "PARTITION p1 VALUES LESS THAN (2000) ( SUBPARTITION s0, SUBPARTITION s1 ), " // - + "PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s0, SUBPARTITION s1 ) )"; // + String sql = "CREATE TABLE ts (id INT, purchased DATE) " + + "PARTITION BY RANGE(YEAR(purchased)) " + + "SUBPARTITION BY HASH(TO_DAYS(purchased)) " + + "( PARTITION p0 VALUES LESS THAN (1990) ( SUBPARTITION s0, SUBPARTITION s1 ), " + + "PARTITION p1 VALUES LESS THAN (2000) ( SUBPARTITION s0, SUBPARTITION s1 ), " + + "PARTITION p2 VALUES LESS THAN MAXVALUE ( SUBPARTITION s0, SUBPARTITION s1 ) )"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -76,6 +74,5 @@ public class OceanbaseCreateTableTest_subPartition4 extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java index 2447b4dda..c7d25509a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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;"; @@ -61,6 +59,5 @@ public class OceanbaseHintTest_Index extends MysqlTest { assertEquals(2, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java index d0c5f201a..3f6f6ef2d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Index2.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseHintTest_Index2 extends MysqlTest { public void test_0() throws Exception { String sql = "delete /*+ INDEX(t1 i1) */ from t1 where t1.c1=1;"; @@ -53,6 +51,5 @@ public class OceanbaseHintTest_Index2 extends MysqlTest { assertEquals(1, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java index bce4a7dfc..fbaca5814 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_Topk.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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 "; @@ -56,6 +54,5 @@ public class OceanbaseHintTest_Topk extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java index ec8a91ac2..5c6d1e7fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_multiget.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + 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))"; @@ -54,6 +52,5 @@ public class OceanbaseHintTest_multiget extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java index 9997c962c..1259d75c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseHintTest_parallel.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseHintTest_parallel extends MysqlTest { public void test_0() throws Exception { String sql = "select /*+ parallel(5) */ count(*) from t1;"; @@ -54,6 +52,5 @@ public class OceanbaseHintTest_parallel extends MysqlTest { assertTrue(visitor.containsTable("t1")); assertTrue(visitor.containsColumn("t1", "*")); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java index 635bcd960..b60deecb7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectPartitionTest.java @@ -15,19 +15,17 @@ */ package com.alibaba.druid.bvt.sql.oceanbase; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import java.util.List; + public class OceanbaseSelectPartitionTest extends MysqlTest { public void test_0() throws Exception { - String sql = "SELECT * FROM tnhash partition(p0);"; // + String sql = "SELECT * FROM tnhash partition(p0);"; MySqlStatementParser parser = new MySqlStatementParser(sql); List stmtList = parser.parseStatementList(); @@ -35,12 +33,12 @@ public class OceanbaseSelectPartitionTest extends MysqlTest { { String result = SQLUtils.toMySqlString(stmt); - assertEquals("SELECT *" + // + assertEquals("SELECT *" + "\nFROM tnhash PARTITION (p0);", result); } { String result = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select *" + // + assertEquals("select *" + "\nfrom tnhash partition (p0);", result); } @@ -59,6 +57,5 @@ public class OceanbaseSelectPartitionTest extends MysqlTest { assertEquals(0, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest.java index 2d9c86589..b61d28fa0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest.java @@ -28,7 +28,7 @@ public class OceanbaseSelectTest extends MysqlTest { protected final DbType dbType = JdbcConstants.MYSQL; public void test_0() throws Exception { - String sql = "SELECT EmpID, EmpName, MgrId, Level FROM emp START WITH MgrId IS NULL CONNECT BY PRIOR EmpId = MgrId"; // + String sql = "SELECT EmpID, EmpName, MgrId, Level FROM emp START WITH MgrId IS NULL CONNECT BY PRIOR EmpId = MgrId"; List stmtList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = stmtList.get(0); @@ -63,6 +63,5 @@ public class OceanbaseSelectTest extends MysqlTest { assertEquals(3, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java index da93c6425..3b0f40ba8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/OceanbaseSelectTest_hierarchical_1.java @@ -32,7 +32,7 @@ public class OceanbaseSelectTest_hierarchical_1 extends MysqlTest { " FROM employees\n" + " START WITH employee_id = 100\n" + " CONNECT BY PRIOR employee_id = manager_id\n" + - " ORDER SIBLINGS BY last_name;"; // + " ORDER SIBLINGS BY last_name;"; List stmtList = SQLUtils.parseStatements(sql, dbType); SQLStatement stmt = stmtList.get(0); @@ -69,6 +69,5 @@ public class OceanbaseSelectTest_hierarchical_1 extends MysqlTest { assertEquals(2, visitor.getConditions().size()); // assertTrue(visitor.getTables().containsKey(new TableStat.Name("t_basic_store"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/issues/Issue5078.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/issues/Issue5078.java index 0c6f34dfc..3f2598b0b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/issues/Issue5078.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oceanbase/issues/Issue5078.java @@ -1,14 +1,10 @@ package com.alibaba.druid.bvt.sql.oceanbase.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.bvt.sql.mysql.issues.Issue5421; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.util.JdbcUtils; - import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -20,7 +16,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5078 { - @Test public void test_update_limit() throws Exception { for (DbType dbType : new DbType[]{DbType.oceanbase}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java index 272d1f19f..3e39a6a32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAddStatisticTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAddStatisticTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java index 787a90102..8d1d79e32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddColumnsTest.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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);";// + String sql = "alter table adl_smeta_column_indi_rule_relation_sdt add columns (rule_level string);"; assertEquals("ALTER TABLE adl_smeta_column_indi_rule_relation_sdt\n" + "\tADD COLUMNS (rule_level STRING);", SQLUtils.formatOdps(sql)); assertEquals("alter table adl_smeta_column_indi_rule_relation_sdt\n" + @@ -51,5 +50,4 @@ public class OdpsAlterTableAddColumnsTest extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java index 6811f53c7..ff600adbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableAddPartitionTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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');"; - assertEquals("ALTER TABLE sale_detail" // + assertEquals("ALTER TABLE sale_detail" + "\n\tADD IF NOT EXISTS PARTITION (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java index db2303123..174f621dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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';";// + String sql = "ALTER TABLE adl_smeta_indi_rule_relation_sdt CHANGE COLUMN indi_level COMMENT 'xxxx';"; assertEquals("ALTER TABLE adl_smeta_indi_rule_relation_sdt\n" + "\tCHANGE COLUMN indi_level COMMENT 'xxxx';", SQLUtils.formatOdps(sql)); assertEquals("alter table adl_smeta_indi_rule_relation_sdt\n" + @@ -51,5 +50,4 @@ public class OdpsAlterTableChangeColumnTest extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java index f641b9eed..5b4b33816 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest2.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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;";// + String sql = "alter table sale_detail change column old_col_name rename to new_col_name;"; assertEquals("ALTER TABLE sale_detail\n" + "\tCHANGE COLUMN old_col_name RENAME TO new_col_name;", SQLUtils.formatOdps(sql)); assertEquals("alter table sale_detail\n" + @@ -51,5 +50,4 @@ public class OdpsAlterTableChangeColumnTest2 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java index dd56023e5..f8c82b018 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest3.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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;";// + String sql = "ALTER TABLE table_name CHANGE COLUMN old_col_name new_col_name bigint COMMENT column_comment;"; assertEquals("ALTER TABLE table_name\n" + "\tCHANGE COLUMN old_col_name new_col_name BIGINT COMMENT column_comment;", SQLUtils.formatOdps(sql)); assertEquals("alter table table_name\n" + @@ -51,5 +50,4 @@ public class OdpsAlterTableChangeColumnTest3 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java index edd48833b..249486feb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableChangeColumnTest4.java @@ -25,7 +25,7 @@ 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 '';";// + String sql = "ALTER TABLE table_name CHANGE COLUMN old_col_name new_col_name column_type COMMENT '';"; assertEquals("ALTER TABLE table_name\n" + "\tCHANGE COLUMN old_col_name new_col_name COLUMN_TYPE COMMENT '';", SQLUtils.formatOdps(sql)); assertEquals("alter table table_name\n" + @@ -50,5 +50,4 @@ public class OdpsAlterTableChangeColumnTest4 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java index 226b57e31..321867566 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDisableLifecycle.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterTableDisableLifecycle extends TestCase { public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans DISABLE LIFECYCLE;"; - assertEquals("ALTER TABLE trans" // + assertEquals("ALTER TABLE trans" + "\n\tDISABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - assertEquals("alter table trans" // + assertEquals("alter table trans" + "\n\tdisable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java index 0aa87a331..41c39fe1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest.java @@ -1,17 +1,14 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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');"; - assertEquals("ALTER TABLE sale_detail" // + assertEquals("ALTER TABLE sale_detail" + "\n\tDROP IF EXISTS PARTITION (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql)); - assertEquals("alter table sale_detail" // + assertEquals("alter table sale_detail" + "\n\tdrop if exists partition (sale_date = '201312', region = 'hangzhou');", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java index 0a4232d18..01fd28161 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableDropPartitionTest2.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OdpsAlterTableDropPartitionTest2 extends TestCase { public void test_if() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java index 47a408f5b..d964ec21a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableEnableLifecycle.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterTableEnableLifecycle extends TestCase { public void test_no_partition() throws Exception { String sql = "ALTER TABLE trans ENABLE LIFECYCLE;"; - assertEquals("ALTER TABLE trans" // + assertEquals("ALTER TABLE trans" + "\n\tENABLE LIFECYCLE;", SQLUtils.formatOdps(sql)); - assertEquals("alter table trans" // + assertEquals("alter table trans" + "\n\tenable lifecycle;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java index 34bede259..50b90cf56 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableMergeSmallFilesTest.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OdpsAlterTableMergeSmallFilesTest extends TestCase { public void test_touch() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java index 31e45ce6b..51691fe0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableRenamePartitionTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterTableRenamePartitionTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java index a92393ed0..4c2a610dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetCommentTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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';"; - assertEquals("ALTER TABLE sale_detail" // + assertEquals("ALTER TABLE sale_detail" + "\n\tSET COMMENT 'new coments for table sale_detail';", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java index 5cc210d19..02a8d01ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableSetLifecycle.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterTableSetLifecycle extends TestCase { public void test_if() throws Exception { String sql = "alter table test_lifecycle set lifecycle 50;"; - assertEquals("ALTER TABLE test_lifecycle" // + assertEquals("ALTER TABLE test_lifecycle" + "\n\tSET LIFECYCLE 50;", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java index c2d57f63b..46f2cab1c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterTableTouchTest.java @@ -1,21 +1,18 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterTableTouchTest extends TestCase { public void test_touch() throws Exception { String sql = "alter table test_lifecycle touch;"; - assertEquals("ALTER TABLE test_lifecycle" // + 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');"; - assertEquals("ALTER TABLE test_lifecycle" // + assertEquals("ALTER TABLE test_lifecycle" + "\n\tTOUCH PARTITION (dt = '20141111');", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java index ba280ba3f..b7d17d69f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAlterViewTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAlterViewTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java index 7fd1d49fe..6b6c9d33f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAnalyzeTableTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAnalyzeTableTest extends TestCase { @@ -16,5 +13,4 @@ public class OdpsAnalyzeTableTest extends TestCase { String sql = "analyze table t compute statistics"; assertEquals("ANALYZE TABLE t COMPUTE STATISTICS", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAsNumberFirstTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAsNumberFirstTest.java index 95a427994..ad9dce836 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAsNumberFirstTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsAsNumberFirstTest.java @@ -1,17 +1,13 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsAsNumberFirstTest extends TestCase { public void test_0() throws Exception { String sql = "select id as 39dd" + "\n from t1"; - assertEquals("SELECT id AS 39dd" // + assertEquals("SELECT id AS 39dd" + "\nFROM t1", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java index 331408168..9d811a53e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCaseWhenTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsCaseWhenTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java index c9d6242a2..3339f4fae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest.java @@ -1,24 +1,21 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; 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" // + 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" + ";"; OdpsStatementParser parser = new OdpsStatementParser(sql); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java index 409d8569b..441d56024 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest2.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsCreateTableTest2 extends TestCase { public void test_0() throws Exception { @@ -18,7 +15,7 @@ public class OdpsCreateTableTest2 extends TestCase { String output = SQLUtils.toOdpsString(stmt); assertEquals("CREATE TABLE sale_detail" + "\nAS" - + "\nSELECT *" // + + "\nSELECT *" + "\nFROM dual;", output); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java index 6b25e8765..a3a289854 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest3.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsCreateTableTest3 extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java index 0c070febf..4e9c7a14e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest4.java @@ -26,7 +26,7 @@ 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;";// + String sql = "CREATE TABLE T1 (a string, b string, c bigint) CLUSTERED BY (c) SORTED by (c) INTO 1024 BUCKETS;"; assertEquals("CREATE TABLE T1 (\n" + "\ta STRING,\n" + "\tb STRING,\n" + @@ -66,5 +66,4 @@ public class OdpsCreateTableTest4 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java index 0ca09bf1e..859f1c04d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest6_array.java @@ -38,7 +38,7 @@ public class OdpsCreateTableTest6_array extends TestCase { " --unionField1 PropValueUnion,\n" + " --unionField2 PropValueUnion,\n" + " -- unionField3 PropValueUnion\n" + - ");";// + ");"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); @@ -80,5 +80,4 @@ public class OdpsCreateTableTest6_array extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java index b3aa6dc06..1d5021305 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateTableTest7_struct.java @@ -26,7 +26,7 @@ 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;";// + String sql = "CREATE TABLE DEST3(k STRUCT, v BIGINT) STORED AS TEXTFILE;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ODPS); SQLStatement stmt = statementList.get(0); @@ -61,5 +61,4 @@ public class OdpsCreateTableTest7_struct extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java index 4cde80c4c..6f937b8fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsCreateViewTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; - import junit.framework.TestCase; public class OdpsCreateViewTest extends TestCase { @@ -16,9 +13,9 @@ public class OdpsCreateViewTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - assertEquals("CREATE VIEW sale_detail" // - + "\nAS" // - + "\nSELECT *" // + assertEquals("CREATE VIEW sale_detail" + + "\nAS" + + "\nSELECT *" + "\nFROM dual;", output); } @@ -28,9 +25,9 @@ public class OdpsCreateViewTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - assertEquals("CREATE OR REPLACE VIEW sale_detail" // - + "\nAS" // - + "\nSELECT *" // + assertEquals("CREATE OR REPLACE VIEW sale_detail" + + "\nAS" + + "\nSELECT *" + "\nFROM dual;", output); } @@ -40,9 +37,9 @@ public class OdpsCreateViewTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // - + "\nAS" // - + "\nSELECT *" // + assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" + + "\nAS" + + "\nSELECT *" + "\nFROM dual;", output); } @@ -52,10 +49,10 @@ public class OdpsCreateViewTest extends TestCase { SQLStatement stmt = parser.parseStatementList().get(0); parser.match(Token.EOF); String output = SQLUtils.toOdpsString(stmt); - assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" // - + "\nCOMMENT 'aaaa'" // - + "\nAS" // - + "\nSELECT *" // + assertEquals("CREATE VIEW IF NOT EXISTS sale_detail" + + "\nCOMMENT 'aaaa'" + + "\nAS" + + "\nSELECT *" + "\nFROM dual;", output); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java index 34a5411c4..6068d2c47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDescTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsDescTest extends TestCase { public void test_0() throws Exception { @@ -60,5 +57,4 @@ public class OdpsDescTest extends TestCase { System.out.println(output); assertEquals("DESC idl_cheka_ent_sql_fdt PARTITION (ds = '20151010')", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java index 464cb48bd..6693fe9f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDoubleQuoteTest.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OdpsDoubleQuoteTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java index 5b9c5b81e..cba00f22c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsDropViewTest.java @@ -15,10 +15,7 @@ */ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsDropViewTest extends TestCase { @@ -26,5 +23,4 @@ public class OdpsDropViewTest extends TestCase { String sql = "drop view if exists view_name;"; assertEquals("DROP VIEW IF EXISTS view_name;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java index 54fa6903f..6f965a9a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest extends TestCase { public void test_column_comment() throws Exception { String sql = "select f1 -- aaa" + "\n from t1"; - assertEquals("SELECT f1 -- aaa" // + assertEquals("SELECT f1 -- aaa" + "\nFROM t1", SQLUtils.formatOdps(sql)); } @@ -18,8 +15,8 @@ public class OdpsFormatCommentTest extends TestCase { String sql = "select f1 -- aaa" + "\n, f2 -- bbb" + "\n from t1"; - assertEquals("SELECT f1 -- aaa" // - + "\n\t, f2 -- bbb" // + assertEquals("SELECT f1 -- aaa" + + "\n\t, f2 -- bbb" + "\nFROM t1", SQLUtils.formatOdps(sql)); } @@ -27,8 +24,8 @@ public class OdpsFormatCommentTest extends TestCase { String sql = "select f1 /*aa*/" + "\n, f2 -- bbb" + "\n from t1"; - assertEquals("SELECT f1 /*aa*/" // - + "\n\t, f2 -- bbb" // + assertEquals("SELECT f1 /*aa*/" + + "\n\t, f2 -- bbb" + "\nFROM t1", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java index a288a9389..2c2271339 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest10.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest10 extends TestCase { @@ -22,5 +19,4 @@ public class OdpsFormatCommentTest10 extends TestCase { + "\n\t)" + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java index 380c0f1e1..1f94b4566 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest11.java @@ -1,19 +1,15 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest11 extends TestCase { public void test_column_comment() throws Exception { String sql = "select * from t where -- comment_xx" + "\n f1 > 0"; - assertEquals("SELECT *" // - + "\nFROM t" // + assertEquals("SELECT *" + + "\nFROM t" + "\nWHERE -- comment_xx" + "\nf1 > 0", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java index 1c81db9a3..4c62c95cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest12.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest12 extends TestCase { public void test_column_comment() throws Exception { String sql = "select * from t --abc"; - assertEquals("SELECT *" // + assertEquals("SELECT *" + "\nFROM t -- abc", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java index 51eec8702..818cd681f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest13.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - import junit.framework.TestCase; public class OdpsFormatCommentTest13 extends TestCase { @@ -19,11 +16,11 @@ public class OdpsFormatCommentTest13 extends TestCase { SQLStatement stmt = SQLUtils .parseSingleStatement(sql, DbType.odps, SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup); - System.out.println("第一次生成的sql==="+stmt.toString()); + System.out.println("第一次生成的sql===" + stmt.toString()); SQLStatement stmt2 = SQLUtils - .parseSingleStatement(stmt.toString(), DbType.odps,SQLParserFeature.KeepComments, + .parseSingleStatement(stmt.toString(), DbType.odps, SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup); - System.out.println("第二次生成的sql==="+stmt2.toString()); + System.out.println("第二次生成的sql===" + stmt2.toString()); assertEquals( "SELECT *\n" @@ -35,5 +32,4 @@ public class OdpsFormatCommentTest13 extends TestCase { + "\tf2 > 2 -- comment_4", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java index 5586d87b4..28447a446 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest14.java @@ -1,23 +1,20 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest14 extends TestCase { public void test_column_comment() throws Exception { - String sql = "select * from (" // + String sql = "select * from (" + "select 1 from t1" + "\n --c_0" + "\n union all " - + "\n --c_1" // - + "\nselect 2 from t2" // + + "\n --c_1" + + "\nselect 2 from t2" + "\n --c_2" + "\n union all " - + "\n --c_3" // - + "\nselect 3 from t3" // + + "\n --c_3" + + "\nselect 3 from t3" + ") xx"; assertEquals("SELECT *" + "\nFROM (" @@ -33,5 +30,4 @@ public class OdpsFormatCommentTest14 extends TestCase { + "\n\tFROM t3" + "\n) xx", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java index 479651491..2656aae73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest15.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest15 extends TestCase { @@ -17,5 +14,4 @@ public class OdpsFormatCommentTest15 extends TestCase { + "\n\thh STRING" + "\n);", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java index 95ef1d333..75da42155 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest16.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest16 extends TestCase { @@ -26,5 +23,4 @@ public class OdpsFormatCommentTest16 extends TestCase { + "\n\thh STRING -- c_2" + "\n);", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java index 3fffcfefb..ea457b5fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest17.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest17 extends TestCase { @@ -11,5 +8,4 @@ public class OdpsFormatCommentTest17 extends TestCase { String sql = "set xxx=aaa;--ssss"; assertEquals("SET xxx = aaa;-- ssss", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java index fcb35d49c..2839005d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest18.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest18 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java index 7b0413433..efbb6cc35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest19.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest19 extends TestCase { @@ -13,5 +10,4 @@ public class OdpsFormatCommentTest19 extends TestCase { assertEquals("SET xxx = aaa;-- ssss" + "\nSET yyy = 123;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java index f8eff4476..0c39c4fb6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest2.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest2 extends TestCase { public void test_column_comment() throws Exception { - String sql = "--[Subject -]" // + String sql = "--[Subject -]" + "\n--[Author -高铁/035139]"// + "\n--[Created -2015-06-10 13:19:18]"// + "\n--[Update ]"// @@ -19,9 +16,8 @@ public class OdpsFormatCommentTest2 extends TestCase { + "\n-- [Created -2015-06-10 13:19:18]" + "\n-- [Update ]" + "\nSET odps.sql.mapper.split.size = 2048;" - + "\n" // + + "\n" + "\nSELECT *" + "\nFROM dual;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java index 29390a315..0948d939e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest20.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest20 extends TestCase { @@ -14,5 +11,4 @@ public class OdpsFormatCommentTest20 extends TestCase { + "\nFULL OUTER JOIN b" + "\nON a.id = b.id", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java index c38bd333b..6c4a3f8ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest21.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest21 extends TestCase { @@ -13,5 +10,4 @@ public class OdpsFormatCommentTest21 extends TestCase { + "\n\tf1 BIGINT" + "\n)", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java index f9eb937a3..60a79da97 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest22.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest22 extends TestCase { @@ -24,5 +21,4 @@ public class OdpsFormatCommentTest22 extends TestCase { assertEquals("SELECT count(*)" + "\nFROM dual", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java index 06ee6ebad..77f6b0c6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest23.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest23 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java index 97489cff9..6f0393bf2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest24.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest24 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java index ee4bd765e..95a117781 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest25.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest25 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java index f044ca3a4..a2df28888 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest26.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest26 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java index d98972504..1762d1334 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest27.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest27 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java index c691de7b4..b34a6ff5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest28.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest28 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java index ac7a47520..97dd404a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest29.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest29 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java index a2108a9fc..ff2b1d890 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest3.java @@ -1,30 +1,26 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest3 extends TestCase { public void test_column_comment() throws Exception { - String sql = "-- 使用服务模式" // - + "\nset odps.service.mode=all;" // + String sql = "-- 使用服务模式" + + "\nset odps.service.mode=all;" + "\n-- 使用新引擎"// + "\nset odps.nvm.enabled=true;"// + "\nselect f1 -- aa"// + "\nfrom t0;"// + "\nselect f2 -- aa"// - + "\nfrom t1;";// + + "\nfrom t1;"; assertEquals("-- 使用服务模式"// + "\nSET odps.service.mode = all;-- 使用新引擎"// + "\nSET odps.nvm.enabled = true;"// - + "\n" // + + "\n" + "\nSELECT f1 -- aa"// + "\nFROM t0;"// - + "\n" // + + "\n" + "\nSELECT f2 -- aa"// + "\nFROM t1;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java index 683a37654..951a133a0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest30.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest30 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java index d37d18f41..11f7bef99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest4.java @@ -1,22 +1,19 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest4 extends TestCase { public void test_column_comment() throws Exception { String sql = "from (select * from xxx) a" - + "\n -- comment_0" // - + "\ninsert overwrite table b partition(ds='20150711')" // - + "\nselect f0, f1, f2" // + + "\n -- comment_0" + + "\ninsert overwrite table b partition(ds='20150711')" + + "\nselect f0, f1, f2" + "\nwhere name rlike 'xxxx'" - + "\n -- comment_1" // - + "\ninsert overwrite table c partition(ds='20150711')" // - + "\nselect f0, f1, f2" // - + "\nwhere name rlike 'kk';";// + + "\n -- comment_1" + + "\ninsert overwrite table c partition(ds='20150711')" + + "\nselect f0, f1, f2" + + "\nwhere name rlike 'kk';"; assertEquals( "FROM (\n" + "\tSELECT *\n" @@ -31,5 +28,4 @@ public class OdpsFormatCommentTest4 extends TestCase { + "WHERE name RLIKE 'kk';", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java index 8974f47c8..effc1a587 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest5.java @@ -1,41 +1,38 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest5 extends TestCase { public void test_column_comment() throws Exception { - String sql = "select *" // + String sql = "select *" + "\nfrom t -- xxxx"// - + "\nwhere id > 0;";// - assertEquals("SELECT *" // - + "\nFROM t -- xxxx" // + + "\nwhere id > 0;"; + assertEquals("SELECT *" + + "\nFROM t -- xxxx" + "\nWHERE id > 0;", SQLUtils.formatOdps(sql)); } public void test_column_comment_as() throws Exception { - String sql = "select *" // + String sql = "select *" + "\nfrom xxxx a-- xxxx"// - + "\nwhere id > 0;";// - assertEquals("SELECT *" // - + "\nFROM xxxx a -- xxxx" // + + "\nwhere id > 0;"; + 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;";// - assertEquals("SELECT *" // - + "\nFROM (" // - + "\n\t-- comment_xxx" // - + "\n\tSELECT *" // - + "\n\tFROM t" // + String sql = "select *" + + "\nfrom (" + + "\n-- comment_xxx" + + "\nselect * from t" + + "\n) a;"; + assertEquals("SELECT *" + + "\nFROM (" + + "\n\t-- comment_xxx" + + "\n\tSELECT *" + + "\n\tFROM t" + "\n) a;", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java index 3ac236f66..0a3abf466 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest6.java @@ -1,33 +1,29 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; - import junit.framework.TestCase; public class OdpsFormatCommentTest6 extends TestCase { public void test_column_comment() throws Exception { - String sql = "select *" // + String sql = "select *" + "\nfrom t "// + "\nwhere status = '20' -- comment xxx" + "\nand flag & 127 > 0 -- comment kkkkk" - + "\n;";// + + "\n;"; SQLStatement stmt = SQLUtils .parseSingleStatement(sql, DbType.odps, SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup); - System.out.println("第一次生成的sql==="+stmt.toString()); + System.out.println("第一次生成的sql===" + stmt.toString()); SQLStatement stmt2 = SQLUtils - .parseSingleStatement(stmt.toString(), DbType.odps,SQLParserFeature.KeepComments, + .parseSingleStatement(stmt.toString(), DbType.odps, SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup); - System.out.println("第二次生成的sql==="+stmt2.toString()); + System.out.println("第二次生成的sql===" + stmt2.toString()); assertEquals("SELECT *" + "\nFROM t" + "\nWHERE status = '20' -- comment xxx" + "\n\tAND flag & 127 > 0 -- comment kkkkk\n;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java index 4743debc2..fc9a23322 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest7.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest7 extends TestCase { public void test_column_comment() throws Exception { - String sql = "--这里是注释" // - + "\nselect * from table1;" // - + "\nselect * from table2;;";// + String sql = "--这里是注释" + + "\nselect * from table1;" + + "\nselect * from table2;;"; assertEquals("-- 这里是注释" + "\nSELECT *" + "\nFROM table1;" @@ -18,5 +15,4 @@ public class OdpsFormatCommentTest7 extends TestCase { + "\nSELECT *" + "\nFROM table2;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java index 99b350714..abbe71edd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest8.java @@ -1,17 +1,14 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest8 extends TestCase { 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";// + String sql = "select * from table1;--comment1 goes here" + + "\n" + + "\nselect * from table2;;select * from table3;" + + "\n--comment2 goes here"; assertEquals("SELECT *\n" + "FROM table1;-- comment1 goes here\n" + "\n" + @@ -34,5 +31,4 @@ public class OdpsFormatCommentTest8 extends TestCase { "\n" + "-- comment2 goes here", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java index 642451551..ea21dc3a4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatCommentTest9.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatCommentTest9 extends TestCase { @@ -14,5 +11,4 @@ public class OdpsFormatCommentTest9 extends TestCase { + "\n\tAS (f0, f1, f2, f3)" + "\nFROM xxx;", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java index 003f0adf1..4ace649aa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatInTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatInTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java index 20b9bfd07..3a091461a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsFormatTest.java @@ -1,27 +1,24 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsFormatTest extends TestCase { public void test_format() throws Exception { String sql = "select * from t1; ;select * from t2;"; - assertEquals("SELECT *" // - + "\nFROM t1;" // + assertEquals("SELECT *" + + "\nFROM t1;" + "\n" - + "\nSELECT *" // + + "\nSELECT *" + "\nFROM t2;", SQLUtils.formatOdps(sql)); } public void test_no_semi() throws Exception { String sql = "select * from t1; ;select * from t2"; - assertEquals("SELECT *" // - + "\nFROM t1;" // + assertEquals("SELECT *" + + "\nFROM t1;" + "\n" - + "\nSELECT *" // + + "\nSELECT *" + "\nFROM t2", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java index 9c076a43f..aa7e752a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsGrantTest.java @@ -15,14 +15,11 @@ */ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsGrantTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java index 11d0188bc..2ab62b921 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsIfTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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"; - assertEquals("SELECT sum(IF(a > 0, 1, 0))" // + assertEquals("SELECT sum(IF(a > 0, 1, 0))" + "\nFROM t1", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java index abc77f939..662edbb47 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsInsertTest.java @@ -15,23 +15,20 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; - -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; public class OdpsInsertTest extends TestCase { public void test_0() throws Exception { @@ -83,5 +80,4 @@ public class OdpsInsertTest extends TestCase { assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsKeywordsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsKeywordsTest.java index 7e690c881..3da41d034 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsKeywordsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsKeywordsTest.java @@ -10,7 +10,7 @@ import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.VisitorFeature; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class OdpsKeywordsTest { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java index 5369a25b8..cc300f37e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListResourcesTest.java @@ -15,28 +15,25 @@ */ package com.alibaba.druid.bvt.sql.odps; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; +import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.support.opds.udf.SqlCodeStat; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.support.opds.udf.SqlCodeStat; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; -import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.Utils; - public class OdpsListResourcesTest extends TestCase { public void test_0() throws Exception { exec_test("bvt/parser/odps-3.sql"); @@ -61,7 +58,6 @@ public class OdpsListResourcesTest extends TestCase { String input = Utils.read(reader); String formattedSql = SQLUtils.format(input, DbType.odps); System.out.println(formattedSql); - } public void exec_test(String resource) throws Exception { @@ -85,10 +81,10 @@ public class OdpsListResourcesTest extends TestCase { new SqlCodeStat() .evaluate(sql, "odps"); - OdpsStatementParser parser = new OdpsStatementParser(sql - , SQLParserFeature.EnableSQLBinaryOpExprGroup - , SQLParserFeature.EnableMultiUnion - , SQLParserFeature.KeepComments); + OdpsStatementParser parser = new OdpsStatementParser(sql, + SQLParserFeature.EnableSQLBinaryOpExprGroup, + SQLParserFeature.EnableMultiUnion, + SQLParserFeature.KeepComments); List statementList = parser.parseStatementList(); if (statementList.isEmpty()) { throw new Exception("empty"); @@ -133,5 +129,4 @@ public class OdpsListResourcesTest extends TestCase { assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java index 0d0f92443..a048c3317 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsListTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsListTest extends TestCase { public void test_0() throws Exception { @@ -79,5 +76,4 @@ public class OdpsListTest extends TestCase { // System.out.println(output); assertEquals("LIST trustedprojects", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java index 173f78a5c..a8c2915d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java @@ -15,23 +15,20 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; - -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; public class OdpsMultiInsertTest extends TestCase { public void test_0() throws Exception { @@ -83,5 +80,4 @@ public class OdpsMultiInsertTest extends TestCase { assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java index 1fc054821..8e81047cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest2.java @@ -2,7 +2,6 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OdpsMultiInsertTest2 extends TestCase { public void test_for_multi_insert() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java index 864fcdd95..3502f648a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsReadTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsReadTest extends TestCase { @@ -31,5 +28,4 @@ public class OdpsReadTest extends TestCase { String sql = "read sale_detail partition(ds='20150701') 10"; assertEquals("READ sale_detail PARTITION (ds = '20150701') 10", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java index b6319cc5c..6237e5c89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsRemoveStatisticTest.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsRemoveStatisticTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java index 8abee697d..29d91a7bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsResourceTest.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.TestUtil; import com.alibaba.druid.bvt.sql.SQLResourceTest; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.visitor.VisitorFeature; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; +import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.sql.visitor.VisitorFeature; import org.junit.Test; +import java.util.List; + +import static org.junit.Assert.assertEquals; + public class OdpsResourceTest extends SQLResourceTest { public OdpsResourceTest() { super(DbType.odps); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java index 47a9e39dd..739f485df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest.java @@ -17,34 +17,32 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static 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" // - + "\nFROM sale_detail" // + String sql = "select region from sale_detail distribute by region;"; + assertEquals("SELECT region" + + "\nFROM sale_detail" + "\nDISTRIBUTE BY region;", SQLUtils.formatOdps(sql)); } public void test_distribute_by_1() throws Exception { - String sql = " select region from sale_detail distribute by region sort by f1;";// - assertEquals("SELECT region" // - + "\nFROM sale_detail" // + String sql = " select region from sale_detail distribute by region sort by f1;"; + assertEquals("SELECT region" + + "\nFROM sale_detail" + "\nDISTRIBUTE BY region\n" + "SORT BY f1;", SQLUtils.formatOdps(sql)); } public void test_distribute_by_2() throws Exception { - String sql = " select region from sale_detail distribute by region sort by f1 asc;";// - assertEquals("SELECT region" // - + "\nFROM sale_detail" // + String sql = " select region from sale_detail distribute by region sort by f1 asc;"; + assertEquals("SELECT region" + + "\nFROM sale_detail" + "\nDISTRIBUTE BY region\n" + "SORT BY f1 ASC;", SQLUtils.formatOdps(sql)); - assertEquals("select region" // - + "\nfrom sale_detail" // + assertEquals("select region" + + "\nfrom sale_detail" + "\ndistribute by region\n" + "sort by f1 asc;", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java index c1d6d8bd7..7d1f4b3a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest10.java @@ -15,23 +15,20 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest10 extends TestCase { public void test_select() throws Exception { String sql = "select /* + mapjoin(a) */ " + " a.name, b.fals" - + " from abc a join abc1 b on a.name = b.fals;";// + + " from abc a join abc1 b on a.name = b.fals;"; assertEquals("SELECT /*+ mapjoin(a) */ a.name, b.fals\n" + "FROM abc a\n" + "JOIN abc1 b\n" + @@ -60,5 +57,4 @@ public class OdpsSelectTest10 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java index c8e3a772d..aeb2fbccb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest11.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest11 extends TestCase { public void test_select() throws Exception { - String sql = "select 'a\\'b' from abc;";// + String sql = "select 'a\\'b' from abc;"; assertEquals("SELECT 'a\\'b'" + "\nFROM abc;", SQLUtils.formatOdps(sql)); assertEquals("select 'a\\'b'" @@ -54,5 +50,4 @@ public class OdpsSelectTest11 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java index 19d5686b9..666030788 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest12.java @@ -15,21 +15,18 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + 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;";// + String sql = "select name, sp from abc lateral view explode(split(concat(',','1','2','3'),',')) t as sp;"; assertEquals("SELECT name, sp\n" + "FROM abc\n" + "\tLATERAL VIEW EXPLODE(SPLIT(concat(',', '1', '2', '3'), ',')) t AS sp;", SQLUtils.formatOdps(sql)); @@ -58,5 +55,4 @@ public class OdpsSelectTest12 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java index c8ec7b3d4..d1d3ba681 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest13.java @@ -15,21 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest13 extends TestCase { public void test_select() throws Exception { - String sql = "select `name` from `abc`;";// + String sql = "select `name` from `abc`;"; assertEquals("SELECT `name`" + "\nFROM `abc`;", SQLUtils.formatOdps(sql)); assertEquals("select `name`" @@ -54,5 +50,4 @@ public class OdpsSelectTest13 extends TestCase { assertTrue(visitor.containsColumn("abc", "name")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java index ac4a1ff88..482b30aa9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest14.java @@ -15,20 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest14 extends TestCase { public void test_select() throws Exception { - String sql = "SELECT split_part(content, '\\001')[1] FROM dual;";// + String sql = "SELECT split_part(content, '\\001')[1] FROM dual;"; assertEquals("SELECT split_part(content, '\\001')[1]\n" + "FROM dual;", SQLUtils.formatOdps(sql)); assertEquals("select split_part(content, '\\001')[1]\n" + @@ -53,5 +50,4 @@ public class OdpsSelectTest14 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java index eb8895fc6..aad1b28e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest15.java @@ -15,20 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest15 extends TestCase { public void test_select() throws Exception { - String sql = "SELECT '\\n' FROM dual;";// + String sql = "SELECT '\\n' FROM dual;"; assertEquals("SELECT '\\n'" + "\nFROM dual;", SQLUtils.formatOdps(sql)); assertEquals("select '\\n'" + @@ -53,5 +50,4 @@ public class OdpsSelectTest15 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java index 29dfda72c..b156768fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest16.java @@ -15,20 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest16 extends TestCase { public void test_select() throws Exception { - String sql = "SELECT \"\\n\" FROM dual;";// + String sql = "SELECT \"\\n\" FROM dual;"; assertEquals("SELECT '\\n'" + "\nFROM dual;", SQLUtils.formatOdps(sql)); assertEquals("select '\\n'" + @@ -53,5 +50,4 @@ public class OdpsSelectTest16 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java index bdabe472a..4c3102949 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest17.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -40,7 +39,7 @@ public class OdpsSelectTest17 extends TestCase { " ORDER BY cnt DESC LIMIT 5\n" + ") top )\n" + "ORDER BY cnt DESC\n" + - "LIMIT 800";// + "LIMIT 800"; assertEquals("SELECT prov, name, cnt\n" + "FROM mock_app.adl_mock_v_fct\n" + "WHERE ds = 20160920\n" + @@ -95,5 +94,4 @@ public class OdpsSelectTest17 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java index 22004c3fb..04c35d7dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest18.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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 )";// + String sql = "select a, b, c from tableA where a in ( select a from tableB limit 10 )"; assertEquals("SELECT a, b, c\n" + "FROM tableA\n" + "WHERE a IN (\n" + @@ -61,5 +60,4 @@ public class OdpsSelectTest18 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java index a5810b207..ec4e7b06d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest19.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class OdpsSelectTest19 extends TestCase { byte[] bytes = new byte[8]; putLong(bytes, 0, 1095288847322L); // 1095288847322 - String sql = "select wm_concat(distinct ',', name) from mytable";// + String sql = "select wm_concat(distinct ',', name) from mytable"; assertEquals("SELECT wm_concat(DISTINCT ',', name)\n" + "FROM mytable", SQLUtils.formatOdps(sql)); assertEquals("select wm_concat(DISTINCT ',', name)\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java index e981f1c16..638b2f38e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest2.java @@ -17,11 +17,10 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static 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";// + 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"; assertEquals("SELECT user_id, user_flag, cat1_id, wireless_client_type, alipay_num\n" + "\t, last_buy_time, md5, my_udf_001('t_datax_odps2ots_resource_tcif_dmp_user_topup_d', md5) AS datax_pt\n" + "FROM mytable_001\n" + @@ -29,5 +28,4 @@ public class OdpsSelectTest2 extends TestCase { "DISTRIBUTE BY CAST(datax_pt AS BIGINT)\n" + "SORT BY md5, user_id, user_flag, cat1_id, wireless_client_type", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java index b5fdbba19..ad5daa4e6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest20.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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";// + String sql = "select * from a DISTRIBUTE BY b,c"; assertEquals("SELECT *\n" + "FROM a\n" + "DISTRIBUTE BY b, c", SQLUtils.formatOdps(sql)); @@ -54,5 +53,4 @@ public class OdpsSelectTest20 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java index c9e6b09c2..4186e8914 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest21.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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);";// + String sql = "select wm_concat(',', a) from values('abc', 1), (null, 2) t (a, i);"; assertEquals("SELECT wm_concat(',', a)\n" + "FROM (VALUES ('abc', 1), (NULL, 2)) AS t (a, i);", SQLUtils.formatOdps(sql)); assertEquals("select wm_concat(',', a)\n" + @@ -52,5 +51,4 @@ public class OdpsSelectTest21 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java index 95ddf6391..3b246d3f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest22.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -53,7 +52,7 @@ public class OdpsSelectTest22 extends TestCase { ") CLK on UT.ad_session = CLK.ad_session and UT.item_id = CLK.item_id\n" + "where UT.ad_clk > 0 or CLK.clk > 0\n" + ") A\n" + - "group by bucket_id;";// + "group by bucket_id;"; assertEquals("SELECT bucket_id, sum(pv) AS pv, sum(clk) AS clk\n" + "\t, sum(clk) / (sum(pv) + 1e-10) AS ctr\n" + "\t, sum(ut_ad_clk) AS ut_ad_clk, sum(ad_clk) AS ad_clk\n" + @@ -155,5 +154,4 @@ public class OdpsSelectTest22 extends TestCase { assertTrue(visitor.containsColumn("alimama_algo.fund_mlr_n_chicago_user_track_distinct_shark", "item_id")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java index 4d0462c5f..78f71836c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest23.java @@ -26,7 +26,7 @@ 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));";// + String sql = "select * FROM dual where 1 = 1 and (2 = 2 or ( 3 = 3 and 4 = 4));"; assertEquals("SELECT *\n" + "FROM dual\n" + "WHERE 1 = 1\n" + @@ -62,5 +62,4 @@ public class OdpsSelectTest23 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java index e57db0e89..4ec0033b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest24.java @@ -87,7 +87,7 @@ public class OdpsSelectTest24 extends TestCase { "WHERE t1.add_date = '${date_minus_1}'\n" + "\tOR t2.order_id IS NOT NULL\n" + "GROUP BY t1.member_id, \n" + - "\tt3.city_id";// + "\tt3.city_id"; assertEquals("SELECT ta.member_id AS member_id, ta.city_id\n" + "\t, COUNT(IF(ta.add_date = '${date_minus_1}', 1, NULL)) AS order_cnt\n" + "\t, COUNT(ta.is_open_order) AS open_order_cnt, COUNT(t1.is_normal_order) AS normal_order_cnt\n" + @@ -215,5 +215,4 @@ public class OdpsSelectTest24 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java index 85129c067..3052916d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest25.java @@ -56,7 +56,7 @@ public class OdpsSelectTest25 extends TestCase { "WHERE NOT (tt.os = 'all'\n" + " AND tt.ver <> 'all')\n" + "GROUP BY tt.os,\n" + - " tt.ver;";// + " tt.ver;"; assertEquals("INSERT OVERWRITE TABLE ids_openapp_dau_d PARTITION (dt='${lastday}')\n" + "SELECT tt.os, tt.ver, count(1) AS tt_user\n" + "\t, sum(tt.tt_cnt) AS tt_cnt\n" + @@ -143,5 +143,4 @@ public class OdpsSelectTest25 extends TestCase { assertTrue(visitor.containsColumn("openapp_log_d", "utype")); assertTrue(visitor.containsColumn("openapp_log_d", "dt")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java index 1e58499f4..7614f8af5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest26.java @@ -32,7 +32,7 @@ public class OdpsSelectTest26 extends TestCase { " ds='20170706' and value6='MOBILE_TB' and value1 REGEXP '^00'\n" + " and process in('preCheckMobile','VerifyScrollCheckcode','SendMobileCheckcode','VerifyMobile',\n" + " 'VerifyMobileCheckCode','VerifyNick','VerifyPasswordFormat','register','CheckMobileConflict','VerifyEmail') \n" + - " group by process,value5";// + " group by process,value5"; assertEquals("SELECT count(DISTINCT (trackid)) AS total, process, value5 AS result\n" + "FROM havanaapp.s_register_process_log\n" + "WHERE ds = '20170706'\n" + @@ -94,5 +94,4 @@ public class OdpsSelectTest26 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java index 96555f21d..92060dc78 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest27.java @@ -27,7 +27,7 @@ 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" + - "from bigdata_xy.dual;";// + "from bigdata_xy.dual;"; assertEquals("SELECT CASE\n" + "\t\tWHEN aaa < 0.1 THEN 2\n" + "\t\tELSE 1\n" + @@ -61,5 +61,4 @@ public class OdpsSelectTest27 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java index bb3df8041..fa3afc6d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest28.java @@ -27,7 +27,7 @@ public class OdpsSelectTest28 extends TestCase { public void test_select() throws Exception { // 1095288847322 String sql = "-- 注释\n" + - "read bigdata_xy.dual 10;";// + "read bigdata_xy.dual 10;"; assertEquals("-- 注释\n" + "READ bigdata_xy.dual 10;", SQLUtils.formatOdps(sql)); @@ -55,5 +55,4 @@ public class OdpsSelectTest28 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java index fdbc1bf49..563c9dd00 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest29.java @@ -30,7 +30,7 @@ public class OdpsSelectTest29 extends TestCase { "SELECT *\n" + "--hhhhh\n" + "FROM emp e\n" + - "LEFT OUTER JOIN emp_datahub";// + "LEFT OUTER JOIN emp_datahub"; assertEquals("-- aaaaa\n" + "SELECT * -- hhhhh\n" + "FROM emp e\n" + @@ -62,5 +62,4 @@ public class OdpsSelectTest29 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java index b750cacad..9364b2451 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest3.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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";// + String sql = "select RANK() OVER (PARTITION BY ui ORDER BY duration DESC) rank from dual"; assertEquals("SELECT RANK() OVER (PARTITION BY ui ORDER BY duration DESC) AS rank" + "\nFROM dual", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java index 06c576f5a..0a9545835 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest30.java @@ -26,7 +26,7 @@ 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;";// + String sql = "select a/100.0 from dual where 1=1;"; assertEquals("SELECT a / 100.0\n" + "FROM dual\n" + "WHERE 1 = 1;", SQLUtils.formatOdps(sql)); @@ -56,5 +56,4 @@ public class OdpsSelectTest30 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java index d9d684c32..99272d87b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest31.java @@ -26,7 +26,7 @@ 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;";// + String sql = " select a, b, c from tdl_${bizdate} where 1=1;"; assertEquals("SELECT a, b, c\n" + "FROM tdl_${bizdate}\n" + "WHERE 1 = 1;", SQLUtils.formatOdps(sql)); @@ -56,5 +56,4 @@ public class OdpsSelectTest31 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java index dcbb64ca2..a06b145df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest32.java @@ -26,7 +26,7 @@ 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;";// + String sql = "SELECT * from mytable1 a LEFT SEMI JOIN mytable2 b on a.id=b.id;"; assertEquals("SELECT *\n" + "FROM mytable1 a\n" + "LEFT SEMI JOIN mytable2 b\n" + @@ -58,5 +58,4 @@ public class OdpsSelectTest32 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java index 88ebab344..8954fcacc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest33.java @@ -26,7 +26,7 @@ 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;";// + String sql = "SELECT * from mytable1 a LEFT ANTI JOIN mytable2 b on a.id=b.id;"; assertEquals("SELECT *\n" + "FROM mytable1 a\n" + "LEFT ANTI JOIN mytable2 b\n" + @@ -58,5 +58,4 @@ public class OdpsSelectTest33 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java index 0ca8a8aee..ba25bf003 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest34.java @@ -31,7 +31,7 @@ public class OdpsSelectTest34 extends TestCase { "where status = 'PUBLISHED'\n" + "and model_id = 4419\n" + "and abs(datediff(licensed_date, '2013-07-01 00:00:00', 'mm')) <= 5\n" + - "and abs(mileage - 7.01) < 3;";// + "and abs(mileage - 7.01) < 3;"; assertEquals("SELECT a.city, a.car_id, a.rrc_id, a.brand, a.car_series\n" + "\t, a.title\n" + "FROM dw_x001_cp_used_car_detail a\n" + @@ -69,5 +69,4 @@ public class OdpsSelectTest34 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java index 04d0a981e..081ca43af 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest35.java @@ -31,7 +31,7 @@ public class OdpsSelectTest35 extends TestCase { "FROM dw_x001_cp_used_car_detail a\n" + "WHERE status = 'PUBLISHED'\n" + " AND model_id = 4419\n" + - " AND abs(datediff(licensed_date, '2013-07-01 00:00:00', 'mm')) <= 5;";// + " AND abs(datediff(licensed_date, '2013-07-01 00:00:00', 'mm')) <= 5;"; assertEquals("SELECT a.city, a.car_id, a.rrc_id, a.brand, a.car_series\n" + "\t, a.title\n" + "FROM dw_x001_cp_used_car_detail a\n" + @@ -67,5 +67,4 @@ public class OdpsSelectTest35 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java index a0b02ff4a..1e497802a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest36.java @@ -31,7 +31,7 @@ public class OdpsSelectTest36 extends TestCase { "\tselect 1\n" + ") \n" + "union all\n" + - "select 2;";// + "select 2;"; assertEquals("SELECT *\n" + "FROM (\n" + "\tSELECT 1\n" + @@ -67,5 +67,4 @@ public class OdpsSelectTest36 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest37.java index 758226c9c..f56225891 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest37.java @@ -58,5 +58,4 @@ public class OdpsSelectTest37 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest38.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest38.java index 1d372c083..c60862c0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest38.java @@ -58,5 +58,4 @@ public class OdpsSelectTest38 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java index 10cb80059..a67a98bea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest4.java @@ -17,17 +17,16 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import junit.framework.TestCase; -import static 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";// + String sql = "select total_day_cnt * EXP(-datediff(to_date('20150819', 'yyyymmdd'), last_time, 'dd') / 60) from dual"; assertEquals("SELECT total_day_cnt * EXP(-datediff(TO_DATE('20150819', 'yyyymmdd'), last_time, 'dd') / 60)\n" + "FROM dual", SQLUtils.formatOdps(sql)); } public void test_distribute_by_lcase() throws Exception { - String sql = "select total_day_cnt * EXP(-datediff(to_date('20150819', 'yyyymmdd'), last_time, 'dd') / 60) from dual";// + String sql = "select total_day_cnt * EXP(-datediff(to_date('20150819', 'yyyymmdd'), last_time, 'dd') / 60) from dual"; assertEquals("select total_day_cnt * EXP(-datediff(to_date('20150819', 'yyyymmdd'), last_time, 'dd') / 60)\n" + "from dual", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java index 6548b4d68..72dbc1373 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest5.java @@ -15,19 +15,15 @@ */ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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') ";// + String sql = "select * from t where ds='20160303' and hour in ('18') "; assertEquals("SELECT *" + "\nFROM t" + "\nWHERE ds = '20160303'" + "\n\tAND hour IN ('18')", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java index 0b09a8e08..8bd293b74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest6.java @@ -15,20 +15,17 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest6 extends TestCase { public void test_select() throws Exception { - String sql = "select true from abc";// + String sql = "select true from abc"; assertEquals("SELECT true" + "\nFROM abc", SQLUtils.formatOdps(sql)); assertEquals("select true" @@ -51,5 +48,4 @@ public class OdpsSelectTest6 extends TestCase { assertEquals(0, visitor.getColumns().size()); assertEquals(0, visitor.getConditions().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java index 36fffa6d4..f0c55279f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest7.java @@ -15,21 +15,18 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest7 extends TestCase { public void test_select() throws Exception { - String sql = "select name as close from abc";// + String sql = "select name as close from abc"; assertEquals("SELECT name AS close" + "\nFROM abc", SQLUtils.formatOdps(sql)); assertEquals("select name as close" @@ -54,5 +51,4 @@ public class OdpsSelectTest7 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java index ce508a6f4..39e5e49d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest8.java @@ -15,21 +15,18 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest8 extends TestCase { public void test_select() throws Exception { - String sql = "select * from (select * from abc limit 1) a;";// + String sql = "select * from (select * from abc limit 1) a;"; assertEquals("SELECT *" + "\nFROM (" + "\n\tSELECT *" @@ -62,5 +59,4 @@ public class OdpsSelectTest8 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("abc", "*"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java index 64d891dde..fe537d630 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest9.java @@ -15,21 +15,18 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class OdpsSelectTest9 extends TestCase { public void test_select() throws Exception { - String sql = "select name as cross from abc";// + String sql = "select name as cross from abc"; assertEquals("SELECT name AS cross" + "\nFROM abc", SQLUtils.formatOdps(sql)); assertEquals("select name as cross" @@ -54,5 +51,4 @@ public class OdpsSelectTest9 extends TestCase { assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java index 524aca694..996cb272c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_mapjoin.java @@ -15,10 +15,7 @@ */ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - import junit.framework.TestCase; public class OdpsSelectTest_mapjoin extends TestCase { @@ -35,5 +32,4 @@ public class OdpsSelectTest_mapjoin extends TestCase { "ON a.shop_name = b.shop_name\n" + "\tAND b.ds = '20150101';", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java index 970b45f88..f7c11babb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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";// + 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)); assertEquals("select sum(c) over (order by ds rows 9999 preceding) as s, ds\n" + @@ -51,5 +50,4 @@ public class OdpsSelectTest_over_rows extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java index d80e22d43..4cc54ba1d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -31,7 +30,7 @@ public class OdpsSelectTest_over_rows_1 extends TestCase { " OVER (PARTITION BY department_id ORDER BY hire_date\n" + " RANGE BETWEEN 365 PRECEDING AND 365 FOLLOWING) department_total\n" + " from employee\n" + - " order by department_id, hire_date;";// + " order by department_id, hire_date;"; assertEquals("SELECT last_name, first_name, department_id, hire_date, salary\n" + "\t, SUM(salary) OVER (PARTITION BY department_id ORDER BY hire_date RANGE BETWEEN 365 PRECEDING AND 365 FOLLOWING) AS department_total\n" + "FROM employee\n" + @@ -62,5 +61,4 @@ public class OdpsSelectTest_over_rows_1 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java index 0ae4c33e5..2e0c1de57 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class OdpsSelectTest_over_rows_2 extends TestCase { " RANGE 90 PRECEDING) department_total\n" + " from employee\n" + " order by department_id, hire_date;\n" + - "";// + ""; assertEquals("SELECT last_name, first_name, department_id, hire_date, salary\n" + "\t, SUM(salary) OVER (PARTITION BY department_id ORDER BY last_name, \n" + "\t\tfirst_name RANGE 90 PRECEDING) AS department_total\n" + @@ -65,5 +64,4 @@ public class OdpsSelectTest_over_rows_2 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java index 10005e321..b33aa5274 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_3.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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";// + String sql = "SELECT sum(c) over(order by ds rows current row) s, ds FROM t1"; assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS CURRENT ROW) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); assertEquals("select sum(c) over (order by ds rows current row) as s, ds\n" + @@ -51,5 +50,4 @@ public class OdpsSelectTest_over_rows_3 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java index 567f84aa2..1eebfe044 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_4.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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";// + String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED PRECEDING) s, ds FROM t1"; assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED PRECEDING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); assertEquals("select sum(c) over (order by ds rows unbounded preceding) as s, ds\n" + @@ -51,5 +50,4 @@ public class OdpsSelectTest_over_rows_4 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java index a719b59fe..4c2da36be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelectTest_over_rows_5.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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";// + String sql = "SELECT sum(c) over(order by ds rows UNBOUNDED following) s, ds FROM t1"; assertEquals("SELECT sum(c) OVER (ORDER BY ds ROWS UNBOUNDED FOLLOWING) AS s, ds\n" + "FROM t1", SQLUtils.formatOdps(sql)); assertEquals("select sum(c) over (order by ds rows unbounded following) as s, ds\n" + @@ -51,5 +50,4 @@ public class OdpsSelectTest_over_rows_5 extends TestCase { // assertTrue(visitor.getColumns().contains(new Column("abc", "name"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java index d6501daaf..5bda547d5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSelect_distribute_by_Test.java @@ -15,23 +15,20 @@ */ package com.alibaba.druid.bvt.sql.odps; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; - -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; public class OdpsSelect_distribute_by_Test extends TestCase { public void test_0() throws Exception { @@ -85,5 +82,4 @@ public class OdpsSelect_distribute_by_Test extends TestCase { assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java index 954bc10bd..6f742739f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsSetLabelTest extends TestCase { public void test_odps() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java index f621c2b8c..47a1c5ad6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsSetLabelTest2.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsSetLabelTest2 extends TestCase { public void test_odps() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java index 85597e3d8..83582f481 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowGrantsTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsShowGrantsTest extends TestCase { public void test_0() throws Exception { @@ -29,5 +26,4 @@ public class OdpsShowGrantsTest extends TestCase { //System.out.println(output); assertEquals("SHOW GRANTS FOR aliyun$DXP_XXXX@aliyun.com ON TYPE table", output); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java index 9439e9584..4c9077047 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowPartitionsTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsShowPartitionsTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java index 83b960e62..16e56eab6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowStatisticTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsShowStatisticTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java index 1da7963aa..e00ec9d6a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsShowTablesTest0.java @@ -1,13 +1,10 @@ package com.alibaba.druid.bvt.sql.odps; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OdpsShowTablesTest0 extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java index 6761305af..24120083e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDFTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.odps; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; - 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"; - assertEquals("SELECT secods:ip_region('192.168.1.1', 'city')" // + assertEquals("SELECT secods:ip_region('192.168.1.1', 'city')" + "\nFROM dual", SQLUtils.formatOdps(sql)); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java index 990d7b500..603efcc11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsUDTFTest.java @@ -1,16 +1,13 @@ package com.alibaba.druid.bvt.sql.odps; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OdpsUDTFTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsWhoamiTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsWhoamiTest.java index e4a49ab98..bbe5bb766 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsWhoamiTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsWhoamiTest.java @@ -17,16 +17,14 @@ package com.alibaba.druid.bvt.sql.odps; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; public class OdpsWhoamiTest extends TestCase { public void test_select() throws Exception { - String sql = "WHOAMI";// + String sql = "WHOAMI"; assertEquals("WHOAMI", SQLUtils.formatOdps(sql)); assertEquals("whoami", SQLUtils.formatOdps(sql, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); @@ -34,5 +32,4 @@ public class OdpsWhoamiTest extends TestCase { SQLStatement stmt = statementList.get(0); assertEquals("WHOAMI", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4933.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4933.java index fbfb3331a..de2a691e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4933.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4933.java @@ -21,7 +21,7 @@ public class Issue4933 extends TestCase { SQLUtils.acceptTableSource( sql, DbType.odps, - e -> tables.add(((SQLExprTableSource)e).getTableName()), + e -> tables.add(((SQLExprTableSource) e).getTableName()), e -> e instanceof SQLExprTableSource ); assertTrue(tables.contains("src")); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4992.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4992.java index b1c5e1b77..f72e5f70a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4992.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue4992.java @@ -6,7 +6,8 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; public class Issue4992 { @Test diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue5791.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue5791.java index 5b5dfce8b..f8c8bbfa7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue5791.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/issues/Issue5791.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.odps.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -17,7 +16,6 @@ import static org.junit.Assert.assertTrue; * @see Issue来源 */ public class Issue5791 { - @Test public void test_parse_comment() { for (DbType dbType : new DbType[]{ @@ -31,7 +29,6 @@ public class Issue5791 { // DbType.hive, DbType.dm, DbType.kingbase, DbType.gaussdb }) { - for (String sql : new String[]{ "select a -- C1\n" + "from -- C2\n" diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java index fa259958d..ba9bf9980 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportColumnsTest0.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.odps.udf; import com.alibaba.druid.support.opds.udf.ExportColumns; - import junit.framework.TestCase; public class ExportColumnsTest0 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java index 092f0c246..25b321521 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.odps.udf; import com.alibaba.druid.support.opds.udf.ExportSelectListColumns; - import junit.framework.TestCase; public class ExportSelectListColumnsTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java index 9641c7f23..e48245eb0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/odps/udf/ExportSelectListColumnsTest2.java @@ -1,9 +1,6 @@ package com.alibaba.druid.bvt.sql.odps.udf; -import static org.junit.Assert.*; - import com.alibaba.druid.support.opds.udf.ExportSelectListColumns; - import junit.framework.TestCase; public class ExportSelectListColumnsTest2 extends TestCase { @@ -17,6 +14,5 @@ public class ExportSelectListColumnsTest2 extends TestCase { String text = udf.evaluate(sql, "odps"); assertEquals("fund_base_cv_ad_auction_ocr_pv_tfs.*", text); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java index 1595e301e..7407e5237 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CallTest.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class CallTest extends TestCase { public void test_select() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java index dfda21c02..6d9c44986 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class CursorTest extends TestCase { public void test_cursor() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java index 84a62c3ed..aa327b64d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup; -import com.alibaba.druid.sql.parser.SQLParserFeature; -import static org.junit.Assert.*; -import junit.framework.TestCase; - 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.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.parser.SQLParserFeature; +import junit.framework.TestCase; public class LargeOrTest extends TestCase { public void test_largeOr() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java index f0d6bfce2..73c4aeff9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java @@ -15,11 +15,9 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import com.alibaba.druid.DbType; -import junit.framework.TestCase; - import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class MergeTest extends TestCase { public void test_mergeCall() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java index a710f4ca6..2fb64d6f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OracleAnalyticTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java index 430cfefd1..1147669ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleAnyTest extends TestCase { public void test_any() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java index 5fd1645ec..7db22b4ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleCallTest extends OracleTest { public void test_0() throws Exception { String sql = "call ORACLE_OCM.MGMT_CONFIG.collect_config ( )"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java index f8de0fd68..54dbd7b96 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleCallTest2 extends OracleTest { public void test_0() throws Exception { String sql = "{?= call FUNC_QUERY_DEPT(?,?)}"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java index 8e6796238..0e9ce34dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java @@ -15,20 +15,18 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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'" + // + 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'" + ")"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -57,5 +55,4 @@ public class OracleDeleteTest extends OracleTest { // assertTrue(visitor.containsColumn("employees", "salary")); // assertTrue(visitor.containsColumn("employees", "commission_pct")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java index 7469afc28..c04102291 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleDeleteTest_1 extends OracleTest { public void test_0() throws Exception { String sql = "delete fromm xx"; @@ -54,5 +52,4 @@ public class OracleDeleteTest_1 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java index 505cbe20d..f214e547e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_2.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.assertTrue; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -73,5 +70,4 @@ public class OracleDeleteTest_2 extends OracleTest { output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java index a8e346871..7cc93ea25 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest_3.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -60,5 +59,4 @@ public class OracleDeleteTest_3 extends OracleTest { output); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java index 3cd85d4f2..7430e10d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropDbLinkTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropDbLinkTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -62,5 +60,4 @@ public class OracleDropDbLinkTest extends OracleTest { assertEquals(0, visitor.getTables().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropFunctionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropFunctionTest.java index 079cb9e2a..087969bbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropFunctionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropFunctionTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java index db510e728..d38e375a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropIndexTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropIndexTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -44,6 +42,4 @@ public class OracleDropIndexTest extends OracleTest { assertEquals(0, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropPackageTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropPackageTest.java index 65073b2d3..8ba4e3b35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropPackageTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropPackageTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDropPackageStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -12,7 +11,6 @@ import java.util.List; * DROP PACKAGE Statement */ public class OracleDropPackageTest extends OracleTest { - public void test_0() throws Exception { String sql = "DROP PACKAGE TEST.PACK_TEST1"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java index a7d20f48e..2936833d8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java @@ -15,18 +15,15 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropSequenceTest extends OracleTest { public void test_types() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java index c8e7ba17f..273233f11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropTableTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -45,6 +43,4 @@ public class OracleDropTableTest extends OracleTest { assertEquals(1, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java index 68de10b2c..599eaacf7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTableTest2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropTableTest2 extends OracleTest { public void test_0() throws Exception { String sql = // @@ -45,6 +43,4 @@ public class OracleDropTableTest2 extends OracleTest { assertEquals(1, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java index 88a037d33..41b388c91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropTriggerTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropTriggerTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -45,6 +43,4 @@ public class OracleDropTriggerTest extends OracleTest { assertEquals(0, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java index 856b2eb67..9b7da2166 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropUserTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropUserTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -64,6 +62,4 @@ public class OracleDropUserTest extends OracleTest { assertEquals(0, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java index 1fbba6466..c3938bef2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropViewTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleDropViewTest extends OracleTest { public void test_0() throws Exception { String sql = // @@ -44,6 +42,4 @@ public class OracleDropViewTest extends OracleTest { assertEquals(1, visitor.getTables().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java index ddfc14a36..c2d06fe24 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleEXTRACTTest extends TestCase { public void test_Extract() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java index 354d84dc9..c7d560a1e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OracleEXTRACTTest2 extends TestCase { public void test_Extract() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java index d85cec24c..acf2c103b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleExplainTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java index 07e095f9c..c22e7dc7a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java @@ -15,25 +15,23 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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" + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java index aa013628c..fbcb9a06a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleExplainTest3 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java index f08e742f8..73f9b91c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleFlashbackQueryTest extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java index a49fd6ba5..84a424df7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleFlashbackQueryTest2 extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java index ad91ac746..6b7fc4949 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleFlashbackQueryTest3 extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java index e119a06b8..f92e2002e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest4.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OracleFlashbackQueryTest4 extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java index ac0a5f388..244ef283c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest.java @@ -15,9 +15,8 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; public class OracleFormatTest extends TestCase { public void test_formatOracle() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java index 8b224fbfa..d3bf9b455 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; public class OracleFormatTest2 extends TestCase { public void test_formatOracle() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java index d785b4966..0b05002a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleGrantTest extends OracleTest { public void test_0() throws Exception { String sql = "grant all on p4p_pro"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java index 1224764d1..122bcbff2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_1.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleGrantTest_1 extends OracleTest { public void test_0() throws Exception { String sql = "GRANT CREATE SESSION TO hr;"; @@ -37,7 +35,7 @@ public class OracleGrantTest_1 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("GRANT CREATE SESSION TO hr;",// + assertEquals("GRANT CREATE SESSION TO hr;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java index b081f0cf5..1987a51e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_2.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,15 +22,17 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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" // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -50,7 +48,7 @@ public class OracleGrantTest_2 extends OracleTest { + " QUERY REWRITE,"// + " GLOBAL QUERY REWRITE"// + " TO dw_manager"// - + " WITH ADMIN OPTION;",// + + " WITH ADMIN OPTION;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java index 90c597690..5fb63bc3e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_3.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleGrantTest_3 extends OracleTest { public void test_0() throws Exception { String sql = "GRANT INHERIT PRIVILEGES ON USER sh TO hr;"; @@ -37,7 +35,7 @@ public class OracleGrantTest_3 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("GRANT INHERIT PRIVILEGES ON USER sh TO hr;",// + assertEquals("GRANT INHERIT PRIVILEGES ON USER sh TO hr;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java index df53a65c5..24870c8b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_4.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,11 +22,13 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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" // + String sql = "GRANT REFERENCES (employee_id), " + + " UPDATE (employee_id, salary, commission_pct) " + + " ON hr.employees" + " TO oe; "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -40,9 +38,9 @@ public class OracleGrantTest_4 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("GRANT REFERENCES(employee_id),"// - + " UPDATE(employee_id, salary, commission_pct)"// - + " ON hr.employees TO oe;",// + assertEquals("GRANT REFERENCES(employee_id)," + + " UPDATE(employee_id, salary, commission_pct)" + + " ON hr.employees TO oe;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java index c8b271636..90741b86b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -35,7 +34,7 @@ public class OracleGrantTest_5 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("GRANT RESOURCE, CONNECT, CREATE VIEW, CREATE PROCEDURE, CREATE SEQUENCE TO DZFP_CX;",// + assertEquals("GRANT RESOURCE, CONNECT, CREATE VIEW, CREATE PROCEDURE, CREATE SEQUENCE TO DZFP_CX;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java index 0d4ed7dec..eea73bb74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleGroupingSetTest extends TestCase { public void test_interval() throws Exception { @@ -55,5 +53,4 @@ public class OracleGroupingSetTest extends TestCase { System.out.println(text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java index 681b06d41..525f96fe8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetsTest.java @@ -1,9 +1,5 @@ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -11,6 +7,8 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleGroupingSetsTest extends OracleTest { public void test_grouping_sets() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java index ca6c2e7b2..a9c674c29 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - import com.alibaba.druid.sql.PagerUtils; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.util.JdbcUtils; - -import static org.junit.Assert.*; - import junit.framework.TestCase; +import java.util.List; + 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'"; @@ -26,7 +23,6 @@ public class OracleHintTest extends TestCase { String newSQL = out.toString(); 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 { @@ -67,6 +63,4 @@ public class OracleHintTest extends TestCase { String formattedSql = SQLUtils.formatOracle(sql); assertEquals("DELETE /*+PARALLEL(semp, 5) */ FROM semp", formattedSql); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java index d39500767..d21887dd6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleIbatisSelectTest extends OracleTest { public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE F1 = #id# "; @@ -51,5 +49,4 @@ public class OracleIbatisSelectTest extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java index 303eb19b0..d53be822b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleIbatisSelectTest1 extends OracleTest { public void test_0() throws Exception { String sql = "SELECT * FROM T WHERE F1 = $id$"; @@ -51,5 +49,4 @@ public class OracleIbatisSelectTest1 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java index 6fe80fe18..b46042c78 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java @@ -15,13 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleIntervalTest extends TestCase { public void test_interval_literal() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java index 914a7cee5..5d98349b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java @@ -15,13 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleIsASetTest extends TestCase { public void test_is_a_set() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java index a1d4b0880..1bd57c61b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java @@ -15,13 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleIsEmptyTest extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java index 264f0bc99..d590546e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLexerTest.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - import com.alibaba.druid.sql.dialect.oracle.parser.OracleLexer; import com.alibaba.druid.sql.parser.Token; +import junit.framework.TestCase; public class OracleLexerTest extends TestCase { public void test_hint() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java index 8f338ce07..a0e0ea551 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest.java @@ -1,9 +1,5 @@ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -12,14 +8,16 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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" // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -38,7 +36,7 @@ public class OracleListAggTest extends OracleTest { "\tAND prod_id BETWEEN 15 AND 18\n" + "\tAND channel_id = 2\n" + "\tAND time_id > '01-JAN-01'\n" + - "GROUP BY prod_id;",// + "GROUP BY prod_id;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleListAggTest extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("sales", "cust_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("customers", "cust_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java index e628be8fb..13a108ae7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleListAggTest1.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.WallUtils; -import static org.junit.Assert.*; import java.util.List; @@ -49,7 +48,7 @@ public class OracleListAggTest1 extends OracleTest { "\t\t\tAND T2.IS_DELETED = 0\n" + "\t\tGROUP BY T.ID\n" + "\t) T1 ON T.ID = T1.ID \n" + - "WHERE t.IS_DELETED = 0",// + "WHERE t.IS_DELETED = 0", SQLUtils.toSQLString(stmt, dbType)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); @@ -71,5 +70,4 @@ public class OracleListAggTest1 extends OracleTest { WallUtils.isValidateOracle(sql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java index ba626359b..c8a80b6c0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java @@ -15,13 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleLiteralTest extends TestCase { public void test_oracle() throws Exception { @@ -53,5 +50,4 @@ public class OracleLiteralTest extends TestCase { System.out.println(text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java index cc0aca867..0a4b79649 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleLockTableTest1 extends OracleTest { public void test_0() throws Exception { String sql = "LOCK TABLE employees IN EXCLUSIVE MODE NOWAIT; "; @@ -51,5 +49,4 @@ public class OracleLockTableTest1 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java index a9b3144f0..23345b358 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleLockTableTest2 extends OracleTest { public void test_0() throws Exception { String sql = "LOCK TABLE employees@remote IN SHARE MODE"; @@ -51,5 +49,4 @@ public class OracleLockTableTest2 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java index 5aa65d27a..9b617a0f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest3.java @@ -18,11 +18,9 @@ package com.alibaba.druid.bvt.sql.oracle; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -53,5 +51,4 @@ public class OracleLockTableTest3 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java index d5f89e98b..aa0b37343 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest4.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleLockTableTest4 extends OracleTest { public void test_0() throws Exception { @@ -52,5 +51,4 @@ public class OracleLockTableTest4 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java index b65387f06..c2bebc121 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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)" + // + 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);"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -65,5 +63,4 @@ public class OracleMergeTest extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java index 143ae301b..362339686 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest10.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -58,5 +57,4 @@ public class OracleMergeTest10 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java index 5c5419890..1868dc7be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest11.java @@ -25,7 +25,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource; import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -88,5 +87,4 @@ public class OracleMergeTest11 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java index 0ddf4fc35..798fe8eef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java @@ -15,46 +15,44 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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$ " + // + 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\")"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -86,5 +84,4 @@ public class OracleMergeTest2 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java index e40cdf70c..251a3621c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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);"; @@ -33,7 +31,6 @@ public class OracleMergeTest3 extends OracleTest { List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - System.out.println(stmt); assertEquals(1, statementList.size()); @@ -60,5 +57,4 @@ public class OracleMergeTest3 extends OracleTest { // assertTrue(visitor.containsColumn("bonuses", "employee_id")); // assertTrue(visitor.containsColumn("bonuses", "bonus")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java index 9eceaf6ee..41eca3ec6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -57,5 +56,4 @@ public class OracleMergeTest4 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java index db79aa371..e67376e6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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" + // + 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)"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -61,5 +59,4 @@ public class OracleMergeTest5 extends OracleTest { assertTrue(visitor.containsColumn("MEMBER_LAST_LOGIN_HZ", "ID")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java index 208aad590..d00861946 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java @@ -15,24 +15,22 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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) " + // + 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) "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -65,5 +63,4 @@ public class OracleMergeTest6 extends OracleTest { assertTrue(visitor.containsColumn("console_stb_ipstatus", "id")); assertTrue(visitor.containsColumn("console_stb_ipstatus", "firsttime")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java index 244c3c977..349eceb77 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest7.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,19 +22,21 @@ import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import java.util.List; + 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, " + // + 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)"; SQLStatementParser parser = new OracleStatementParser(sql); @@ -64,5 +62,4 @@ public class OracleMergeTest7 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java index 2ae18b221..b073b78cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest8.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -26,11 +22,13 @@ import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; +import java.util.List; + 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 " // + String sql = "merge into (select * from T09_RULE_CAL_COUNT where data_dt = '20160328' and rule_type = '2') t " + "using (" - + " select cust_no,organ_key " // + + " select cust_no,organ_key " + " from (select t1.cust_no, t1.organ_key from t08_cust_result_c_mid t1 " + " union " + " (select t2.cust_no, t2.organ_key from t08_cust_result_i_mid t2)" @@ -66,5 +64,4 @@ public class OracleMergeTest8 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java index 2ec657d14..6cc8c3504 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest9.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -57,5 +56,4 @@ public class OracleMergeTest9 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "bonus"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java index 6291fa11c..5e186455c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java @@ -15,36 +15,34 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -81,7 +79,5 @@ public class OracleMultiInsertTest extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("sales_input_table", "sales_thu"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("sales_input_table", "sales_fri"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("sales_input_table", "sales_sat"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java index 924146a43..e5b7bbbb7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java @@ -15,27 +15,25 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -64,7 +62,5 @@ public class OracleMultiInsertTest2 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "order_total"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "sales_rep_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "customer_id"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java index 121c17d70..53561a960 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleNumberLiteralTest extends TestCase { public void test_number_literal() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java index 809847211..2fe6e39b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleOuterTest extends TestCase { public void test_oracle() throws Exception { @@ -39,5 +37,4 @@ public class OracleOuterTest extends TestCase { System.out.println(text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java index c196307d3..093f48d29 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OraclePivotClauseTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java index 97a950909..c30f508a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OraclePriorTest extends TestCase { public void test_oracle() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java index e62edeb9f..d393dc437 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java @@ -15,20 +15,18 @@ */ package com.alibaba.druid.bvt.sql.oracle; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.test.TestUtils; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import static org.junit.Assert.*; -import junit.framework.TestCase; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.test.TestUtils; -import com.alibaba.druid.util.Utils; -import com.alibaba.druid.util.JdbcUtils; - public class OracleSQLParserResourceTest extends TestCase { public void test_0() throws Exception { // for (int i = 0; i <= 53; ++i) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java index f99688739..dcd1c70b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class OracleSQLParserTest extends TestCase { - public void test_1() throws Exception { String sql = "SELECT employees_seq.nextval FROM DUAL;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java index a8145a962..5d38d282c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleSampleClauseTest extends TestCase { public void test_0() throws Exception { @@ -34,7 +32,6 @@ public class OracleSampleClauseTest extends TestCase { String text = TestUtils.outputOracle(stmt); assertEquals(expected, text); - } public void test_1() throws Exception { @@ -48,7 +45,5 @@ public class OracleSampleClauseTest extends TestCase { String text = TestUtils.outputOracle(stmt); assertEquals(expected, text); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java index 204cb5e43..642f58492 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; import com.alibaba.druid.sql.ast.SQLStatement; @@ -29,9 +24,12 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.stat.TableStat.Condition; +import java.util.ArrayList; +import java.util.List; + public class OracleSchemaStatVisitorTest extends OracleTest { public void test_0() throws Exception { - String sql = "SELECT id, name name from department d" + // + String sql = "SELECT id, name name from department d" + " WHERE d.id = ? order by name desc"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java index e1084407b..c330794a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleSetTransactionTest extends OracleTest { public void test_0() throws Exception { String sql = "set transaction name 'IGNORED_TRANS' "; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java index 0d4b2c003..67129536b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleSetTransactionTest2 extends OracleTest { public void test_0() throws Exception { String sql = "SET TRANSACTION READ ONLY NAME 'Toronto';"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java index be3a21840..322a125d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest3.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java index a2c240f8c..9fd9e407c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleSubqueryFactoringTest extends TestCase { public void test_interval() throws Exception { @@ -56,7 +54,5 @@ public class OracleSubqueryFactoringTest extends TestCase { String text = TestUtils.outputOracle(stmt); assertEquals(expected, text); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java index bf8c36a46..9338018ed 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleSubqueryFactoringTest2 extends TestCase { public void test_interval() throws Exception { @@ -62,5 +60,4 @@ public class OracleSubqueryFactoringTest2 extends TestCase { assertEquals(expected, text); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java index d5e1a1608..d2f0e9c5c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java @@ -15,12 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; +import junit.framework.TestCase; public class OracleTest2 extends TestCase { public void test_isEmpty() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java index 1d2f1ba20..a869a95df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleTruncateTableTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java index 083e1b655..7bb232960 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java @@ -15,22 +15,20 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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 " + // + String sql = "UPDATE table1 t_alias1 " + + " SET column = " + + " (SELECT expr " + + " FROM table2 t_alias2 " + " WHERE t_alias1.column = t_alias2.column); "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -58,5 +56,4 @@ public class OracleUpdateTest1 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "expr"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("table2", "column"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java index bf6490d23..d63bacbb0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest2.java @@ -15,31 +15,29 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleUpdateTest2 extends OracleTest { public void test_0() throws Exception { - String sql = "UPDATE wrh$_tempfile tfh " // - + " SET (snap_id, filename, tsname) =" // + 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"; // + + + " )" + + "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(); @@ -68,5 +66,4 @@ public class OracleUpdateTest2 extends OracleTest { assertTrue(visitor.containsColumn("ts$", "name")); assertTrue(visitor.containsColumn("v$tempfile", "ts#")); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java index bd94db15a..9b84ca431 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java @@ -15,26 +15,24 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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"; // + 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"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -59,5 +57,4 @@ public class OracleUpdateTest3 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("sys.col_usage$", "obj#"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("sys.col_usage$", "intcol#"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java index b7bcf2174..ee7b92ea0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java @@ -15,24 +15,22 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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"; // + + + "where obj# = :21 " + + "returning bhiboundval into :22"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -57,5 +55,4 @@ public class OracleUpdateTest4 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("tabpart$", "dataobj#"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("sys.col_usage$", "intcol#"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java index 8a9fa459d..94ffdb484 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest5_encoding_error.java @@ -44,7 +44,7 @@ public class OracleUpdateTest5_encoding_error extends OracleTest { "\tSELECT to_char(SYSDATE + INTERVAL '1' YEAR, 'yyyy-mm-dd HH24:mi:ss')\n" + "\tFROM dual\n" + "), 'yyyy-mm-dd HH24:mi:ss')\n" + - "WHERE t2.attr2 = 'ZB201708311440560'",// + "WHERE t2.attr2 = 'ZB201708311440560'", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -62,5 +62,4 @@ public class OracleUpdateTest5_encoding_error extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "start_time"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleXmlelementTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleXmlelementTest.java index d1456dba2..23f6ac7cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleXmlelementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleXmlelementTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java index 9f98eeda2..4ea183a05 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterFunctionTest0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -52,10 +51,10 @@ public class OracleAlterFunctionTest0 extends OracleTest { assertEquals(0, visitor.getColumns().size()); - assertEquals("ALTER FUNCTION \"ZEUS\".\"STRCAT\" REUSE SETTINGS;",// + assertEquals("ALTER FUNCTION \"ZEUS\".\"STRCAT\" REUSE SETTINGS;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); - assertEquals("alter function \"ZEUS\".\"STRCAT\" reuse settings;",// + assertEquals("alter function \"ZEUS\".\"STRCAT\" reuse settings;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java index fffb9df8c..1661dac55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest1.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterIndexTest1 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java index 68e559e3b..3153efa3e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterIndexTest2 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java index ff3ea3683..6384fa75d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest3.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterIndexTest3 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java index 7b97133b6..a43832822 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterIndexTest4.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterIndexTest4 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterPackageTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterPackageTest.java index 070652282..ca1ed941d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterPackageTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterPackageTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterPackageStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -12,7 +11,6 @@ import java.util.List; * ALTER PACKAGE Statement */ public class OracleAlterPackageTest extends OracleTest { - public void test_0() throws Exception { String sql = "ALTER PACKAGE TEST.PACK_TEST1 COMPILE"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java index 42562fcb1..4910e4b65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterProcedureTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java index 8d65f41f6..d0e98c34f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterProcedureTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterProcedureTest2 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java index cc60be705..53de3364b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSequence_0.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.Token; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OracleAlterSequence_0 extends TestCase { public void test_alter_seq_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java index e8320c22b..2fc7196e0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSessionTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterSessionTest extends OracleTest { public void test_0() throws Exception { String sql = "alter session set current_schema=retl"; @@ -50,5 +48,4 @@ public class OracleAlterSessionTest extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java index 95c608012..2d2c48fe3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterSynonymTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterSynonymTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java index 0db7a06ab..434e05ad5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java index 323de197d..e1f989cad 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest10.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest10 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java index b967ccf76..c34f1bdb4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest11.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest11 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java index 0346a38ba..b958be89d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest12.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest12 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java index 9332e3066..c1337c876 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest13.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest13 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java index ec1a2c841..1b2bba2a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest14.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest14 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java index ef579d8b5..d9961812c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest15.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest15 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java index 5dbcbbe08..079e3307a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest16.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest16 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java index a22d63242..714696cdf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest17.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest17 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java index 995980268..d36da3644 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest18.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest18 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java index 43621c9f9..caa91ee1a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest19.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,10 +23,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleAlterTableTest19 extends OracleTest { public void test_0() throws Exception { String sql = // - "ALTER TABLE warehouses" // + "ALTER TABLE warehouses" + " ADD CONSTRAINT wh_unq UNIQUE (warehouse_id, warehouse_name)"// + " USING INDEX PCTFREE 5"// + " EXCEPTIONS INTO wrong_id;"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java index 29d6b3816..3aaaf361d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest2.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest2 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java index e028aa2e5..2bcff8582 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest20.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,10 +23,12 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleAlterTableTest20 extends OracleTest { public void test_0() throws Exception { String sql = // - "ALTER TABLE sales " // + "ALTER TABLE sales " + " ADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE; "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -49,7 +47,7 @@ public class OracleAlterTableTest20 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE sales" // + assertEquals("ALTER TABLE sales" + "\n\tADD CONSTRAINT sales_pk PRIMARY KEY (prod_id, cust_id) DISABLE;", // SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java index 681f46226..3e3981f94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest21.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleAlterTableTest21 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java index 53b0f6137..9ffa55952 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest22.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,11 +23,13 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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)" // + "ALTER TABLE employees ADD CONSTRAINT check_comp " + + " CHECK (salary + (commission_pct*salary) <= 5000)" + " DISABLE;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -50,7 +48,7 @@ public class OracleAlterTableTest22 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("ALTER TABLE employees" // + assertEquals("ALTER TABLE employees" + "\n\tADD CONSTRAINT check_comp CHECK (salary + (commission_pct * salary) <= 5000) DISABLE;", // SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java index d149758ec..3c3a29288 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest24.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java index 8b5736e9e..bf4ce6ff9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest25_drop_pk.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class OracleAlterTableTest25_drop_pk extends TestCase { public void test_alter_constraint() throws Exception { @@ -46,5 +45,4 @@ public class OracleAlterTableTest25_drop_pk extends TestCase { assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest26.java index 0b109a9d5..a3b30f1a7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest26.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -178,7 +177,6 @@ public class OracleAlterTableTest26 extends OracleTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("customers"))); } - public void test_7() throws Exception { String sql = "create table \"JUNYU_ORCL\".\"KBS_QUESTION\"(\n" + " \"ID\" number(19, 0) not null,\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java index 1ded5a8fa..1e5c51f87 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest3.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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" // - + ") " + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java index 22bd33a89..38a62c182 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest4.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest4 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java index 5c8f112e2..cd0cc16e3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest5.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest5 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java index 3a473d3e6..989bdb95f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest6.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest6 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java index 8e59a756d..5142db8da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest7.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest7 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java index 0f6124429..c7d4fbc91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest8.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest8 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java index fe33aca87..c6832d4a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest9.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTest9 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java index 4044d63dd..5658ffe60 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTestRename.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleAlterTableTestRename extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java index 8ae7c71f4..7ae93dfb2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTableTest_drop_constraint.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; public class OracleAlterTableTest_drop_constraint extends TestCase { public void test_alter_constraint() throws Exception { @@ -43,11 +39,10 @@ public class OracleAlterTableTest_drop_constraint extends TestCase { System.out.println("orderBy : " + visitor.getOrderByColumns()); String output = SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE); - assertEquals("ALTER TABLE TUSER" + // + assertEquals("ALTER TABLE TUSER" + "\n\tDROP CONSTRAINT UK_084c17821a8f47e8b31fbb126b6", output); assertEquals(1, visitor.getTables().size()); assertEquals(0, visitor.getColumns().size()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java index 5bc2235e4..f0f842dbb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTablespaceTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterTablespaceTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java index ddf000506..94bb48e7e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterTriggerTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java index eeeb62c4b..7e6595fac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTriggerTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterTriggerTest2 extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java index b04fc3161..0f963d819 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterTypeTest0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -52,10 +51,10 @@ public class OracleAlterTypeTest0 extends OracleTest { assertEquals(0, visitor.getColumns().size()); - assertEquals("ALTER TYPE \"ZEUS\".\"STRCAT_TYPE\" COMPILE BODY REUSE SETTINGS;",// + assertEquals("ALTER TYPE \"ZEUS\".\"STRCAT_TYPE\" COMPILE BODY REUSE SETTINGS;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); - assertEquals("alter type \"ZEUS\".\"STRCAT_TYPE\" compile body reuse settings;",// + assertEquals("alter type \"ZEUS\".\"STRCAT_TYPE\" compile body reuse settings;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); // assertTrue(visitor.getColumns().contains(new TableStat.Column("pivot_table", "*"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java index 5be8f273b..3fde31308 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/alter/OracleAlterViewTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.alter; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleAlterViewTest extends OracleTest { public void test_0() throws Exception { String sql = // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java index 1ef545add..7f41f91b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java index ae7178d94..a52a49abf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest1.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java index 4023e5219..5fbda07bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest10.java @@ -15,28 +15,26 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java index d45a71ef8..0870ec85f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest11.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleBlockTest11 extends OracleTest { public void test_0() throws Exception { String sql = "DROP TABLE emp;" + @@ -52,7 +50,7 @@ public class OracleBlockTest11 extends OracleTest { " " + " COMMIT; -- releases locks\n" + " END LOOP;" + - "END;"; // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java index 9ea76aa7d..034f8c5e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest12.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleBlockTest12 extends OracleTest { public void test_0() throws Exception { String sql = "DECLARE" + @@ -50,7 +48,7 @@ public class OracleBlockTest12 extends OracleTest { " WHEN DUP_VAL_ON_INDEX THEN" + " ROLLBACK;" + " DBMS_OUTPUT.PUT_LINE('Inserts were rolled back');" + - "END;"; // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java index f7c55a990..361db3d9f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest13.java @@ -15,46 +15,44 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java index 537b62b08..db8becd29 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest14.java @@ -15,47 +15,45 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java index 160816d2d..3cd907bef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest15.java @@ -18,11 +18,9 @@ package com.alibaba.druid.bvt.sql.oracle.block; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -41,7 +39,7 @@ public class OracleBlockTest15 extends OracleTest { " salary + bonus\n" + " WHERE employee_id = emp_id;\n" + " END IF;\n" + - " END;"; // + " END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java index 51fffd0a1..972857329 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest16.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleBlockTest16 extends OracleTest { public void test_0() throws Exception { @@ -46,7 +44,7 @@ public class OracleBlockTest16 extends OracleTest { " END LOOP outer_loop;\n" + " DBMS_OUTPUT.PUT_LINE\n" + " ('The sum of products equals: ' || TO_CHAR(s));\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java index 5e4175b94..d3f15ab85 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest17.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleBlockTest17 extends OracleTest { public void test_0() throws Exception { @@ -41,7 +40,7 @@ public class OracleBlockTest17 extends OracleTest { " END LOOP;\n" + " \n" + " DBMS_OUTPUT.PUT_LINE (' After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java index 389486bdc..f5a0e9b28 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest18.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleBlockTest18 extends OracleTest { public void test_0() throws Exception { @@ -46,7 +45,7 @@ public class OracleBlockTest18 extends OracleTest { " UPDATE employees\n" + " SET salary = salary + bonus \n" + " WHERE employee_id = emp_id;\n" + - " END p;"; // + " END p;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java index 5da9db71c..44e3a63f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest19.java @@ -19,11 +19,9 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleBlockTest19 extends OracleTest { public void test_0() throws Exception { @@ -34,7 +32,7 @@ public class OracleBlockTest19 extends OracleTest { " IF SQLCODE != -2289 THEN\n" + " RAISE;\n" + " END IF;\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java index 4b600fb0e..4b84024d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest2.java @@ -15,34 +15,32 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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; " + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java index 569868ed4..55ce1efb5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest20.java @@ -49,7 +49,7 @@ public class OracleBlockTest20 extends OracleTest { " EXECUTE IMMEDIATE 'DELETE FROM dept WHERE deptno = :num'\n" + " USING dept_id;\n" + " EXECUTE IMMEDIATE 'ALTER SESSION SET SQL_TRACE TRUE';\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java index d0a337b52..c417961bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest21.java @@ -36,7 +36,7 @@ public class OracleBlockTest21 extends OracleTest { " DBMS_OUTPUT.PUT_LINE('First name = ' || someone.first_name ||\n" + " ', Last name = ' || someone.last_name);\n" + " END LOOP;\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java index 3d8361b13..632699157 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest22_comment.java @@ -35,7 +35,7 @@ public class OracleBlockTest22_comment extends OracleTest { " FROM USER_OBJECTS\n" + " WHERE OBJECT_TYPE = 'TABLE'; -- Check number of tables\n" + " num_tables := howmany; -- Compute another value\n" + - "END;"; // + "END;"; List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, stmtList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java index 4d5a745d2..dd5ec9be6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest3.java @@ -15,27 +15,25 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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; " + // + 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; "; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java index e465835d4..5b42d6589 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest4.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + public class OracleBlockTest4 extends OracleTest { public void test_0() throws Exception { String sql = "DECLARE" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java index 13c355a31..8c0218ef4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest5.java @@ -15,34 +15,32 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; 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'" + // + + + " 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; " + // + + " rollback; " + "end;;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java index d8f1b99c5..2193ea46c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest6.java @@ -15,43 +15,41 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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; " + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java index acf55559b..b51bdabea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest7.java @@ -15,43 +15,41 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java index 7594ad829..89ea1d269 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest8.java @@ -15,43 +15,41 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java index b3c961465..d568a4914 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/block/OracleBlockTest9.java @@ -15,37 +15,35 @@ */ package com.alibaba.druid.bvt.sql.oracle.block; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java index e4284ad34..01095f74b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -62,7 +61,6 @@ public class OracleCreateDbLinkTest extends OracleTest { 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';"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java index bca608931..2f7224e33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateDbLinkTest1.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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)))'"; // + "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)))'"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java index 5bf5fc688..8d9152186 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_0.java @@ -58,7 +58,7 @@ public class OracleCreateFunctionTest_0 extends OracleTest { "\tFROM orders\n" + "\tWHERE customer_id = acc_no;\n" + "\tRETURN (acc_bal);\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java index 68b5feee7..74d51d6bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_1.java @@ -44,7 +44,7 @@ public class OracleCreateFunctionTest_1 extends OracleTest { "RETURN varchar2\n" + "PARALLEL_ENABLE\n" + "AGGREGATE\n" + - "USING strcat_type;",// + "USING strcat_type;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java index f2e82db5d..e3bd4a337 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_2.java @@ -41,7 +41,7 @@ public class OracleCreateFunctionTest_2 extends OracleTest { "\tp refcur_pkg.refcur_t\n" + ")\n" + "RETURN TickerTypeSetPIPELINED \n" + - "USING StockPivotImpl;",// + "USING StockPivotImpl;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java index df6992b4e..ad37c6544 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_3.java @@ -119,7 +119,7 @@ public class OracleCreateFunctionTest_3 extends OracleTest { "\t\tIF VALUECURSOR % ISOPEN THEN\n" + "\t\t\tCLOSE VALUECURSOR;\n" + "\t\tEND IF;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java index 97567133a..a154fafdf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_4.java @@ -99,7 +99,7 @@ public class OracleCreateFunctionTest_4 extends OracleTest { "\t\tEND IF;\n" + "\tEND IF;\n" + "\tRETURN T_STR;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java index f8df0d7a0..1f7e201a6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateFunctionTest_5.java @@ -81,7 +81,7 @@ public class OracleCreateFunctionTest_5 extends OracleTest { "e1Yq3QQJoEoNKIeJlbgLoLdSgogwgxDcf8vWfHSKbuowFOXFKoj9MqYGqWyRxeeCUVqNVIO1\n" + "ICqJa3yPr6e7z8GZpMH3J0Cx0uQ0B1JuysymdNDlzfTvb7QWsrLU4jGs3h8Mm49/L9nyO4Xh\n" + "Ae06nawFpOJIAYpBf9wBVC+ZrjU/nuEtokBqCce6HWIoF6rYgz0V0W/47x5KpOnQ2i7X3kFe\n" + - "FR8K7jT7X58k8xK9uYlZv5LhV71a7A==",// + "FR8K7jT7X58k8xK9uYlZv5LhV71a7A==", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java index 01c8b94fa..98c98fe66 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java index e63ca5910..2fe2a9957 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest10_function.java @@ -44,8 +44,8 @@ public class OracleCreateIndexTest10_function extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX upper_ix ON employees(UPPER(last_name));" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX upper_ix ON employees(UPPER(last_name));", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java index cb920fcfd..0bdde34e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest11.java @@ -110,8 +110,8 @@ public class OracleCreateIndexTest11 extends OracleTest { "\t\tSUBPARTITION pq4003 TABLESPACE tbs_03,\n" + "\t\tSUBPARTITION pq4004 TABLESPACE tbs_03\n" + "\t)\n" + - ");" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + ");", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java index 7626ebbc8..811e0a2be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest12.java @@ -62,8 +62,8 @@ public class OracleCreateIndexTest12 extends OracleTest { "\tPARTITION ix_p4,\n" + "\tPARTITION ix_p5\n" + "\t\tTABLESPACE tbs_04\n" + - ");" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + ");", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java index 0e2630ab9..3ecd21a74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest13.java @@ -45,8 +45,8 @@ public class OracleCreateIndexTest13 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE UNIQUE INDEX nested_tab_ix ON textdocs_nestedtab(NESTED_TABLE_ID, document_typ);" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE UNIQUE INDEX nested_tab_ix ON textdocs_nestedtab(NESTED_TABLE_ID, document_typ);", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java index 1d3cadccc..da038ba01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest14.java @@ -45,8 +45,8 @@ public class OracleCreateIndexTest14 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX salary_i ON books(TREAT (author AS employee_t).salary);" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX salary_i ON books(TREAT (author AS employee_t).salary);", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java index e0155d13b..ff00e2820 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest15.java @@ -45,8 +45,8 @@ public class OracleCreateIndexTest15 extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals("CREATE INDEX idx_t12 ON t1(id)\n" + - "TABLESPACE users ONLINE;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + "TABLESPACE users ONLINE;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java index ad0f5a335..03de39f31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest16_local.java @@ -44,8 +44,8 @@ public class OracleCreateIndexTest16_local extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX dbobjs_idx ON dbobjs(created) LOCAL" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX dbobjs_idx ON dbobjs(created) LOCAL", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java index d0d1342ad..d76dce606 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest17_global.java @@ -44,8 +44,8 @@ public class OracleCreateIndexTest17_global extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX dbobjs_idx ON dbobjs(created) GLOBAL" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX dbobjs_idx ON dbobjs(created) GLOBAL", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java index a8976e443..0771322f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest18_global.java @@ -53,8 +53,8 @@ public class OracleCreateIndexTest18_global extends OracleTest { "\tPARTITION p1 VALUES LESS THAN (1000),\n" + "\tPARTITION p2 VALUES LESS THAN (2500),\n" + "\tPARTITION p3 VALUES LESS THAN (MAXVALUE)\n" + - ");" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + ");", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java index 400a555bc..95604a367 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_global.java @@ -47,8 +47,8 @@ public class OracleCreateIndexTest19_global extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals("CREATE INDEX cust_last_name_ix ON customers(cust_last_name)\n" + - "GLOBAL PARTITION BY HASH (cust_last_name) PARTITIONS 4;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + "GLOBAL PARTITION BY HASH (cust_last_name) PARTITIONS 4;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java index afca3bca2..0da7ac661 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest19_local_store.java @@ -45,8 +45,8 @@ public class OracleCreateIndexTest19_local_store extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX prod_idx ON hash_products(product_id) LOCAL STORE IN (tbs_01, tbs_02);" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX prod_idx ON hash_products(product_id) LOCAL STORE IN (tbs_01, tbs_02);", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java index 68c55cabd..0c130443f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest2.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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\") " + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java index 9c8044239..be71777da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest20.java @@ -44,8 +44,8 @@ public class OracleCreateIndexTest20 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE INDEX idx_id ON t2(id) LOCAL;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE INDEX idx_id ON t2(id) LOCAL;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java index 840703ce7..0559dab17 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest21.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -65,12 +64,11 @@ public class OracleCreateIndexTest21 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + ")", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(1, visitor.getTables().size()); assertEquals(2, visitor.getColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java index 48493954c..fcdd73109 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java index 58fe1da3b..57e2cba5a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest4.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 " // + " 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java index dd9656295..cca7ce818 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateIndexTest5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java index d8e87e01d..74d68469f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest0.java @@ -55,7 +55,7 @@ public class OracleCreateMaterializedViewTest0 extends OracleTest { "FROM invoice\n" + "WHERE invoice_date < CURRENT_DATE\n" + "GROUP BY seller_no, invoice_date\n" + - "ORDER BY seller_no, invoice_date;",// + "ORDER BY seller_no, invoice_date;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java index 31591a385..11c95de28 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest1.java @@ -52,7 +52,7 @@ public class OracleCreateMaterializedViewTest1 extends OracleTest { "FROM times t, products p, sales s\n" + "WHERE t.time_id = s.time_id\n" + "\tAND p.prod_id = s.prod_id\n" + - "GROUP BY t.calendar_year, p.prod_id;",// + "GROUP BY t.calendar_year, p.prod_id;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java index e84610bb4..7c18234cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest2.java @@ -58,7 +58,7 @@ public class OracleCreateMaterializedViewTest2 extends OracleTest { "FROM times t, sales s, customers c\n" + "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;",// + "GROUP BY t.calendar_month_desc, c.cust_state_province;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java index c4a8ed0bf..36a30b85b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest3.java @@ -89,7 +89,7 @@ public class OracleCreateMaterializedViewTest3 extends OracleTest { "REFRESH FAST ON DEMAND\n" + "AS\n" + "SELECT *\n" + - "FROM atom.NONAUTO_CLAIM_FOLDER_T@IDS_44;",// + "FROM atom.NONAUTO_CLAIM_FOLDER_T@IDS_44;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java index 1cfbc59af..8eca87126 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateMaterializedViewTest4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; @@ -54,7 +53,7 @@ public class OracleCreateMaterializedViewTest4 extends OracleTest { "FROM times t, products p, sales s\n" + "WHERE t.time_id = s.time_id\n" + "\tAND p.prod_id = s.prod_id\n" + - "GROUP BY t.calendar_year, p.prod_id;",// + "GROUP BY t.calendar_year, p.prod_id;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java index c3f944e23..21f319a68 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -208,7 +207,7 @@ public class OracleCreatePackageTest0 extends OracleTest { "\t\t\tSET commission_pct = commission_pct + comm_incr;\n" + "\t\tEND IF;\n" + "\tEND;\n" + - "END emp_mgmt;",// + "END emp_mgmt;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java index cda488025..955598dfe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleCreatePackageTest1 extends OracleTest { public void test_types() throws Exception { @@ -47,7 +46,7 @@ public class OracleCreatePackageTest1 extends OracleTest { "\t\tMODULUS_ID_VALUE NUMBER\n" + "\t)\n" + "\t;\n" + - "END ACHIEVE_CONTRACT_SPECIMEN;",// + "END ACHIEVE_CONTRACT_SPECIMEN;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java index 9c535cceb..990befdf1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleCreatePackageTest2 extends OracleTest { public void test_types() throws Exception { @@ -56,7 +55,7 @@ public class OracleCreatePackageTest2 extends OracleTest { "\t\tprofitDate IN VARCHAR2\n" + "\t)\n" + "\t;\n" + - "END PKG_ECC_CAL_TASK_ACCOMPLISH;",// + "END PKG_ECC_CAL_TASK_ACCOMPLISH;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java index d2d003eb9..adcc99909 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest3.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleCreatePackageTest3 extends OracleTest { public void test_types() throws Exception { @@ -124,7 +123,7 @@ public class OracleCreatePackageTest3 extends OracleTest { "\t)\n" + "\tRETURN VARCHAR2\n" + "\t\n" + - "END Mail_fck_bpi;",// + "END Mail_fck_bpi;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java index 84796a820..02e22c45b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest4.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleCreatePackageTest4 extends OracleTest { public void test_types() throws Exception { @@ -118,7 +117,7 @@ public class OracleCreatePackageTest4 extends OracleTest { "\t\tIN_CALC_ID NUMBER\n" + "\t)\n" + "\t;\n" + - "END XON_CALC_RIGHT_PRICE_PKG;",// + "END XON_CALC_RIGHT_PRICE_PKG;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java index 77a7a2826..7d52fc8ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreatePackageTest5.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleCreatePackageTest5 extends OracleTest { public void test_types() throws Exception { @@ -71,7 +70,7 @@ public class OracleCreatePackageTest5 extends OracleTest { "\tBEGIN\n" + "\t\tRETURN;\n" + "\tEND;\n" + - "END cms_con_attributes_pkg;",// + "END cms_con_attributes_pkg;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java index 29e5091ef..0b4e83861 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,7 @@ public class OracleCreateProcedureTest1 extends OracleTest { "BEGIN" + " p(270);" + " p(400);" + - "END;"; // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -92,7 +91,7 @@ public class OracleCreateProcedureTest1 extends OracleTest { "BEGIN" + " p(270);" + " p(400);" + - "END;"; // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java index b643783ba..7f001670a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest2.java @@ -20,28 +20,27 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java index dd28fe42d..5c9b38619 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateProcedureTest3 extends OracleTest { " AND TRUNC(T.SENDREALTIME) = TRUNC(SYSDATE);\n" + " COMMIT;\n" + " END IF;\n" + - "END PRC_DEALSMS;"; // + "END PRC_DEALSMS;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java index 8c439dbc0..b6cd0a6ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest4.java @@ -164,7 +164,7 @@ public class OracleCreateProcedureTest4 extends OracleTest { " '???:' || in_loginname);\n" + " ROLLBACK;\n" + " RETURN;\n" + - "END;"; // + "END;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java index 8825312f4..9d75bf8e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest5.java @@ -33,7 +33,7 @@ public class OracleCreateProcedureTest5 extends OracleTest { OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); print(statementList); -System.out.println("statementList==="+statementList); +System.out.println("statementList===" + statementList); assertEquals(1, statementList.size()); SQLStatement stmt = (SQLStatement) statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java index 067cde2f2..c0417c0e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateProcedureTest7.java @@ -16,7 +16,6 @@ package com.alibaba.druid.bvt.sql.oracle.create; import com.alibaba.druid.sql.OracleTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; @@ -67,7 +66,6 @@ public class OracleCreateProcedureTest7 extends OracleTest { + "\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()); System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); @@ -76,10 +74,8 @@ public class OracleCreateProcedureTest7 extends OracleTest { assertEquals(2, visitor.getTables().size()); - assertEquals(17, visitor.getColumns().size()); assertEquals(6, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java index 31fa314cb..b00519e72 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest.java @@ -19,17 +19,16 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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" + // + "CREATE SEQUENCE customers_seq" + + " START WITH 1000" + + " INCREMENT BY 1" + + " NOCACHE" + " NOCYCLE;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java index d128aa0a3..5f8969177 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java index 22a678bb1..fc9856cbd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_1_bugfix.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java index 420c73734..f2b83cb89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateSequenceTest_2 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE SEQUENCE \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\" START WITH 1 INCREMENT BY 1 NOMAXVALUE MINVALUE 1",// + assertEquals("CREATE SEQUENCE \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\" START WITH 1 INCREMENT BY 1 NOMAXVALUE MINVALUE 1", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java index 44fa10d61..91caf7b34 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_3_cachevalue.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateSequenceTest_3_cachevalue extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" CACHE 2",// + assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" CACHE 2", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java index d172d0b7f..f540545c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_4_order.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateSequenceTest_4_order extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" ORDER",// + assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" ORDER", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java index 210621b91..c18228a32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_5_noorder.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateSequenceTest_5_noorder extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" NOORDER",// + assertEquals("CREATE SEQUENCE \"GJS_ZIXUN\".\"FINANCE_EXPLAIN_ID_GENERATOR\" NOORDER", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java index a3ac5ffbb..ea9b0c236 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSequenceTest_6_goto.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleCreateSequenceTest_6_goto extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE SEQUENCE GOTO.SEQ_GT_BUSINESS_CATEGORY START WITH 1 INCREMENT BY 1 MINVALUE 1",// + assertEquals("CREATE SEQUENCE GOTO.SEQ_GT_BUSINESS_CATEGORY START WITH 1 INCREMENT BY 1 MINVALUE 1", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java index 0ded8540f..20e256e48 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java index 27bcd8744..19435f14d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest1.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java index 16de4ca97..17d128e85 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest2.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java index b868e5017..38e9a636d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_0.java @@ -44,8 +44,8 @@ public class OracleCreateSynonymTest_0 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE PUBLIC SYNONYM emp_table FOR hr.employees@remote.us.oracle.com;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE PUBLIC SYNONYM emp_table FOR hr.employees@remote.us.oracle.com;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(0, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java index ca9f7578c..a29ceb8ff 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_1.java @@ -44,8 +44,8 @@ public class OracleCreateSynonymTest_1 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE SYNONYM offices FOR hr.locations;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE SYNONYM offices FOR hr.locations;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(0, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java index d289c5ce5..28fbfb5e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateSynonymTest_2.java @@ -43,8 +43,8 @@ public class OracleCreateSynonymTest_2 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("CREATE OR REPLACE SYNONYM CSCLIENT.ECC_CUST_AREA_INFO FOR ECC_CUST.ECC_CUST_AREA_INFO" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("CREATE OR REPLACE SYNONYM CSCLIENT.ECC_CUST_AREA_INFO FOR ECC_CUST.ECC_CUST_AREA_INFO", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(0, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableSpaceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableSpaceTest.java index 0ddfe0dfb..73ae3b0be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableSpaceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTableSpaceTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableSpaceStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import static org.junit.Assert.*; import java.util.List; @@ -12,7 +11,6 @@ import java.util.List; * CREATE TABLESPACE */ public class OracleCreateTableSpaceTest extends OracleTest { - // basic tablespace public void test_0() throws Exception { String sql = "CREATE TABLESPACE omf_ts1"; @@ -34,6 +32,4 @@ public class OracleCreateTableSpaceTest extends OracleTest { sql = "CREATE TABLESPACE tbs_01 DATAFILE 'tbs_f2.dbf' SIZE 40M ONLINE"; // parser need to update } - } - diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java index 0b8a9ffb8..d0c6eec91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleCreateTriggerTest extends OracleTest { public void test_0() throws Exception { String sql = // - "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " // + "CREATE TRIGGER \"AO_4AEACD_WEBHOOK_D367380484\" " + "BEFORE INSERT"// + " ON \"AO_4AEACD_WEBHOOK_DAO\" FOR EACH ROW "// + "BEGIN"// @@ -50,7 +49,7 @@ public class OracleCreateTriggerTest extends OracleTest { "\tSELECT \"AO_4AEACD_WEBHOOK_DAO_ID_SEQ\".NEXTVAL\n" + "\tINTO :NEW.\"ID\"\n" + "\tFROM DUAL;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java index 5c0da2ab6..3507c7a32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest2.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -54,7 +53,7 @@ public class OracleCreateTriggerTest2 extends OracleTest { "\t\tINTO :new.id\n" + "\t\tFROM dual;\n" + "\tEND IF;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java index f205d5d16..9ccb1fe3c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest3.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,7 @@ public class OracleCreateTriggerTest3 extends OracleTest { "\tON employees\n" + "\tFOR EACH ROW\n" + "\tWHEN (new.job_id <> 'AD_VP')\n" + - "CALL check_sal(:new.job_id, :new.salary, :new.last_name)",// + "CALL check_sal(:new.job_id, :new.salary, :new.last_name)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java index f41778c9b..0a8bdf20c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest4.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -60,7 +59,7 @@ public class OracleCreateTriggerTest4 extends OracleTest { "\tVALUES (:NEW.com_code, :NEW.CODE, :NEW.NAME, :NEW.status, :NEW.sjcode\n" + "\t\t, :NEW.isdept, :NEW.type, :NEW.selfcode, :NEW.POS, SYSDATE\n" + "\t\t, 'N', NULL, :NEW.deptsale);\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java index 1bd1bd70a..7487f7558 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest5.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -53,7 +52,7 @@ public class OracleCreateTriggerTest5 extends OracleTest { "\tSELECT XONN.GAPM_PROJECT_INFO_SYNC_IOA_S.NEXTVAL\n" + "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals("CREATE OR REPLACE TRIGGER XONN.GAPM_PROJECT_INFO_SYNC_IOA_t\n" + @@ -64,7 +63,7 @@ public class OracleCreateTriggerTest5 extends OracleTest { "\tSELECT XONN.GAPM_PROJECT_INFO_SYNC_IOA_S.NEXTVAL\n" + "\tINTO :New.PROJECT_SYN_ID\n" + "\tFROM dual;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.POSTGRESQL)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java index 90bfbeca3..c85797fb6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTriggerTest6.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -107,7 +106,7 @@ public class OracleCreateTriggerTest6 extends OracleTest { "\t\t\tWHERE XON_EPM.EPM_TB_CONTRACT_EX.NCONTRACTID = var_nContractID;\n" + "\t\tEND IF;\n" + "\tEND IF;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals("CREATE OR REPLACE TRIGGER XON_EPM.EPM_TG_FIRSTCHECK\n" + @@ -145,7 +144,7 @@ public class OracleCreateTriggerTest6 extends OracleTest { "\t\t\tWHERE XON_EPM.EPM_TB_CONTRACT_EX.NCONTRACTID = var_nContractID;\n" + "\t\tEND IF;\n" + "\tEND IF;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.POSTGRESQL)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java index 227c914cc..aac25ee66 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest0.java @@ -37,7 +37,7 @@ public class OracleCreateTypeTest0 extends OracleTest { " , credit_limit NUMBER(9,2)\n" + " , cust_email VARCHAR2(30)\n" + " , cust_orders ORDER_LIST_TYP\n" + - " ) ;"; // + " ) ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java index c9c87f99c..d36634937 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest1.java @@ -32,7 +32,7 @@ public class OracleCreateTypeTest1 extends OracleTest { " begin\n" + " cs_ctx := strcat_type( null );\n" + " return ODCIConst.Success;\n" + - " end;"; // + " end;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java index e0b3e46cf..85013cb32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest10.java @@ -62,7 +62,6 @@ public class OracleCreateTypeTest10 extends OracleTest { System.out.println(sql); - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -105,7 +104,7 @@ public class OracleCreateTypeTest10 extends OracleTest { "\t\tEND IF;\n" + "\t\tRETURN ODCIConst.Success;\n" + "\tEND;\n" + - "END",// + "END", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java index 59750ecd8..4ee3e41e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest11.java @@ -54,7 +54,6 @@ public class OracleCreateTypeTest11 extends OracleTest { System.out.println(sql); - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -81,7 +80,7 @@ public class OracleCreateTypeTest11 extends OracleTest { "\tBEGIN\n" + "\t\tRETURN r;\n" + "\tEND;\n" + - "END;",// + "END;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java index 816a7fb8b..11ede1e45 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest12.java @@ -53,7 +53,6 @@ public class OracleCreateTypeTest12 extends OracleTest { System.out.println(sql); - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -83,7 +82,7 @@ public class OracleCreateTypeTest12 extends OracleTest { "c4 ae\n" + "4YeykduDwWpKI7JeaWrDQ5SWiVgwg5n0dLhcWvou/6GX6rh0K6W/m8Ayy8xQjwlppZmB8L8z\n" + "vbLLUrKeK2fhZ1JJscqkTZ4s6sZ86o5CkZQ1+fmoCEHRnn2mVV986ixuyTCSREZA25hXQFfU\n" + - "W757xtr4B5ICysO43qOCpqYu0laZ;",// + "W757xtr4B5ICysO43qOCpqYu0laZ;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java index 9651d702e..c37d21c49 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest2.java @@ -37,7 +37,7 @@ public class OracleCreateTypeTest2 extends OracleTest { " , credit_limit NUMBER(9,2)\n" + " , cust_email VARCHAR2(30)\n" + " , cust_orders ORDER_LIST_TYP\n" + - " ) ;"; // + " ) ;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java index 2b459ec63..58014c65c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest3.java @@ -29,7 +29,7 @@ public class OracleCreateTypeTest3 extends OracleTest { "CREATE TYPE data_typ1 AS OBJECT \n" + " ( year NUMBER, \n" + " MEMBER FUNCTION prod(invent NUMBER) RETURN NUMBER \n" + - " ); "; // + " ); "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java index 09d707a96..cde2cf1fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest4.java @@ -27,7 +27,7 @@ public class OracleCreateTypeTest4 extends OracleTest { public void test_0() throws Exception { String sql = // "CREATE OR REPLACE TYPE cms_contract_config_obj_TABLE\n" + - "AS TABLE OF ECC_CPR.cms_contract_config_obj"; // + "AS TABLE OF ECC_CPR.cms_contract_config_obj"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java index 08c0f7bea..34f6533a9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest5.java @@ -54,7 +54,7 @@ public class OracleCreateTypeTest5 extends OracleTest { "\tcust_name varchar2(256), \n" + "\tcarriert_type varchar2(20), \n" + "\tdept_id number(10)\n" + - ") NOT FINAL INSTANTIABLE;",// + ") NOT FINAL INSTANTIABLE;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java index e6f586dc8..6559c7634 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest6.java @@ -36,7 +36,7 @@ public class OracleCreateTypeTest6 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE OR REPLACE TYPE \"VARRAY_DEPT_TYPE\" VARRAY (7000) OF NUMBER(10)",// + assertEquals("CREATE OR REPLACE TYPE \"VARRAY_DEPT_TYPE\" VARRAY (7000) OF NUMBER(10)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java index 39edea42b..a17bf33f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest7.java @@ -41,7 +41,7 @@ public class OracleCreateTypeTest7 extends OracleTest { assertEquals("CREATE OR REPLACE TYPE histogram_entry_type AUTHID CURRENT_USER AS OBJECT (\n" + "\tcount NUMBER, \n" + "\tvalue NUMBER(5)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java index afd252f06..b5ca409a1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest8.java @@ -123,7 +123,6 @@ public class OracleCreateTypeTest8 extends OracleTest { " ) RETURN NUMBER\n" + ");"; - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -142,7 +141,7 @@ public class OracleCreateTypeTest8 extends OracleTest { "\tSTATIC FUNCTION dmbanStartStub (sctx IN OUT dmbanimp, rws_ptr IN RAW, query_sequence IN CLOB, seqdb_cursor SYS_REFCURSOR, subsequence_from IN PLS_INTEGER, subsequence_to IN PLS_INTEGER, filter_low_complexity IN PLS_INTEGER, mask_lower_case IN PLS_INTEGER, expect_value IN NUMBER, open_gap_cost IN PLS_INTEGER, extend_gap_cost IN PLS_INTEGER, mismatch_cost IN PLS_INTEGER, match_reward IN PLS_INTEGER, word_size IN PLS_INTEGER, xdropoff IN PLS_INTEGER, final_x_dropoff IN PLS_INTEGER) RETURN NUMBER, \n" + "\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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java index fba14e381..3f0134c32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateTypeTest9.java @@ -41,7 +41,6 @@ public class OracleCreateTypeTest9 extends OracleTest { System.out.println(sql); - OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); @@ -59,7 +58,7 @@ public class OracleCreateTypeTest9 extends OracleTest { "\tfinalUsage2 varchar2(256), \n" + "\tsanctionedParty12 varchar2(256), \n" + "\tsanctionedParty22 varchar2(256)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java index f195cb8c1..eaf0a76f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateUserTest1.java @@ -26,7 +26,7 @@ import java.util.List; public class OracleCreateUserTest1 extends OracleTest { public void test_0() throws Exception { String sql = // - "create user DZFP_CX identified by oracle;"; // + "create user DZFP_CX identified by oracle;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java index 64fa2112c..5ad11c8c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest0.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -50,7 +49,7 @@ public class OracleCreateViewTest0 extends OracleTest { "AS\n" + "SELECT id, GROUP_ID, IND_BY_ALL, IND_BY_GROUP, OWNER_MEMBER_ID\n" + "\t, OWNER_MEMBER_SEQ, gmt_modified\n" + - "FROM DUAL",// + "FROM DUAL", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java index f49f1f7ce..714ddc9e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -161,7 +160,7 @@ public class OracleCreateViewTest1 extends OracleTest { "WHERE (v.service_type IN ('gs', 'cgs', 'hkgs', 'twgs')\n" + "\t\tOR (v.service_type = 'cnfm'\n" + "\t\t\tAND v.stage = 'new_order'))\n" + - "\tAND v.id = c.id",// + "\tAND v.id = c.id", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java index db1477087..0845909f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest10_with_read_only.java @@ -48,7 +48,7 @@ public class OracleCreateViewTest10_with_read_only extends OracleTest { "AS\n" + "SELECT cust_last_name, nls_language, credit_limit\n" + "FROM customers\n" + - "WITH READ ONLY;",// + "WITH READ ONLY;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java index 3958c2046..0c931378e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest12.java @@ -246,7 +246,7 @@ public class OracleCreateViewTest12 extends OracleTest { "\t\tWHERE ITEM.OSG_ITEM_ID = SYS_ITEM.OSG_ITEM_ID\n" + "\t\t\tAND ITEM.ENABLED_FLAG = 'Y')\n" + "\t) I ON M.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID \n" + - "WHERE item_quantity >= 0",// + "WHERE item_quantity >= 0", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java index 48c222ef8..dbec04256 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest13.java @@ -55,7 +55,7 @@ public class OracleCreateViewTest13 extends OracleTest { "WHERE rbi.rma_id > ?\n" + "\tAND rsi.e_rprsendid = ?\n" + "\tAND rsi.e_boardid IN (?)\n" + - "FOR UPDATE OF rbi.rma_id",// + "FOR UPDATE OF rbi.rma_id", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java index 150a4a178..ce7668656 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest14.java @@ -316,7 +316,7 @@ public class OracleCreateViewTest14 extends OracleTest { "FROM resaccount res, businessres bus\n" + "WHERE bus.reservation_id = res.reservation_id\n" + "\tAND (bus.confirm_status = '3'\n" + - "\t\tOR bus.confirm_status = '7')",// + "\t\tOR bus.confirm_status = '7')", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java index 18e14881f..a31b2728f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest15.java @@ -65,7 +65,7 @@ public class OracleCreateViewTest15 extends OracleTest { "\t\t, dbms_lob.substr(wmsys.wm_concat(explx || ': ' || expname) OVER (PARTITION BY prj_no ), 4000, 1) AS explst\n" + "\tFROM temp_exp\n" + ") b\n" + - "GROUP BY b.prj_no, explst",// + "GROUP BY b.prj_no, explst", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java index 8b35a0d97..cdb9a4517 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest16.java @@ -149,7 +149,7 @@ public class OracleCreateViewTest16 extends OracleTest { "\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\n" + - "WITH READ ONLY",// + "WITH READ ONLY", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java index 73145a076..a8947b5cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest17_dblink.java @@ -81,7 +81,7 @@ public class OracleCreateViewTest17_dblink extends OracleTest { "\tAND C.Hetonglx = B.SELECTVALUE\n" + "\tAND C.SHENQINGRIQI >= '2017-10-01'\n" + "\tAND C.SHENQINGRIQI <= '2017-12-31'\n" + - "GROUP BY B.SELECTNAME",// + "GROUP BY B.SELECTNAME", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java index 0c592db0c..e56f643f9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest18_with_check_option.java @@ -64,6 +64,5 @@ public class OracleCreateViewTest18_with_check_option extends OracleTest { assertEquals(1, visitor.getTables().size()); assertEquals(4, visitor.getColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java index f19f744c7..127f8a2c0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -94,7 +93,7 @@ public class OracleCreateViewTest2 extends OracleTest { "\t, keep_until\n" + "\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",// + "WHERE db.db_key = bs.db_key", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java index 261505796..9678a7708 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest3.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -102,7 +101,7 @@ public class OracleCreateViewTest3 extends OracleTest { "\t\tAND outer.dbinc_key = bdf.dbinc_key\n" + "\t\tAND outer.file# = file#\n" + "\t\tAND outer.stamp < bs.stamp\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java index 44635e34f..4c231a3d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest4.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -81,7 +80,7 @@ public class OracleCreateViewTest4 extends OracleTest { "\t\tAND a.SID = b.SID\n" + "\t\tAND b.TYPE IN ('TX', 'TM')\n" + ") a\n" + - "WHERE object_id = a.row_wait_obj#",// + "WHERE object_id = a.row_wait_obj#", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java index c8dda6f32..244299495 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest5.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -64,7 +63,7 @@ public class OracleCreateViewTest5 extends OracleTest { "\t, DECODE(locked_mode, 1, 'SELECT', 2, 'SELECT FOR UPDATE / LOCK ROW SHARE', 3, 'INSERT/UPDATE/DELETE/LOCK ROW EXCLUSIVE', 4, 'CREATE INDEX/LOCK SHARE', 5, 'LOCK SHARE ROW EXCLUSIVE', 6, 'ALTER TABLE/DROP TABLE/DROP INDEX/TRUNCATE TABLE/LOCK EXCLUSIVE') AS sql_actions\n" + "\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",// + "WHERE DO.object_id = lo.object_id", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java index d72a0eb82..f64958294 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest6.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -129,7 +128,7 @@ public class OracleCreateViewTest6 extends OracleTest { "\t, utl_raw.cast_to_raw(CONTRACT_ID) AS CONTRACT_ID, utl_raw.cast_to_raw(IS_RENEW_UPGRADE) AS IS_RENEW_UPGRADE\n" + "\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",// + "FROM TB_002", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java index a0589fd33..8a7304caf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest7.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -45,7 +44,7 @@ public class OracleCreateViewTest7 extends OracleTest { "AS\n" + "SELECT last_name, salary * 12 AS annual_salary\n" + "FROM employees\n" + - "WHERE department_id = 20;",// + "WHERE department_id = 20;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java index 92137191d..02f48c302 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest8.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -49,7 +48,7 @@ public class OracleCreateViewTest8 extends OracleTest { ")\n" + "AS\n" + "SELECT employee_id, last_name, email\n" + - "FROM employees;",// + "FROM employees;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java index 441fa538c..9b8835f0a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleCreateViewTest9_check_option.java @@ -50,7 +50,7 @@ public class OracleCreateViewTest9_check_option extends OracleTest { "WHERE job_id = 'PU_CLERK'\n" + "\tOR job_id = 'SH_CLERK'\n" + "\tOR job_id = 'ST_CLERK'\n" + - "WITH CHECK OPTION;",// + "WITH CHECK OPTION;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java index e26a17d1e..e88af1154 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropSynonymTest_0.java @@ -43,8 +43,8 @@ public class OracleDropSynonymTest_0 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("DROP PUBLIC SYNONYM customers;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("DROP PUBLIC SYNONYM customers;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(0, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java index f9e4eb0a3..419a5b059 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OracleDropTypeTest_0.java @@ -43,8 +43,8 @@ public class OracleDropTypeTest_0 extends OracleTest { System.out.println("relationships : " + visitor.getRelationships()); System.out.println("orderBy : " + visitor.getOrderByColumns()); - assertEquals("DROP TYPE dmcfck;" - , SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); + assertEquals("DROP TYPE dmcfck;", + SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); assertEquals(0, visitor.getTables().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java index 71e3c69b6..1d47fd278 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/create/OraclePipeRowStatementTest.java @@ -36,7 +36,7 @@ public class OraclePipeRowStatementTest extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("PIPE ROW(substr(p_string, v_start));",// + assertEquals("PIPE ROW(substr(p_string, v_start));", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java index 661101d63..1f7d29393 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest1.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java index 1a2e4624e..962f9263b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest10.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 " + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java index b80d71349..551a037b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest11.java @@ -20,46 +20,45 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java index 73858b432..55c349322 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest12.java @@ -20,28 +20,27 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java index 8cc7a886d..dab7a0b2d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest13.java @@ -20,21 +20,20 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java index a0e4a3cb7..fc1a8318e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest14.java @@ -22,26 +22,25 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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); @@ -51,19 +50,19 @@ public class OracleCreateTableTest14 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE T (" + // - "\n\tF1 CHAR(1)," + // - "\n\tF2 CHAR(1 BYTE)," + // - "\n\tF3 CHAR(1 CHAR)," + // - "\n\tF4 VARCHAR2(2)," + // - "\n\tF5 VARCHAR2(2 BYTE)," + // - "\n\tF6 VARCHAR2(2 CHAR)," + // - "\n\tF7 NCHAR(3 BYTE)," + // - "\n\tF8 NCHAR(3 CHAR)," + // - "\n\tF9 NCHAR(3)," + // - "\n\tF10 NVARCHAR2(4)," + // - "\n\tF11 NVARCHAR2(4 BYTE)," + // - "\n\tF12 NVARCHAR2(4 CHAR)" + // + assertEquals("CREATE TABLE T (" + + "\n\tF1 CHAR(1)," + + "\n\tF2 CHAR(1 BYTE)," + + "\n\tF3 CHAR(1 CHAR)," + + "\n\tF4 VARCHAR2(2)," + + "\n\tF5 VARCHAR2(2 BYTE)," + + "\n\tF6 VARCHAR2(2 CHAR)," + + "\n\tF7 NCHAR(3 BYTE)," + + "\n\tF8 NCHAR(3 CHAR)," + + "\n\tF9 NCHAR(3)," + + "\n\tF10 NVARCHAR2(4)," + + "\n\tF11 NVARCHAR2(4 BYTE)," + + "\n\tF12 NVARCHAR2(4 CHAR)" + "\n)", SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java index bb08ed33a..b37136b8f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest15.java @@ -28,13 +28,13 @@ 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); @@ -44,13 +44,13 @@ public class OracleCreateTableTest15 extends OracleTest { 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" + // + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java index a03fbd578..8ac8ac6fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest16.java @@ -22,20 +22,19 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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); @@ -45,13 +44,13 @@ public class OracleCreateTableTest16 extends OracleTest { assertEquals(1, statementList.size()); - 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)" + // + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java index 336c003b5..6d28335b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest17.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java index 414c33ead..108767395 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest18.java @@ -21,25 +21,24 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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" // + " 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java index 45c9a7818..049710a8e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest19.java @@ -21,30 +21,29 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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)" // + " 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java index cd781373a..8208cf2f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest2.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java index 7c6e17de9..b0912c81f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest20.java @@ -21,29 +21,28 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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" // + " 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); @@ -84,7 +83,7 @@ public class OracleCreateTableTest20 extends OracleTest { "\tCHUNK 8192\n" + "\tNOCACHE\n" + "\tKEEP_DUPLICATES\n" + - ");",// + ");", SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java index e673f2762..d706db5be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest21.java @@ -22,17 +22,16 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleCreateTableTest21 extends OracleTest { public void test_types() throws Exception { String sql = // - "CREATE TABLE divisions " // - + " (div_no NUMBER(2), " // + "CREATE TABLE divisions " + + " (div_no NUMBER(2), " + " div_name VARCHAR2(14), "// - + " location VARCHAR2(13) ) " // + + " location VARCHAR2(13) ) " + " STORAGE ( INITIAL 8M MAXSIZE 1G );"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -50,7 +49,7 @@ public class OracleCreateTableTest21 extends OracleTest { "STORAGE (\n" + "\tINITIAL 8M\n" + "\tMAXSIZE 1G\n" + - ");",// + ");", SQLUtils.toSQLString(statement, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java index e3cc278a5..44985fc71 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest22.java @@ -22,14 +22,13 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleCreateTableTest22 extends OracleTest { public void test_types() throws Exception { String sql = // - "CREATE TABLE promotions_var2" // + "CREATE TABLE promotions_var2" + " ( promo_id NUMBER(6)"// + " , promo_name VARCHAR2(20)"// + " , promo_category VARCHAR2(15)"// @@ -62,7 +61,7 @@ public class OracleCreateTableTest22 extends OracleTest { "\t\tSTORAGE (\n" + "\t\t\tINITIAL 8M\n" + "\t\t)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java index 2250d1c20..50bd39f65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest23.java @@ -22,21 +22,20 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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); @@ -46,15 +45,15 @@ public class OracleCreateTableTest23 extends OracleTest { assertEquals(1, statementList.size()); - 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);",// + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java index 7cc2390c5..1ac53c78b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest24.java @@ -22,20 +22,19 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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); @@ -45,15 +44,15 @@ public class OracleCreateTableTest24 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE locations_demo (" // + 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);",// + + "\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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java index fe63225cc..5f7b99142 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest25.java @@ -22,14 +22,13 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleCreateTableTest25 extends OracleTest { public void test_types() throws Exception { String sql = // - "CREATE TABLE locations_demo" // + "CREATE TABLE locations_demo" + " ( location_id NUMBER(4) "// + " , street_address VARCHAR2(40)"// + " , postal_code VARCHAR2(12)"// @@ -45,15 +44,15 @@ public class OracleCreateTableTest25 extends OracleTest { assertEquals(1, statementList.size()); - 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)," // + 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);",// + + "\n\tCONSTRAINT loc_id_pk PRIMARY KEY (location_id)" + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java index 2abfb5b59..dc31f396e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest26.java @@ -28,7 +28,7 @@ import java.util.List; public class OracleCreateTableTest26 extends OracleTest { public void test_types() throws Exception { String sql = // - "CREATE TABLE dept_20 " // + "CREATE TABLE dept_20 " + " (employee_id NUMBER(4), "// + " last_name VARCHAR2(10), "// + " job_id VARCHAR2(9), "// @@ -46,7 +46,7 @@ public class OracleCreateTableTest26 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE dept_20 (" // + assertEquals("CREATE TABLE dept_20 (" + "\n\temployee_id NUMBER(4),"// + "\n\tlast_name VARCHAR2(10),"// + "\n\tjob_id VARCHAR2(9),"// @@ -56,7 +56,7 @@ public class OracleCreateTableTest26 extends OracleTest { + "\n\tcommission_pct NUMBER(7, 2),"// + "\n\tdepartment_id"// + "\n\t\tCONSTRAINT fk_deptno REFERENCES departments (department_id)"// - + "\n);",// + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java index df82fd405..80b7977d6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest27.java @@ -22,24 +22,23 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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) " // + "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); @@ -60,7 +59,7 @@ public class OracleCreateTableTest27 extends OracleTest { "\tdepartment_id,\n" + "\tCONSTRAINT fk_deptno FOREIGN KEY (department_id)\n" + "\t\tREFERENCES departments (department_id)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java index 3db46cfcb..d224a9b6d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest28.java @@ -22,23 +22,22 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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')) " // + "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); @@ -48,14 +47,14 @@ public class OracleCreateTableTest28 extends OracleTest { assertEquals(1, statementList.size()); - 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);",// + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java index d833d401a..976868dc4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest29.java @@ -22,14 +22,13 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleCreateTableTest29 extends OracleTest { public void test_types() throws Exception { String sql = // - "CREATE TABLE dept_20" // + "CREATE TABLE dept_20" + " (employee_id NUMBER(4) PRIMARY KEY, "// + " last_name VARCHAR2(10), "// + " job_id VARCHAR2(9), "// @@ -46,16 +45,16 @@ public class OracleCreateTableTest29 extends OracleTest { assertEquals(1, statementList.size()); - 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);",// + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java index b5549093d..22e6e645d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest3.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java index f18532bf1..bff5c64bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest30.java @@ -22,25 +22,24 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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 " // + "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); @@ -50,18 +49,18 @@ public class OracleCreateTableTest30 extends OracleTest { assertEquals(1, statementList.size()); - 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);",// + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java index 9803b3a19..c533be422 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest31.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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 " // + "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); @@ -45,7 +44,7 @@ public class OracleCreateTableTest31 extends OracleTest { + "\n\tage INTEGER," + "\n\tCHECK (name.first_name IS NOT NULL" + "\n\t\tAND name.last_name IS NOT NULL)" - + "\n);",// + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java index 2108624f9..2986983ae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest32.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -38,10 +37,10 @@ public class OracleCreateTableTest32 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE games (" // - + "\n\tscores NUMBER" // - + "\n\t\tCHECK (scores >= 0)" // - + "\n);",// + assertEquals("CREATE TABLE games (" + + "\n\tscores NUMBER" + + "\n\t\tCHECK (scores >= 0)" + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java index aa9fde36c..449bc195e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest33.java @@ -22,15 +22,14 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; 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)" // + "CREATE TABLE games" + + " (scores NUMBER, CONSTRAINT unq_num UNIQUE (scores)" + " INITIALLY DEFERRED DEFERRABLE);"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -40,10 +39,10 @@ public class OracleCreateTableTest33 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE games (" // - + "\n\tscores NUMBER," // - + "\n\tCONSTRAINT unq_num UNIQUE (scores) INITIALLY DEFERRED DEFERRABLE" // - + "\n);",// + assertEquals("CREATE TABLE games (" + + "\n\tscores NUMBER," + + "\n\tCONSTRAINT unq_num UNIQUE (scores) INITIALLY DEFERRED DEFERRABLE" + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java index 0ff352751..9ecfabc6b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest34.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -41,7 +40,7 @@ public class OracleCreateTableTest34 extends OracleTest { assertEquals("CREATE TABLE long_tab ("// + "\n\tpic_id NUMBER,"// + "\n\tlong_pics LONG RAW"// - + "\n);",// + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java index 35c7715f8..1a1bf15bc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest35.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -38,11 +37,11 @@ public class OracleCreateTableTest35 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("CREATE TABLE sto_scandata_bak_2013_05_08_023000" // + assertEquals("CREATE TABLE sto_scandata_bak_2013_05_08_023000" + "\nAS"// + "\n(SELECT *"// + "\nFROM sto_scandata t"// - + "\nWHERE t.delflag = 1)",// + + "\nWHERE t.delflag = 1)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java index a3df04162..d89b5b77b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest36.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -99,7 +98,7 @@ public class OracleCreateTableTest36 extends OracleTest { + "\n\t)," + "\n\tPARTITION SALES_Q4_2000 VALUES LESS THAN (MAXVALUE)" + "\n\t\tSUBPARTITIONS 4" - + "\n);",// + + "\n);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java index 75b433168..824b006b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest37.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -73,7 +72,7 @@ public class OracleCreateTableTest37 extends OracleTest { + "\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);",// + + "\nSTORE IN (tbs_01, tbs_02, tbs_03, tbs_04);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java index 4f6099a96..8c8df8544 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest38.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -64,7 +63,7 @@ public class OracleCreateTableTest38 extends OracleTest { "\tPARTITION west VALUES ('AMERICA'),\n" + "\tPARTITION east VALUES ('INDIA'),\n" + "\tPARTITION rest VALUES (DEFAULT)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java index cdb6d6b71..3ca06bb9c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest39.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -53,7 +52,7 @@ public class OracleCreateTableTest39 extends OracleTest { ")\n" + "PARTITION BY RANGE (credit_limit) INTERVAL (1000) (\n" + "\tPARTITION p1 VALUES LESS THAN (5001)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java index ddd32b737..8ac1ab5f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest4.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java index c0a3f337f..2f84b28ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest40.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -71,7 +70,7 @@ public class OracleCreateTableTest40 extends OracleTest { "\tPARTITION p1 VALUES LESS THAN (1000),\n" + "\tPARTITION p2 VALUES LESS THAN (2500),\n" + "\tPARTITION p3 VALUES LESS THAN (MAXVALUE)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java index 551c730e1..828890c63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest41.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -139,7 +138,7 @@ public class OracleCreateTableTest41 extends OracleTest { "\tCHUNK 8192\n" + "\tNOCACHE\n" + "\tRETENTION\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java index 0f061d752..2ed9c0016 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest42.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -79,7 +78,7 @@ public class OracleCreateTableTest42 extends OracleTest { "MAXTRANS 255\n" + "NOCOMPRESS\n" + "LOGGING\n" + - "TABLESPACE \"USERS\"",// + "TABLESPACE \"USERS\"", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java index 10de68e24..e9b6b59ac 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest43.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -84,7 +83,7 @@ public class OracleCreateTableTest43 extends OracleTest { "\t\t\tFLASH_CACHE DEFAULT\n" + "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java index 79b3b262c..eaf1c406f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest44.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -134,7 +133,7 @@ public class OracleCreateTableTest44 extends OracleTest { "\tCHUNK 8192\n" + "\tNOCACHE\n" + "\tRETENTION\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java index 96ff78ad4..5eaedac31 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest45.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -80,7 +79,7 @@ public class OracleCreateTableTest45 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java index 3cebf7537..f51714018 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest46.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -100,7 +99,7 @@ public class OracleCreateTableTest46 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java index 29089807a..6d75b3d4c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest47.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -129,7 +128,7 @@ public class OracleCreateTableTest47 extends OracleTest { "\tENABLE STORAGE IN ROW\n" + "\tCHUNK 8192\n" + "\tNOCACHE\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java index 9c81d4ede..cf6921f01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest48.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -105,7 +104,7 @@ public class OracleCreateTableTest48 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java index 2a59c4b56..6793b634d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest49.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -236,7 +235,7 @@ public class OracleCreateTableTest49 extends OracleTest { "\t\t\tBUFFER_POOL DEFAULT\n" + "\t\t)\n" + "\t\tNOCOMPRESS\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java index 8816173a8..058b2dad5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java index 9f0535464..a6ec9ee30 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest50.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -280,7 +279,7 @@ public class OracleCreateTableTest50 extends OracleTest { "\t\tTABLESPACE \"APPDATA1M\",\n" + "\tPARTITION \"PRODUCT_HASH_P16\"\n" + "\t\tTABLESPACE \"APPDATA1M\"\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java index 6d95398ce..f4da8405a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest51.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -65,7 +64,7 @@ public class OracleCreateTableTest51 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java index ba544a5fe..1710bdc19 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest52.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -104,7 +103,7 @@ public class OracleCreateTableTest52 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java index b92f00cf4..1d8e9db3e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest53.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -108,7 +107,7 @@ public class OracleCreateTableTest53 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java index 3e56cb595..fb4673977 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest54.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -71,7 +70,7 @@ public class OracleCreateTableTest54 extends OracleTest { "\t\t)\n" + "\t\tLOCATION ('retl-table.cfg')\n" + "\t)\n" + - "\tREJECT LIMIT UNLIMITED",// + "\tREJECT LIMIT UNLIMITED", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java index 2631f3476..c10d91fc4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest55.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -85,7 +84,7 @@ public class OracleCreateTableTest55 extends OracleTest { "\tDISABLE STORAGE IN ROW\n" + "\tCHUNK 8192\n" + "\tNOCACHE\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java index 7b34212a3..1b93f3b5f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest56.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -102,7 +101,7 @@ public class OracleCreateTableTest56 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java index 6182bd535..bf5c4cb55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest57.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -181,7 +180,7 @@ public class OracleCreateTableTest57 extends OracleTest { "\t\tCOMPUTE STATISTICS\n" + "\t\tENABLE\n" + ")\n" + - "CLUSTER \"SEARCHTEST\".\"CLUSTER_PRODUCT_COMPANY_ID\" (\"COMPANY_ID\")",// + "CLUSTER \"SEARCHTEST\".\"CLUSTER_PRODUCT_COMPANY_ID\" (\"COMPANY_ID\")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java index 3898fcf6e..9da2133e5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest58.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -128,7 +127,7 @@ public class OracleCreateTableTest58 extends OracleTest { "\t\t\tFREELIST GROUPS 1\n" + "\t\t\tBUFFER_POOL DEFAULT\n" + "\t\t)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java index 0dd8e3b4f..1648a8238 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest59.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -83,7 +82,7 @@ public class OracleCreateTableTest59 extends OracleTest { "\t\tFLASH_CACHE DEFAULT\n" + "\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t)\n" + - "\tPCTTHRESHOLD 50",// + "\tPCTTHRESHOLD 50", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java index 15ff76063..a7c2baeee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest6.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java index d548130d1..66dfe226b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest60.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -72,7 +71,7 @@ public class OracleCreateTableTest60 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java index edf4d72f0..5a2653e79 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest61.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -147,7 +146,7 @@ public class OracleCreateTableTest61 extends OracleTest { "\tENABLE STORAGE IN ROW\n" + "\tCHUNK 8192\n" + "\tNOCACHE\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java index 05a81094d..46086e5c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest62.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -117,7 +116,7 @@ public class OracleCreateTableTest62 extends OracleTest { "\t\t\tFLASH_CACHE DEFAULT\n" + "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java index 7be1cde5d..bb4b43c91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest63.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -79,7 +78,7 @@ public class OracleCreateTableTest63 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java index ca4bb01ab..f092301dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest64.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -126,7 +125,7 @@ public class OracleCreateTableTest64 extends OracleTest { "\tCHUNK 8192\n" + "\tNOCACHE\n" + "\tRETENTION\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java index 02ce8d75f..f36676777 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest65.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -127,7 +126,7 @@ public class OracleCreateTableTest65 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java index 56a746dcb..086219ab0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest66.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -374,7 +373,7 @@ public class OracleCreateTableTest66 extends OracleTest { "\t\t\tFLASH_CACHE DEFAULT\n" + "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java index e240a23a0..0b0187375 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest67.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -51,7 +50,7 @@ public class OracleCreateTableTest67 extends OracleTest { "AS\n" + "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",// + "FROM duplications_index", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java index e6154d760..65c820be2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest68.java @@ -67,7 +67,7 @@ public class OracleCreateTableTest68 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java index 80f9578a8..f16af0eda 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest69.java @@ -54,7 +54,7 @@ public class OracleCreateTableTest69 extends OracleTest { "\t\tTABLESPACE HASH_TS02,\n" + "\tPARTITION PART03\n" + "\t\tTABLESPACE HASH_TS03\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java index be39c8c60..e785e34b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest7.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 )" + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java index 7e3d8fdca..8f4dcd0ef 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest70.java @@ -45,7 +45,7 @@ public class OracleCreateTableTest70 extends OracleTest { "PARTITION BY RANGE (c3) INTERVAL (numtoyminterval(1, 'month')) (\n" + "\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)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java index 890005969..c93f82228 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest71.java @@ -68,7 +68,7 @@ public class OracleCreateTableTest71 extends OracleTest { "\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t)\n" + "\tPCTTHRESHOLD 50\n" + - "MONITORING",// + "MONITORING", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java index 8baa8fbd8..11f89410c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest72.java @@ -60,7 +60,7 @@ public class OracleCreateTableTest72 extends OracleTest { "\t\"IS_FROM_MEMBER\" CHAR(1) NOT NULL ENABLE,\n" + "\t\"IS_JOIN\" CHAR(1) NOT NULL ENABLE\n" + ")\n" + - "ON COMMIT DELETE ROWS",// + "ON COMMIT DELETE ROWS", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java index ba8138917..f1e7dfe23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest74.java @@ -117,7 +117,7 @@ public class OracleCreateTableTest74 extends OracleTest { "\tCELL_FLASH_CACHE DEFAULT\n" + ")\n" + "PARALLEL\n" + - "CACHE",// + "CACHE", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java index 971de785c..b3d6a8f48 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest75.java @@ -116,7 +116,7 @@ public class OracleCreateTableTest75 extends OracleTest { "\tCACHE\n" + "\tRETENTION\n" + ")\n" + - "MONITORING",// + "MONITORING", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java index c1c23f02c..bd8a8cbcf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest76.java @@ -100,7 +100,7 @@ public class OracleCreateTableTest76 extends OracleTest { "\tFREELISTS 1\n" + "\tFREELIST GROUPS 1\n" + "\tBUFFER_POOL DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java index d358d10da..684fc6a9f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest77.java @@ -162,7 +162,7 @@ public class OracleCreateTableTest77 extends OracleTest { "\t\tWHERE ITEM.INVENTORY_ITEM_ID = P.INVENTORY_ITEM_ID\n" + "\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 ",// + "\t) I ON Mod.CONTRACT_MODULE_ID = I.CONTRACT_MODULE_ID ", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java index 6279870b0..dce9703d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest78.java @@ -145,7 +145,7 @@ public class OracleCreateTableTest78 extends OracleTest { "LEFT JOIN TCP_FND.TCP_FND_LOOKUP_CODE ON TCP_FND_LOOKUP_CODE.LOOKUP_TYPE = 'CONTRACT_TYPE'\n" + "\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 ",// + "\tAND TCP_FND_LOOKUP_CODE1.LOOKUP_CODE = EPM_TBL_CONTRACT.Contrctkind ", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java index ec779a5db..f7162c78f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest79.java @@ -47,7 +47,7 @@ public class OracleCreateTableTest79 extends OracleTest { "\tlanguage varchar(20),\n" + "\tcreated_at TIMESTAMP,\n" + "\tupdated_at TIMESTAMP\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java index 0726b85e6..df0482304 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest8.java @@ -20,23 +20,22 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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) " + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java index 8cb3b9b32..4a26443e1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest80.java @@ -43,7 +43,7 @@ public class OracleCreateTableTest80 extends OracleTest { "\tVALUE VARCHAR(400),\n" + "\tTYPE VARCHAR(20),\n" + "\tID VARCHAR(50)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java index d199fbba2..36206e7c6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest81.java @@ -41,7 +41,7 @@ public class OracleCreateTableTest81 extends OracleTest { "\tMACHINE VARCHAR(50),\n" + "\tCOMMENTS VARCHAR(100),\n" + "\tSCHEMA VARCHAR(20)\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java index c085c70cc..9f15171d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest82.java @@ -53,7 +53,7 @@ public class OracleCreateTableTest82 extends OracleTest { "\tWHAT VARCHAR(4000),\n" + "\tDBID DECIMAL(38),\n" + "\tCOLLECTION_TIME VARCHAR(19)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java index 0b1465d03..ed0b39c17 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest83.java @@ -62,7 +62,7 @@ public class OracleCreateTableTest83 extends OracleTest { "\tREPOSITORY_URL VARCHAR(512),\n" + "\tSERVICE_URL VARCHAR(512),\n" + "\tPRIMARY KEY (ID)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); stmt.renameColumn("ID", "FID"); @@ -81,7 +81,7 @@ public class OracleCreateTableTest83 extends OracleTest { "\tREPOSITORY_URL VARCHAR(512),\n" + "\tSERVICE_URL VARCHAR(512),\n" + "\tPRIMARY KEY (ID)\n" + - ");",// + ");", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java index efcf35d82..89a788a82 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest84.java @@ -151,7 +151,7 @@ public class OracleCreateTableTest84 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); stmt.renameColumn("ID", "FID"); @@ -226,7 +226,7 @@ public class OracleCreateTableTest84 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + - ")",// + ")", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); // // SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java index e514911d5..90470a913 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest85.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java index 6a86a7744..f3a3b49d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest86.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -57,7 +56,6 @@ public class OracleCreateTableTest86 extends OracleTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("subtotal_bill"))); assertEquals(8, visitor.getColumns().size()); - } public void test_1() throws Exception { @@ -91,6 +89,5 @@ public class OracleCreateTableTest86 extends OracleTest { assertTrue(visitor.getTables().containsKey(new TableStat.Name("subtotal_bill"))); assertEquals(8, visitor.getColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java index 1bf6d0eb6..09855e6c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest87.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -84,6 +83,5 @@ public class OracleCreateTableTest87 extends OracleTest { // assertTrue(visitor.getTables().containsKey(new TableStat.Name("subtotal_bill"))); // // assertEquals(8, visitor.getColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java index 3fc6b1a50..285b3f71b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest88.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -57,6 +56,5 @@ public class OracleCreateTableTest88 extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java index acc715c96..53a7274fa 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest89.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -242,6 +241,5 @@ public class OracleCreateTableTest89 extends OracleTest { System.out.println("orderBy : " + visitor.getOrderByColumns()); assertEquals(1, visitor.getTables().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java index fd5b06649..55936a735 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest9.java @@ -20,18 +20,17 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java index 5ebbf44d1..77f4fbecb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest90.java @@ -89,6 +89,5 @@ public class OracleCreateTableTest90 extends OracleTest { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java index ebe18cd7b..61c5e8e65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest91.java @@ -108,6 +108,5 @@ public class OracleCreateTableTest91 extends OracleTest { "\tFLASH_CACHE DEFAULT\n" + "\tCELL_FLASH_CACHE DEFAULT\n" + ")", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java index 8abcf978d..fc070aefc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest92.java @@ -343,6 +343,5 @@ public class OracleCreateTableTest92 extends OracleTest { "\t\t\tCELL_FLASH_CACHE DEFAULT\n" + "\t\t)\n" + ")", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java index 4899f13b4..a5f33f9fb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest93.java @@ -162,6 +162,5 @@ public class OracleCreateTableTest93 extends OracleTest { "\tCELL_FLASH_CACHE DEFAULT\n" + ")\n" + "XMLTYPE \"DOC_XML\" ALLOW NONSCHEMA DISALLOW ANYSCHEMA;", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java index 252bc71bf..f1bb058c2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest94.java @@ -216,6 +216,5 @@ public class OracleCreateTableTest94 extends OracleTest { "\tBUFFER_POOL DEFAULT\n" + ")\n" + "PARALLEL 8", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java index de16a6767..e54184787 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest95.java @@ -128,6 +128,5 @@ public class OracleCreateTableTest95 extends OracleTest { "\tCELL_FLASH_CACHE DEFAULT\n" + ")\n" + "XMLTYPE \"XMLDOC\"", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java index a14ff5dcb..0a7ccd9d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest96.java @@ -74,6 +74,5 @@ public class OracleCreateTableTest96 extends OracleTest { "NOCOMPRESS\n" + "LOGGING\n" + "TABLESPACE \"CAOBOHAHA_IAU\"", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java index 98b430bef..b6c95d319 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/createTable/OracleCreateTableTest97.java @@ -127,6 +127,5 @@ public class OracleCreateTableTest97 extends OracleTest { "\t\t\tNOCOMPRESS\n" + "\t)\n" + ");", stmt.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java index def6820c1..bade38c9f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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');"; @@ -50,6 +48,4 @@ public class OracleInsertTest extends OracleTest { // assertTrue(visitor.getFields().contains(new TableStat.Column("films", "producer_id"))); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java index f1ad456e8..698877e0e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest1.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class OracleInsertTest1 extends OracleTest { public void test_0() throws Exception { String sql = "INSERT INTO bonuses(employee_id)" + @@ -58,6 +56,4 @@ public class OracleInsertTest1 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "sales_rep_id"))); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java index db5c6eaf6..78e29dc65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest10.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest10 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO departments" // + String sql = "INSERT INTO departments" + " VALUES (280, 'Recreation', 121, 1700);"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -40,7 +38,7 @@ public class OracleInsertTest10 extends OracleTest { assertEquals(1, statementList.size()); assertEquals("INSERT INTO departments\n" + - "VALUES (280, 'Recreation', 121, 1700);",// + "VALUES (280, 'Recreation', 121, 1700);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleInsertTest10 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java index 166328955..d552ae2dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest11.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest11 extends OracleTest { public void test_0() throws Exception { String sql = "INSERT INTO departments" @@ -40,7 +38,7 @@ public class OracleInsertTest11 extends OracleTest { assertEquals(1, statementList.size()); assertEquals("INSERT INTO departments"// - + "\nVALUES (280, 'Recreation', DEFAULT, 1700);",// + + "\nVALUES (280, 'Recreation', DEFAULT, 1700);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleInsertTest11 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java index 3e085c7b5..577a8ffbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest12.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest12 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO employees (employee_id, last_name, email, " // + 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);"; @@ -41,11 +39,11 @@ public class OracleInsertTest12 extends OracleTest { assertEquals(1, statementList.size()); - 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);",// + 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)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -63,5 +61,4 @@ public class OracleInsertTest12 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java index cf4cd20c3..5b1fe354c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest13.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest13 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO bonuses" // + String sql = "INSERT INTO bonuses" + " SELECT employee_id, salary*1.1 "// + " FROM employees"// + " WHERE commission_pct > 0.25; "; @@ -41,10 +39,10 @@ public class OracleInsertTest13 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("INSERT INTO bonuses" // + assertEquals("INSERT INTO bonuses" + "\nSELECT employee_id, salary * 1.1"// + "\nFROM employees"// - + "\nWHERE commission_pct > 0.25;",// + + "\nWHERE commission_pct > 0.25;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -65,5 +63,4 @@ public class OracleInsertTest13 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java index 73699b22b..f8038f53d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest14.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest14 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO raises" // + 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;"; @@ -41,11 +39,11 @@ public class OracleInsertTest14 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("INSERT INTO raises" // + 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;",// + + "\nLOG ERRORS INTO errlog ('my_bad') REJECT LIMIT 10;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -66,5 +64,4 @@ public class OracleInsertTest14 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java index 8b3e89a9a..263a2e6f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest15.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest15 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO employees@remote" // + 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); "; @@ -41,10 +39,10 @@ public class OracleInsertTest15 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("INSERT INTO employees@remote" // + 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);",// + + "\n\t, 20);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -65,5 +63,4 @@ public class OracleInsertTest15 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java index fb2d6df08..0e6f7231c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest16.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,9 +23,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest16 extends OracleTest { public void test_0() throws Exception { - String sql = "INSERT INTO departments " // + String sql = "INSERT INTO departments " + " VALUES (departments_seq.nextval, 'Entertainment', 162, 1400); "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -39,8 +37,8 @@ public class OracleInsertTest16 extends OracleTest { assertEquals(1, statementList.size()); - assertEquals("INSERT INTO departments" // - + "\nVALUES (departments_seq.NEXTVAL, 'Entertainment', 162, 1400);",// + assertEquals("INSERT INTO departments" + + "\nVALUES (departments_seq.NEXTVAL, 'Entertainment', 162, 1400);", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleInsertTest16 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java index c104df15c..a7ef4fdb9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest17.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest17 extends OracleTest { public void test_0() throws Exception { String sql = "insert into sys_log(ID,EXCEPTION) values(?,?)"; @@ -39,7 +37,7 @@ public class OracleInsertTest17 extends OracleTest { assertEquals(1, statementList.size()); assertEquals("INSERT INTO sys_log (ID, EXCEPTION)" - + "\nVALUES (?, ?)",// + + "\nVALUES (?, ?)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleInsertTest17 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java index 71e84b51b..eabb8a816 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest18.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + public class OracleInsertTest18 extends OracleTest { public void test_0() throws Exception { String sql = "insert into sys_log(ID,\"EXCEPTION\") values(?,?)"; @@ -39,7 +37,7 @@ public class OracleInsertTest18 extends OracleTest { assertEquals(1, statementList.size()); assertEquals("INSERT INTO sys_log (ID, \"EXCEPTION\")" - + "\nVALUES (?, ?)",// + + "\nVALUES (?, ?)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -58,5 +56,4 @@ public class OracleInsertTest18 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "ID"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("sys_log", "EXCEPTION"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java index 437816c21..95efc05b3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest19.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -27,6 +23,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; +import java.util.List; + 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)" @@ -46,7 +44,7 @@ public class OracleInsertTest19 extends OracleTest { + "\nFROM DUAL)" + "\nUNION ALL" + "\n(SELECT ?, ?, ?, ?" - + "\nFROM DUAL)",// + + "\nFROM DUAL)", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -67,5 +65,4 @@ public class OracleInsertTest19 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "PRODUCT_ID"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("TB_DUOBAO_PARTICIPATE_NUMBER", "number_index"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java index bac887ffa..7f3cccd99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest2.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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) " + // + 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; "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -61,7 +59,7 @@ public class OracleInsertTest2 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "job_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); } - + public void test_1() throws Exception { String sql = "BEGIN\n" + "\tINSERT INTO employees (first_name, last_name, job_title)\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java index de9c13a26..a48dd1a04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest20_first.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -68,7 +67,7 @@ public class OracleInsertTest20_first extends OracleTest { "SELECT o.order_id AS oid, o.customer_id AS cid, o.order_total AS ottl, o.sales_rep_id AS sid, c.credit_limit AS cl\n" + "\t, c.cust_email AS cem\n" + "FROM orders o, customers c\n" + - "WHERE o.customer_id = c.customer_id;",// + "WHERE o.customer_id = c.customer_id;", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -86,5 +85,4 @@ public class OracleInsertTest20_first extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("orders", "customer_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java index 31b20d443..156932d5d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest21_encoding_error.java @@ -51,7 +51,7 @@ public class OracleInsertTest21_encoding_error extends OracleTest { "\t, to_date((\n" + "\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')",// + "\t), 'yyyy-mm-dd HH24:mi:ss'), '0', 'ZB20170831142805148890')", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -69,5 +69,4 @@ public class OracleInsertTest21_encoding_error extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("x1_use_agent", "ID"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java index 26657855b..e00f36dae 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest22.java @@ -82,7 +82,7 @@ public class OracleInsertTest22 extends OracleTest { ") T2\n" + "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))",// + "GROUP BY T1.AREA_ID, RTRIM(TO_CHAR(T2.PID))", SQLUtils.toSQLString(stmt, JdbcConstants.ORACLE)); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -102,5 +102,4 @@ public class OracleInsertTest22 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("MKTG_H_EXEC_RESULT_FACT", "THE_DATE"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java index d79a96028..0db9f6191 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest3.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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" + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -57,5 +55,4 @@ public class OracleInsertTest3 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java index a54ec7861..ae9b6a5b6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest4.java @@ -15,48 +15,46 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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 " @@ -94,5 +92,4 @@ public class OracleInsertTest4 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java index 3d9ecb2b9..1e1909320 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest5.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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_'"; @@ -53,5 +51,4 @@ public class OracleInsertTest5 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java index 473387b6c..718128c24 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest6.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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"; @@ -52,5 +50,4 @@ public class OracleInsertTest6 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java index 642095f7b..0f5aceb69 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest7.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import java.util.List; + 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"; @@ -53,5 +51,4 @@ public class OracleInsertTest7 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java index e2ec8d627..c3eea02da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest8.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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, " @@ -60,5 +58,4 @@ public class OracleInsertTest8 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java index 117baba3c..8187b7bc9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/insert/OracleInsertTest9.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.bvt.sql.oracle.insert; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; + 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\" " + // + 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\""; OracleStatementParser parser = new OracleStatementParser(sql); @@ -59,5 +57,4 @@ public class OracleInsertTest9 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("ZFJ_EN_CLICK", "P_M"))); // assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "commission_pct"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5241.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5241.java index 85bef1c9c..b77476539 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5241.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5241.java @@ -2,11 +2,8 @@ package com.alibaba.druid.bvt.sql.oracle.issues; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; - import org.junit.Test; -import static org.junit.Assert.assertTrue; - /** * 验证 Oracle union sql的问题 * @@ -14,7 +11,6 @@ import static org.junit.Assert.assertTrue; * @see Issue来源 */ public class Issue5241 { - @Test public void test_parse_union() throws Exception { for (DbType dbType : new DbType[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5267.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5267.java index 0f26d1cc1..edbac5fc2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5267.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5267.java @@ -5,7 +5,6 @@ import com.alibaba.druid.bvt.sql.mysql.issues.Issue5421; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -18,7 +17,6 @@ import static org.junit.Assert.assertTrue; * @see Oracle create type语法 */ public class Issue5267 { - @Test public void test_create_type() throws Exception { for (DbType dbType : new DbType[]{DbType.oracle}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5631.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5631.java index eb841762b..056122acb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5631.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5631.java @@ -5,7 +5,6 @@ import com.alibaba.druid.bvt.sql.mysql.issues.Issue5421; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -17,7 +16,6 @@ import static org.junit.Assert.assertTrue; * @see Issue来源 */ public class Issue5631 { - @Test public void test_merge_into() throws Exception { for (DbType dbType : new DbType[]{DbType.oracle}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5891.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5891.java index 64f7da494..e8877207c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5891.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5891.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.oracle.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see Comparison Conditions */ public class Issue5891 { - @Test public void test_parse_any() { for (DbType dbType : new DbType[]{DbType.oracle}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5966.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5966.java index d10478221..5a4ff22f5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5966.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/issues/Issue5966.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.oracle.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * */ public class Issue5966 { - @Test public void test_parse_select() { for (DbType dbType : new DbType[]{DbType.oracle, DbType.mysql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java index 7bb0de05c..298cec188 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_0 extends OracleTest { public void test_0() throws Exception { @@ -32,7 +31,7 @@ public class Oracle_pl_0 extends OracleTest { " DELETE FROM employees\n" + " WHERE employees.employee_id = remove_emp.employee_id;\n" + " tot_emps := tot_emps - 1;\n" + - " END;"; // + " END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java index 16967e1b4..71b8d78a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -52,7 +51,7 @@ public class Oracle_pl_1 extends OracleTest { " \n" + " COMMIT;\n" + " DBMS_OUTPUT.PUT_LINE (emp_first_name || ' ' || emp_last_name);\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(3, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java index 162d1d690..1c42d8d07 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_2.java @@ -22,13 +22,12 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; 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;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java index bdd5dfb33..ef799fef3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_3.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_3 extends OracleTest { public void test_0() throws Exception { @@ -55,7 +54,7 @@ public class Oracle_pl_3 extends OracleTest { " end function_two;\n" + "\n" + "end;\n" + - "/\n"; // + "/\n"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(4, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java index b11fcdfaf..c9d148c6c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_4.java @@ -22,14 +22,13 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; 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 "; // + "\n\t"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); @@ -62,7 +61,7 @@ public class Oracle_pl_4 extends OracleTest { assertEquals("BEGIN\n" + "\tbuf_b := HEXTORAW('636865642f4c');\n" + "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + - "END;", // + "END;", output); } { @@ -70,7 +69,7 @@ public class Oracle_pl_4 extends OracleTest { assertEquals("begin\n" + "\tbuf_b := HEXTORAW('636865642f4c');\n" + "\tdbms_lob.write(loc_b, 2048, 28493, buf_b);\n" + - "end;", // + "end;", output); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java index fee8e8528..6ac7beeea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_5.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; @@ -35,7 +34,7 @@ public class Oracle_pl_5 extends OracleTest { "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;"; // + "end;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_0.java index 3d2973560..2cf742745 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_basic_loop_0 extends OracleTest { public void test_0() throws Exception { @@ -38,7 +37,7 @@ public class Oracle_pl_basic_loop_0 extends OracleTest { " END LOOP;\n" + " -- After EXIT, control resumes here\n" + " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_1.java index 68f6d7799..5f67fe640 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_basic_loop_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_basic_loop_1 extends OracleTest { public void test_0() throws Exception { @@ -36,7 +35,7 @@ public class Oracle_pl_basic_loop_1 extends OracleTest { " END LOOP;\n" + " -- After EXIT statement, control resumes here\n" + " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java index baf776308..4b02184dd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_case_0 extends OracleTest { public void test_0() throws Exception { @@ -39,7 +38,7 @@ public class Oracle_pl_case_0 extends OracleTest { " WHEN grade = 'F' THEN DBMS_OUTPUT.PUT_LINE('Poor');\n" + " ELSE DBMS_OUTPUT.PUT_LINE('No such grade');\n" + " END CASE;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java index b1e7f3853..04fa1176a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_case_1 extends OracleTest { public void test_0() throws Exception { @@ -41,7 +40,7 @@ public class Oracle_pl_case_1 extends OracleTest { "EXCEPTION\n" + " WHEN CASE_NOT_FOUND THEN\n" + " DBMS_OUTPUT.PUT_LINE('No such grade');\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java index f632b6b83..16850ec1c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_case_2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_case_2 extends OracleTest { public void test_0() throws Exception { @@ -39,7 +38,7 @@ public class Oracle_pl_case_2 extends OracleTest { " l_employee_id);\n" + " ELSE\n" + " RAISE invalid_employee_type;\n" + - "END CASE;"; // + "END CASE;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java index ea9d1e0c3..4e8693630 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_0 extends OracleTest { public void test_0() throws Exception { @@ -57,7 +56,7 @@ public class Oracle_pl_exception_0 extends OracleTest { " WHEN OTHERS THEN\n" + " DBMS_OUTPUT.PUT_LINE ('Unexpected error');\n" + " RAISE;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java index 5b2207d08..1636b9805 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_1 extends OracleTest { public void test_0() throws Exception { @@ -44,7 +43,7 @@ public class Oracle_pl_exception_1 extends OracleTest { "EXCEPTION\n" + " WHEN NO_DATA_FOUND THEN\n" + " DBMS_OUTPUT.PUT_LINE ('Table name not found in query ' || stmt_no);\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java index 6301e5f95..11d010d36 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_2 extends OracleTest { public void test_0() throws Exception { @@ -37,7 +36,7 @@ public class Oracle_pl_exception_2 extends OracleTest { " WHEN ZERO_DIVIDE THEN\n" + " DBMS_OUTPUT.PUT_LINE('Company had zero earnings.');\n" + " pe_ratio := NULL;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java index c6018700e..705b40760 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_3.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_3 extends OracleTest { public void test_0() throws Exception { @@ -53,7 +52,7 @@ public class Oracle_pl_exception_3 extends OracleTest { " 'Revising salary from ' || erroneous_salary ||\n" + " ' to ' || current_salary || '.'\n" + " );\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java index 0b99c96c5..d1a1bb0cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_4.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_4 extends OracleTest { public void test_0() throws Exception { @@ -43,7 +42,7 @@ public class Oracle_pl_exception_4 extends OracleTest { " WHEN OTHERS THEN\n" + " ROLLBACK;\n" + " RAISE;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java index e955f6da5..4f13abdbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_5.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_5 extends OracleTest { public void test_0() throws Exception { @@ -38,7 +37,7 @@ public class Oracle_pl_exception_5 extends OracleTest { " END IF;\n" + " END;\n" + "\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java index 9544f41db..b594bd5e7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_6.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_6 extends OracleTest { public void test_0() throws Exception { @@ -33,7 +32,7 @@ public class Oracle_pl_exception_6 extends OracleTest { "EXCEPTION\n" + " WHEN VALUE_ERROR THEN\n" + " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java index 983fc463f..cd574f143 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_7.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_7 extends OracleTest { public void test_0() throws Exception { @@ -37,7 +36,7 @@ public class Oracle_pl_exception_7 extends OracleTest { "EXCEPTION\n" + " WHEN VALUE_ERROR THEN\n" + " DBMS_OUTPUT.PUT_LINE('Exception raised in declaration.');\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java index b05d9b3b8..d5aaed33f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exception_8.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exception_8 extends OracleTest { public void test_0() throws Exception { @@ -72,7 +71,7 @@ public class Oracle_pl_exception_8 extends OracleTest { " END; -- sub-block ends\n" + " \n" + " END LOOP;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(6, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java index 86ba35b0a..64ffe78c9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exit_0 extends OracleTest { public void test_0() throws Exception { @@ -38,7 +37,7 @@ public class Oracle_pl_exit_0 extends OracleTest { " END LOOP;\n" + " -- After EXIT, control resumes here\n" + " DBMS_OUTPUT.PUT_LINE(' After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java index d6a591e44..41c8fd9a9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_exit_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_exit_1 extends OracleTest { public void test_0() throws Exception { @@ -36,7 +35,7 @@ public class Oracle_pl_exit_1 extends OracleTest { " END LOOP;\n" + " -- After EXIT statement, control resumes here\n" + " DBMS_OUTPUT.PUT_LINE('After loop: x = ' || TO_CHAR(x));\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java index 3521ff902..b879871e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_external_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_external_0 extends OracleTest { public void test_0() throws Exception { @@ -30,7 +29,7 @@ public class Oracle_pl_external_0 extends OracleTest { " empid NUMBER,\n" + " pct NUMBER\n" + ") AS\n" + - " LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)'; -- call specification"; // + " LANGUAGE JAVA NAME 'Adjuster.raiseSalary (int, float)'; -- call specification"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java index 54a0bb76d..d384a0fec 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_for_0 extends OracleTest { public void test_0() throws Exception { @@ -38,7 +37,7 @@ public class Oracle_pl_for_0 extends OracleTest { " display_total_sales \n" + " (l_current_year);\n" + " END LOOP;\n" + - "END display_multiple_years;"; // + "END display_multiple_years;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java index 3cb7764b9..eda0df935 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_for_1 extends OracleTest { public void test_0() throws Exception { @@ -47,7 +46,7 @@ public class Oracle_pl_for_1 extends OracleTest { " DBMS_OUTPUT.PUT_LINE\n" + " ('Name = ' || names(i) || ', salary = ' || sals(i));\n" + " END LOOP;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java index 5a7397358..fb9c08ef0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_2.java @@ -9,6 +9,7 @@ * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. @@ -22,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_for_2 extends OracleTest { public void test_0() throws Exception { @@ -37,14 +37,13 @@ public class Oracle_pl_for_2 extends OracleTest { " DELETE FROM employees_temp\n" + " WHERE department_id = depts(i);\n" + " END LOOP;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(3, statementList.size()); SQLStatement stmt = statementList.get(0); - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); for (SQLStatement statement : statementList) { statement.accept(visitor); @@ -103,7 +102,7 @@ public class Oracle_pl_for_2 extends OracleTest { "\t\tdelete from employees_temp\n" + "\t\twhere department_id = depts(i);\n" + "\tend loop;\n" + - "end;", // + "end;", output); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java index a706dc3a3..149281d0e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_3.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_for_3 extends OracleTest { public void test_0() throws Exception { @@ -38,7 +37,7 @@ public class Oracle_pl_for_3 extends OracleTest { " -- Process data here\n" + " END LOOP;\n" + " CLOSE c1;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java index 86b928f1a..84cf42bd9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_for_4.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_for_4 extends OracleTest { public void test_0() throws Exception { @@ -44,7 +43,7 @@ public class Oracle_pl_for_4 extends OracleTest { " END LOOP outer_loop;\n" + " \n" + " CLOSE c1;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java index 5c871046b..fdced4601 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_forall_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_forall_0 extends OracleTest { public void test_0() throws Exception { @@ -36,7 +35,7 @@ public class Oracle_pl_forall_0 extends OracleTest { " FORALL i IN depts.FIRST..depts.LAST\n" + " DELETE FROM employees_temp\n" + " WHERE department_id = depts(i);\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(3, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java index d02fd74db..2d08976b0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_0.java @@ -22,14 +22,13 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; 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;"; // + "END IF;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java index 0ccb8eb09..058c68824 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_1.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_if_1 extends OracleTest { public void test_0() throws Exception { @@ -30,7 +29,7 @@ public class Oracle_pl_if_1 extends OracleTest { "IS NULL\n" + "THEN\n" + " give_bonus (l_employee_id,500);\n" + - "END IF;"; // + "END IF;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java index b7079f077..e403ac67f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_2.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_if_2 extends OracleTest { public void test_0() throws Exception { @@ -31,7 +30,7 @@ public class Oracle_pl_if_2 extends OracleTest { " give_bonus (l_employee_id, 0);\n" + "ELSE\n" + " give_bonus (l_employee_id, 500);\n" + - "END IF;"; // + "END IF;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java index edc1f0592..71e2571e6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_if_3.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_if_3 extends OracleTest { public void test_0() throws Exception { @@ -34,7 +33,7 @@ public class Oracle_pl_if_3 extends OracleTest { " give_bonus(l_employee_id, 500);\n" + "ELSE\n" + " give_bonus(l_employee_id, 0);\n" + - "END IF;"; // + "END IF;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java index 12e9d9ae7..50a8d9c6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_open_for_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_open_for_0 extends OracleTest { public void test_0() throws Exception { @@ -65,7 +64,7 @@ public class Oracle_pl_open_for_0 extends OracleTest { " END LOOP;\n" + " \n" + " CLOSE cv;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java index 43069a570..de65b0e95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_param_inout_0.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_param_inout_0 extends OracleTest { public void test_0() throws Exception { @@ -32,7 +31,7 @@ public class Oracle_pl_param_inout_0 extends OracleTest { ") AS\n" + "BEGIN\n" + " p.change_job(new_job); -- runs with privileges of OE\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_while_loop.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_while_loop.java index ffb20663f..dbef93fc5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_while_loop.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/Oracle_pl_while_loop.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class Oracle_pl_while_loop extends OracleTest { public void test_0() throws Exception { @@ -33,7 +32,7 @@ public class Oracle_pl_while_loop extends OracleTest { " \tDBMS_OUTPUT.PUT_LINE('Sum: ' || v1);\n" + " \t\tv1 := v1 - 1;\n" + " \tEND LOOP;\n" + - "END;"; // + "END;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java index 7a880b55e..ddca7ea44 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/pl/oracle_pl_open_1.java @@ -22,11 +22,10 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class oracle_pl_open_1 extends OracleTest { public void test_0() throws Exception { - String sql = "OPEN cur_user(lv_batchid);"; // + String sql = "OPEN cur_user(lv_batchid);"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement stmt = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectForUpdateTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectForUpdateTest.java index 2ebc28639..6a82dbf71 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectForUpdateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectForUpdateTest.java @@ -15,21 +15,15 @@ */ package com.alibaba.druid.bvt.sql.oracle.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleSysdateExpr; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectForUpdateTest extends OracleTest { - public void test_0() throws Exception { String sql = "SELECT salary\n" + "FROM employees\n" + @@ -55,7 +49,6 @@ public class OracleSelectForUpdateTest extends OracleTest { // System.out.println("conditions : " + visitor.getConditions()); // System.out.println("relationships : " + visitor.getRelationships()); - assertEquals(1, visitor.getTables().size()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("employees"))); assertEquals(2, visitor.getColumns().size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java index 67de9f798..092074ee1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest1.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -49,5 +48,4 @@ public class OracleSelectTest1 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("bonuses", "employee_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java index b1d6bdc6e..0289cf074 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest10.java @@ -21,16 +21,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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;"; // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java index 9b0d4ba74..c768e3292 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest100_var.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -68,6 +67,4 @@ public class OracleSelectTest100_var extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java index a45042af9..bed33f13f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest101.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -150,6 +149,4 @@ public class OracleSelectTest101 extends OracleTest { assertEquals(4, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java index 23cbf2cec..9f53d046a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest102_interval.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -85,6 +84,4 @@ public class OracleSelectTest102_interval extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java index d85fa32f5..99602c207 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest103.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -151,6 +150,4 @@ public class OracleSelectTest103 extends OracleTest { assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java index cb541e7b9..03c094e3f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest104.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -91,6 +90,4 @@ public class OracleSelectTest104 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java index abfe4fedf..6f5e2c224 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest105.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -71,6 +70,4 @@ public class OracleSelectTest105 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java index 0426f2c4e..ad8f8306c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest106.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; @@ -76,9 +75,5 @@ public class OracleSelectTest106 extends OracleTest { assertEquals(3, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - - } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java index 144156180..6136f0e1e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest107.java @@ -15,15 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.OracleTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.repository.SchemaRepository; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; public class OracleSelectTest107 extends OracleTest { //xml 解析 暂不支持，明宣 反馈的 @@ -122,6 +114,4 @@ public class OracleSelectTest107 extends OracleTest { // // } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java index 9c60e9de0..b22dc2ffb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest108.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import java.util.List; @@ -76,6 +75,5 @@ public class OracleSelectTest108 extends OracleTest { assertEquals(3, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); assertEquals(2, visitor.getOrderByColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java index cca4ea07f..59079120f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest109.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle.select; -import com.alibaba.druid.DbType; import com.alibaba.druid.sql.OracleTest; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.parser.SQLParserFeature; -import com.alibaba.druid.sql.repository.SchemaRepository; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import java.util.List; @@ -64,6 +59,5 @@ public class OracleSelectTest109 extends OracleTest { // assertEquals(3, visitor.getConditions().size()); // assertEquals(1, visitor.getRelationships().size()); // assertEquals(2, visitor.getOrderByColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java index 7b8002953..4d14ab204 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest11.java @@ -20,30 +20,29 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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')" + // + 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;"; // + " ) 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 "; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java index f92f01727..f2b9993f2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest110.java @@ -88,7 +88,6 @@ public class OracleSelectTest110 extends OracleTest { assertEquals(2, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } public void test_1() throws Exception { @@ -100,7 +99,6 @@ public class OracleSelectTest110 extends OracleTest { assertEquals(1, statementList.size()); - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(DbType.oracle); SQLStatement stmt = statementList.get(0); System.out.println(stmt); @@ -125,7 +123,6 @@ public class OracleSelectTest110 extends OracleTest { assertEquals(4, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } public void test_2() throws Exception { @@ -147,7 +144,6 @@ public class OracleSelectTest110 extends OracleTest { assertEquals(1, statementList.size()); - SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(DbType.oracle); SQLStatement stmt = statementList.get(0); System.out.println(stmt); @@ -181,6 +177,5 @@ public class OracleSelectTest110 extends OracleTest { assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java index e2ed5f1e7..58a14c657 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest111.java @@ -73,7 +73,6 @@ public class OracleSelectTest111 extends OracleTest { assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); - } public void test_1() throws Exception { @@ -113,7 +112,6 @@ public class OracleSelectTest111 extends OracleTest { assertEquals(4, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } // // public void test_2() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java index 5e982c768..1d0e8cfbc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest112.java @@ -62,7 +62,5 @@ public class OracleSelectTest112 extends OracleTest { assertEquals(4, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java index dd177f9d9..bb060fb97 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest113.java @@ -91,7 +91,5 @@ public class OracleSelectTest113 extends OracleTest { assertEquals(11, visitor.getConditions().size()); assertEquals(1, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java index d8e52087b..33fd4dcc6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest114.java @@ -62,7 +62,5 @@ public class OracleSelectTest114 extends OracleTest { assertEquals(1, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java index 8a8578598..5bb639084 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest115.java @@ -70,7 +70,5 @@ public class OracleSelectTest115 extends OracleTest { assertEquals(2, visitor.getConditions().size()); assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest116.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest116.java index c15864869..9f8c07a04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest116.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest116.java @@ -20,12 +20,10 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest116 extends MysqlTest { public void test_0() throws Exception { String sql = "\n" + @@ -55,5 +53,4 @@ public class OracleSelectTest116 extends MysqlTest { "SELECT a\n" + "FROM a4", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest117_bigunion.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest117_bigunion.java index 596d049cd..0b05beee4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest117_bigunion.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest117_bigunion.java @@ -25,7 +25,6 @@ import com.alibaba.druid.wall.WallUtils; import java.util.List; - public class OracleSelectTest117_bigunion extends MysqlTest { public void test_small_10() throws Exception { StringBuilder buf = new StringBuilder(); @@ -83,7 +82,6 @@ public class OracleSelectTest117_bigunion extends MysqlTest { ") ux_x", stmt.toString()); } - public void test_big_100000() throws Exception { StringBuilder buf = new StringBuilder(); { @@ -111,4 +109,4 @@ public class OracleSelectTest117_bigunion extends MysqlTest { SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); stmt.accept(statVisitor); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest118.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest118.java index 4c597902c..f732518fe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest118.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest118.java @@ -19,12 +19,10 @@ import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest118 extends MysqlTest { public void test_0() throws Exception { String sql = "select CONNECT_BY_ROOT(su1.id) as id \n" + @@ -52,5 +50,4 @@ public class OracleSelectTest118 extends MysqlTest { "START WITH su1.type = 'sch'\n" + "CONNECT BY PRIOR su1.id = su1.parentid", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest119_bigand.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest119_bigand.java index 051f68fd2..b59f7eae8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest119_bigand.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest119_bigand.java @@ -25,7 +25,6 @@ import com.alibaba.druid.wall.WallUtils; import java.util.List; - public class OracleSelectTest119_bigand extends MysqlTest { public void test_small_10() throws Exception { StringBuilder buf = new StringBuilder(); @@ -62,7 +61,6 @@ public class OracleSelectTest119_bigand extends MysqlTest { "\tAND GOODS_SID <> :12", stmt.toString()); } - public void test_big_100000() throws Exception { StringBuilder buf = new StringBuilder(); { @@ -87,4 +85,4 @@ public class OracleSelectTest119_bigand extends MysqlTest { SchemaStatVisitor statVisitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.ORACLE); stmt.accept(statVisitor); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java index f2d8b15e3..446c17040 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest12.java @@ -25,12 +25,12 @@ 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"; // + 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"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest120.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest120.java index 0a4f5326d..f466edf65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest120.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest120.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest120 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT id, TRANSLATE (LTRIM (text, '/'), '/', ',') ledid,TRANSLATE (LTRIM (text1, '/'), '/', ',') position,picturepath,rtfpath,enter,leave,speed,stay_time,begintime,endtime FROM (SELECT ROW_NUMBER () OVER (PARTITION BY id ORDER BY id, lvl DESC) rn, id, text,text1,picturepath,rtfpath,enter,leave,speed,stay_time,begintime,endtime FROM (SELECT id, LEVEL lvl, SYS_CONNECT_BY_PATH (ledid,'/') text,SYS_CONNECT_BY_PATH (position,'/') text1,picturepath,rtfpath,enter,leave,speed,stay_time,begintime,endtime FROM (SELECT id, t.ledid as ledid,t1.position,t.picturepath,t.rtfpath,t.enter,t.leave,t.speed,t.stay_time,t.begintime,t.endtime, ROW_NUMBER () OVER (PARTITION BY id ORDER BY id,t.ledid) x FROM enjoyorvms_proginfov3 t,enjoyorvms_ledinfov3 t1 where t.ledid = t1.ledid ORDER BY id, ledid) a CONNECT BY id = PRIOR id AND x - 1 = PRIOR x)) WHERE rn = 1 ORDER BY id;"; @@ -63,5 +62,4 @@ public class OracleSelectTest120 extends MysqlTest { "WHERE rn = 1\n" + "ORDER BY id;", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest121.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest121.java index b7ae590c3..024461fb5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest121.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest121.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest121 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT DATE_TYPE , NVL ( TIME_0 , ? ) TIME_0 , NVL ( TIME_1 , ? ) TIME_1 , NVL ( TIME_2 , ? ) TIME_2 , NVL ( TIME_3 , ? ) TIME_3 , NVL ( TIME_4 , ? ) TIME_4 , NVL ( TIME_5 , ? ) TIME_5 , NVL ( TIME_6 , ? ) TIME_6 , NVL ( TIME_7 , ? ) TIME_7 , NVL ( TIME_8 , ? ) TIME_8 , NVL ( TIME_9 , ? ) TIME_9 , NVL ( TIME_10 , ? ) TIME_10 , NVL ( TIME_11 , ? ) TIME_11 , NVL ( TIME_12 , ? ) TIME_12 , NVL ( TIME_13 , ? ) TIME_13 , NVL ( TIME_14 , ? ) TIME_14 , NVL ( TIME_15 , ? ) TIME_15 , NVL ( TIME_16 , ? ) TIME_16 , NVL ( TIME_17 , ? ) TIME_17 , NVL ( TIME_18 , ? ) TIME_18 , NVL ( TIME_19 , ? ) TIME_19 , NVL ( TIME_20 , ? ) TIME_20 , NVL ( TIME_21 , ? ) TIME_21 , NVL ( TIME_22 , ? ) TIME_22 , NVL ( TIME_23 , ? ) TIME_23 , NVL ( TIME_ALL , ? ) TIME_ALL \n" + @@ -100,5 +99,4 @@ public class OracleSelectTest121 extends MysqlTest { "PIVOT (MAX(CNT) FOR HOUR IN (? AS \"TIME_0\", ? AS \"TIME_1\", ? AS \"TIME_2\", ? AS \"TIME_3\", ? AS \"TIME_4\", ? AS \"TIME_5\", ? AS \"TIME_6\", ? AS \"TIME_7\", ? AS \"TIME_8\", ? AS \"TIME_9\", ? AS \"TIME_10\", ? AS \"TIME_11\", ? AS \"TIME_12\", ? AS \"TIME_13\", ? AS \"TIME_14\", ? AS \"TIME_15\", ? AS \"TIME_16\", ? AS \"TIME_17\", ? AS \"TIME_18\", ? AS \"TIME_19\", ? AS \"TIME_20\", ? AS \"TIME_21\", ? AS \"TIME_22\", ? AS \"TIME_23\", ? AS \"TIME_ALL\")) T2\n" + "ORDER BY DATE_TYPE", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest122.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest122.java index d82ec94b0..49bd93a6e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest122.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest122.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest122 extends MysqlTest { public void test_0() throws Exception { String sql = "select A.gnmk_ljmc , A.mklx_dm , A.gnmb_dm , B.jbdm , B.sdate , B.edate \n" + @@ -61,5 +60,4 @@ public class OracleSelectTest122 extends MysqlTest { "\t\t\tAND org.SWJG_DM = org_model.jg_dm\n" + "\t) B ON A.gnmk_dm = B.gnmk_dm ", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest123.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest123.java index 3a3888a5e..a15c0de8c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest123.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest123.java @@ -23,7 +23,6 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; - public class OracleSelectTest123 extends MysqlTest { public void test_0() throws Exception { String sql = "SELECT ECC_CPR.cms_con_dev_sites_change_obj(b.hc_con_id, b.po_header_id, b.po_header_code, b.differ_header_id, b.Id, b.Customize_Sites_Id, b.Customize_Site_Des, b.site_attr, b.Device_Bom_Id, b.DEVICE_QTY, b.item_code, b.Device_Bom_Name, b.Device_Bom_EngName, b.Dev_Bom_Type_Attribute, b.Dev_Bom_Type_Desc, b.Dev_Bom_Type_EngDesc, b.change_type, b.cms_site_status, b.last_update_date, b.Memo, para.parameter_value, b.customer_po, b.batch_delivery, FIVE_Address_NAME, CON_CONTRACT_PO_ID, b.DIFF_DEVICE_QTY)\n" + @@ -228,5 +227,4 @@ public class OracleSelectTest123 extends MysqlTest { "\t) para ON para.site_address_id = b.site_address_id \n" + "ORDER BY b.Device_Bom_Id, b.Dev_Bom_Type_Attribute, b.site_seq, b.addr_seq", stmt.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java index 1c0e05a35..17bb57629 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest124.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.bvt.sql.oracle.select; -import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; @@ -24,7 +23,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest124 extends TestCase { public void test_0() throws Exception { String sql = "SELECT\n" + @@ -85,4 +83,4 @@ public class OracleSelectTest124 extends TestCase { assertEquals("SELECT J01.COL_A, J01.COL_B, \"SUM\"(J01.COL_C) OVER (PARTITION BY J01.COL_A ORDER BY J01.COL_B NULLS FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS COL_C\n" + "FROM TAB_A J01", stmt.toString()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest125.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest125.java index 18bacdafc..907095db5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest125.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest125.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest125 extends TestCase { public void test_0() throws Exception { String sql = "SELECT\n" + @@ -66,5 +65,4 @@ public class OracleSelectTest125 extends TestCase { "where 1 = 1\n" + "offset ? rows fetch first ? rows only", stmt.toLowerCaseString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest126.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest126.java index 0b8584b39..cf47b509c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest126.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest126.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest126 extends TestCase { public void test_0() throws Exception { String sql = "SELECT *\n" + @@ -53,5 +52,4 @@ public class OracleSelectTest126 extends TestCase { "\tand insurance_order.status = '3'\n" + "\tand at.produce_id = 'BX'", stmt.toLowerCaseString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest127.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest127.java index bd9c319f2..06a38d12b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest127.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest127.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest127 extends TestCase { public void test_0() throws Exception { String sql = "select \"fid\" from t1;"; @@ -58,5 +57,4 @@ public class OracleSelectTest127 extends TestCase { assertTrue(visitor.containsColumn("t1", "fid")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest128.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest128.java index e427d5bef..98b274042 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest128.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest128.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest128 extends TestCase { public void test_0() throws Exception { String sql = "SELECT id,\n" + @@ -124,5 +123,4 @@ public class OracleSelectTest128 extends TestCase { assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest129.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest129.java index 9bad1d959..5a1fbd609 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest129.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest129.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest129 extends TestCase { public void test_0() throws Exception { String sql = "select to_number（floor(months_between(sysdate,to_Date(t1.csny, 'yyyy-mm-dd')) / 12)） from dual;"; @@ -58,5 +57,4 @@ public class OracleSelectTest129 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java index 14c2f1610..addd464f3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest13.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ 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"; // + + " 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest130.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest130.java index 0e5054942..c09250085 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest130.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest130.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest130 extends TestCase { public void test_0() throws Exception { String sql = "select a.a.\"b\"() from dual;"; @@ -58,5 +57,4 @@ public class OracleSelectTest130 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest131.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest131.java index d8bd3dd27..02606b3fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest131.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest131.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest131 extends TestCase { public void test_0() throws Exception { String sql = "select * from ( select * from ( \n" + @@ -1675,5 +1674,4 @@ public class OracleSelectTest131 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest132.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest132.java index 3880ed90c..eeecfb0c8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest132.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest132.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest132 extends TestCase { public void test_0() throws Exception { String sql = "select * from sys.dual natural join sys.dual"; @@ -60,5 +59,4 @@ public class OracleSelectTest132 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java index 20d3e76f8..f0304f1df 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest133.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest133 extends TestCase { public void test_0() throws Exception { String sql = "SELECT to_char(sysdate-interval '1' hour,'hh24:mi:ss') as num FROM DUAL;"; @@ -58,5 +57,4 @@ public class OracleSelectTest133 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest134.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest134.java index 11602d5ce..6d20db89f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest134.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest134.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest134 extends TestCase { public void test_0() throws Exception { String sql = "select xu.employee_no\n" + @@ -213,5 +212,4 @@ public class OracleSelectTest134 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest135.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest135.java index c5c65eb40..ca9427d1c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest135.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest135.java @@ -24,7 +24,6 @@ import junit.framework.TestCase; import java.util.List; - public class OracleSelectTest135 extends TestCase { public void test_0() throws Exception { String sql = "select * from (\n" + @@ -134,5 +133,4 @@ public class OracleSelectTest135 extends TestCase { // assertTrue(visitor.containsColumn("srm1.CONSIGNEE_ADDRESS", "id")); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java index ef1cc06e0..0d844de14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest14.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java index d98fff39a..0e2d5b093 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest15.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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\""; // + String sql = "SELECT CURRENT_TIMESTAMP(6) AT TIME ZONE 'PST' FROM \"DUAL\" \"A1\""; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java index 43a1409c3..791bb2ddd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest16.java @@ -23,11 +23,10 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; 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"; // + String sql = "select privilege#,level from sysauth$ connect by grantee#=prior privilege# and privilege#>0 start with grantee#=:1 and privilege#>0"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement statemen = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java index e358273fd..8c95834d9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest17.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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 "; // + 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 "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java index 04f6bcb1c..6d72f6d70 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest18.java @@ -20,26 +20,25 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java index 2c9ef5511..b73aa2a30 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest19.java @@ -20,24 +20,23 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java index 825c5080e..6b96d3ab4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest2.java @@ -21,24 +21,23 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -70,5 +69,4 @@ public class OracleSelectTest2 extends OracleTest { // assertTrue(visitor.getColumns().contains(new TableStat.Column("films", "producer_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java index a3cac4799..b64ea3118 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest20.java @@ -19,18 +19,17 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java index 85a377474..6b2ad4307 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest21.java @@ -21,29 +21,28 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java index b61ae8b57..08b069d01 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest22.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java index fce7ec579..3a5932aab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest23.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java index 98d31a4fc..3a9280ea8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest24.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java index 3ac77c507..c0e264761 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest25.java @@ -19,14 +19,13 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java index 3cebdaddd..2acca098d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest26.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java index 85857870f..fdcf39067 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest27.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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" + // + "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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java index 64b62495a..44de491e4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest28.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java index 7bac63067..e29479e8d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest29.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java index d9fa25bbe..7254cf0cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest3.java @@ -20,17 +20,16 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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) " + // + 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; "; OracleStatementParser parser = new OracleStatementParser(sql); @@ -58,5 +57,4 @@ public class OracleSelectTest3 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "last_name"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "salary"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java index aa1d43892..755adf8b8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest30.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -28,16 +27,16 @@ 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 */ " // + + + "/*+ 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java index a1bdcfdac..dca4fb3ce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest31.java @@ -20,19 +20,18 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java index eb86d1c14..e37fa0bde 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest32.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java index b12b6d798..cec87a0bb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest33.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java index e5895ee73..e4f99cb03 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest34.java @@ -20,27 +20,26 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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'" + // + "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"; // + " 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,6 @@ public class OracleSelectTest34 extends OracleTest { OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); statemen.accept(visitor); - System.out.println("Tables : " + visitor.getTables()); System.out.println("fields : " + visitor.getColumns()); System.out.println("coditions : " + visitor.getConditions()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java index 224f04417..742e5277a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest35.java @@ -20,19 +20,18 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java index ddf767c92..4e5b11744 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest36.java @@ -26,14 +26,13 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java index 23501c9a0..eb47e3162 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest37.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class OracleSelectTest37 extends OracleTest { + "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) > = ?"; // + + " group by resource_value,http_method having count(resource_value) > = ?"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java index aed18c535..5b66b33c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest38.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,7 @@ public class OracleSelectTest38 extends OracleTest { + " 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 != ?)"; // + + "where tbek_code != ?)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java index 80b273856..a373c4d7e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest39.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java index c86c68978..2eae1fe96 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest4.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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' " + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); @@ -58,5 +57,4 @@ public class OracleSelectTest4 extends OracleTest { assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "employee_id"))); assertTrue(visitor.getColumns().contains(new TableStat.Column("employees", "manager_id"))); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java index bdf903c94..6c110b678 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest40.java @@ -19,33 +19,32 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java index 7cc1e07b1..2158ac765 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest41.java @@ -19,37 +19,36 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java index 8a809c6f2..324450936 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest42.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -53,9 +52,9 @@ public class OracleSelectTest42 extends OracleTest { String text = TestUtils.outputOracle(stmt); - assertEquals("SELECT ALL *" + // - "\nFROM t_department" + // - "\nWHERE name IN ('0000', '4444')" + // + assertEquals("SELECT ALL *" + + "\nFROM t_department" + + "\nWHERE name IN ('0000', '4444')" + "\nORDER BY name ASC", text); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java index 99f5fc08a..dadbf3a60 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest43.java @@ -19,17 +19,15 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java index c36181cda..045d87796 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest44.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -53,9 +52,9 @@ public class OracleSelectTest44 extends OracleTest { String text = TestUtils.outputOracle(stmt); - assertEquals("SELECT UNIQUE *" + // - "\nFROM ONLY (t_department)" + // - "\nWHERE name IN ('0000', '4444')" + // + assertEquals("SELECT UNIQUE *" + + "\nFROM ONLY (t_department)" + + "\nWHERE name IN ('0000', '4444')" + "\nORDER BY name ASC", text); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java index 112e1054a..44c0986b7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest45.java @@ -20,22 +20,21 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java index ca02edd8d..01f188143 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest46.java @@ -20,19 +20,18 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -56,11 +55,11 @@ public class OracleSelectTest46 extends OracleTest { String text = TestUtils.outputOracle(stmt); - 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'" // + 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); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java index 3f31b2e61..160b2661e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest47.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -51,8 +50,8 @@ public class OracleSelectTest47 extends OracleTest { String text = TestUtils.outputOracle(stmt); - assertEquals("SELECT *" // - + "\nFROM abc" // + assertEquals("SELECT *" + + "\nFROM abc" + "\nWHERE model = ?", text); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java index 9e773cc5c..2facbc135 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest48.java @@ -20,18 +20,17 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -55,12 +54,12 @@ public class OracleSelectTest48 extends OracleTest { String text = TestUtils.outputOracle(stmt); - 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" // + 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); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java index 9be736d16..22cdb77f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest49.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -52,8 +51,8 @@ public class OracleSelectTest49 extends OracleTest { String text = TestUtils.outputOracle(stmt); - assertEquals("SELECT *" // - + "\nFROM tab1 t" // + assertEquals("SELECT *" + + "\nFROM tab1 t" + "\nORDER BY replace(to_char(t.SORTNUM), '0', '9')", text); // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java index b56bc8309..b8790d472 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest5.java @@ -20,13 +20,12 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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" + // + String sql = "SELECT t1.department_id, t2.* FROM hr_info t1, TABLE(t1.people) t2" + " WHERE t2.department_id = t1.department_id;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java index b106d0fa4..06f49c5dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest50.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.test.TestUtils; -import static org.junit.Assert.*; 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(); @@ -52,7 +51,7 @@ public class OracleSelectTest50 extends OracleTest { String text = TestUtils.outputOracle(stmt); assertEquals("SELECT *"// - + "\nFROM (" // + + "\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"// diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java index ade80c643..3686f1b51 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest51.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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;"; // + "select TRIM(TRAILING 'M' FROM RTRIM(' testM')) from dual;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,14 +51,14 @@ public class OracleSelectTest51 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT TRIM(TRAILING 'M' FROM RTRIM(' testM'))" // + assertEquals("SELECT TRIM(TRAILING 'M' FROM RTRIM(' testM'))" + "\nFROM dual;", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select TRIM(TRAILING 'M' from RTRIM(' testM'))" // + assertEquals("select TRIM(TRAILING 'M' from RTRIM(' testM'))" + "\nfrom dual;", text); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java index 11de8b9b4..404294217 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest52.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectTest52 extends OracleTest { public void test_0() throws Exception { String sql = // - "select 1 interval from dual"; // + "select 1 interval from dual"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,14 +51,14 @@ public class OracleSelectTest52 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT 1 AS INTERVAL" // + assertEquals("SELECT 1 AS INTERVAL" + "\nFROM dual", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select 1 as INTERVAL" // + assertEquals("select 1 as INTERVAL" + "\nfrom dual", text); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java index 52969897d..d13944a32 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest53.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "SELECT MIN(t.deptno) KEEP(DENSE_RANK FIRST ORDER BY t.sal) a FROM emp t"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,14 +51,14 @@ public class OracleSelectTest53 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT MIN(t.deptno) KEEP (DENSE_RANK FIRST ORDER BY t.sal) AS a" // + assertEquals("SELECT MIN(t.deptno) KEEP (DENSE_RANK FIRST ORDER BY t.sal) AS a" + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select min(t.deptno) keep (dense_rank first order by t.sal) as a" // + assertEquals("select min(t.deptno) keep (dense_rank first order by t.sal) as a" + "\nfrom emp t", text); } // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java index c75954b93..093b546d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest54.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectTest54 extends OracleTest { public void test_0() throws Exception { String sql = // - "SELECT orderseq.currval FROM emp t"; // + "SELECT orderseq.currval FROM emp t"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,14 +51,14 @@ public class OracleSelectTest54 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT orderseq.CURRVAL" // + assertEquals("SELECT orderseq.CURRVAL" + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select orderseq.currval" // + assertEquals("select orderseq.currval" + "\nfrom emp t", text); } // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java index 43c0f5e77..f9cc4acd0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest55.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectTest55 extends OracleTest { public void test_0() throws Exception { String sql = // - "SELECT orderseq.NEXTVAL FROM emp t"; // + "SELECT orderseq.NEXTVAL FROM emp t"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -52,14 +51,14 @@ public class OracleSelectTest55 extends OracleTest { { String text = SQLUtils.toOracleString(stmt); - assertEquals("SELECT orderseq.NEXTVAL" // + assertEquals("SELECT orderseq.NEXTVAL" + "\nFROM emp t", text); } { String text = SQLUtils.toOracleString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); - assertEquals("select orderseq.nextval" // + assertEquals("select orderseq.nextval" + "\nfrom emp t", text); } // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java index 0a396d6c8..d2b22c1c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest56.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -50,7 +49,7 @@ public class OracleSelectTest56 extends OracleTest { + "\nSELECT 1 FROM dual " + "\n) and" + "\nAA.WNO = W.WNO(+) and" - + "\nAA.DEPTNO = DD.DEPTNO(+)"; // + + "\nAA.DEPTNO = DD.DEPTNO(+)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java index aebd37407..afd41f39c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest57.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java index b2a7cc7de..33fdc1086 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest58.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "SELECT * FROM T FETCH FIRST 10 ROWS ONLY"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java index d74fd6365..13ca421e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest59.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "SELECT * FROM atable ORDER BY acolumn DESC OFFSET 0 ROWS FETCH FIRST 10 ROWS ONLY"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java index 1cbe9abde..e09ea8295 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest6.java @@ -20,17 +20,16 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // + 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; "; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java index b7b1c0808..12403824b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest60.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectTest60 extends OracleTest { public void test_0() throws Exception { String sql = // - "SELECT ?||'ABC' FROM DUAL"; // + "SELECT ?||'ABC' FROM DUAL"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java index d8eb7fdef..7e09f19f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest61.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "Select column_expression from sys.ALL_IND_EXPRESSIONS where column_position =: cp"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java index 176cfd0d5..301a79b70 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest62.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -40,7 +39,7 @@ public class OracleSelectTest62 extends OracleTest { " GROUP BY GROUPING SETS( \n" + " (channel_desc, calendar_month_desc, co.country_id), \n" + " (channel_desc, co.country_id), \n" + - " (calendar_month_desc, co.country_id) );"; // + " (calendar_month_desc, co.country_id) );"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java index 54a8d268a..c09ecb129 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest63_with_recursive.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,7 @@ public class OracleSelectTest63_with_recursive extends OracleTest { "SELECT id,\n" + " parent_id\n" + "FROM t1\n" + - "ORDER BY order1;"; // + "ORDER BY order1;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java index 150b410d3..341f9f1f0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest64_with_recursive.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -48,7 +47,7 @@ public class OracleSelectTest64_with_recursive extends OracleTest { " RPAD('.', (lvl-1)*2, '.') || id AS tree,\n" + " lvl\n" + "FROM t1\n" + - "ORDER BY order1;"; // + "ORDER BY order1;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java index e5e88cba6..27868a56f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest65_error.java @@ -23,7 +23,7 @@ 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"; // + "select 1 from hhh as select 1"; Throwable error = null; try { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java index a72e9c6d6..1993f10f4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest66_not_eq.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class OracleSelectTest66_not_eq extends OracleTest { String sql = // "SELECT *\n" + "FROM customers\n" + - "WHERE last_name ^= 'Anderson';"; // + "WHERE last_name ^= 'Anderson';"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java index 5a97a62a7..ce05d1d62 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest67.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -28,7 +27,7 @@ public class OracleSelectTest67 extends OracleTest { public void test_0() throws Exception { String sql = // "SELECT NVL(B.KYSLRQ, A.HZDJRQ) HZDJRQ FROM DJ_NSRXX A" + - ", （SELECT B.NSRDZDAH, MIN(B.KYSLRQ) KYSLRQ FROM DJ_PZJGXX B WHERE B.NSRDZDAH = :B1 GROUP BY B.NSRDZDAH) B WHERE A.NSRDZDAH = :B1 AND A.NSRDZDAH = B.NSRDZDAH(+)"; // + ", （SELECT B.NSRDZDAH, MIN(B.KYSLRQ) KYSLRQ FROM DJ_PZJGXX B WHERE B.NSRDZDAH = :B1 GROUP BY B.NSRDZDAH) B WHERE A.NSRDZDAH = :B1 AND A.NSRDZDAH = B.NSRDZDAH(+)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java index 22eff4385..9cf50070c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest68.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "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"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java index 3c06698d4..52f82812c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest69.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -120,7 +119,7 @@ public class OracleSelectTest69 extends OracleTest { " NOCACHE LOGGING \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)) "; // + " BUFFER_POOL DEFAULT FLASH_CACHE DEFAULT CELL_FLASH_CACHE DEFAULT)) "; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java index cbdd726a1..96064c737 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest7.java @@ -20,16 +20,15 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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)" + // + String sql = "SELECT * FROM employees " + + " WHERE department_id NOT IN " + + " (SELECT department_id FROM departments " + + " WHERE location_id = 1700)" + " ORDER BY last_name;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java index 668c670c5..3f7281f73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest70.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -35,7 +34,7 @@ public class OracleSelectTest70 extends OracleTest { "\t\tOR a.nsrsbh_new = ?)\n" + "\tAND b.nsrzt_dm <= ?\n" + "\tAND c.JBDM LIKE ?\n" + - "\tAND rownum = 1"; // + "\tAND rownum = 1"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java index 203dbb396..e88aa6ea4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest71.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,7 @@ public class OracleSelectTest71 extends OracleTest { " AND A.SIM_NO LIKE '%'||?||'%' \n" + " order by A.SIM_NO ASC ) a\n" + "\n" + - " ) where rn > ?*(?-1) and rn <= ?*?"; // + " ) where rn > ?*(?-1) and rn <= ?*?"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java index 35bccde81..0413cdb54 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest72.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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)"; // + "Select A,B,C,sum(E) from test group by rollup(A,B,C)"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java index 46ea6823a..6b960f0ee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest73.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class OracleSelectTest73 extends OracleTest { " SUM(sales_value) AS sales_value\n" + "FROM dimension_tab\n" + "GROUP BY CUBE (fact_1_id, fact_2_id)\n" + - "ORDER BY fact_1_id, fact_2_id;"; // + "ORDER BY fact_1_id, fact_2_id;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java index b1f56f8d2..dec728d9b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest74_translate.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class OracleSelectTest74_translate extends OracleTest { " TRIM(T.MC)||\n" + " TRIM(T.MLPH)||\n" + " TRIM(T.MLXZ),1,35)\n" + - " USING CHAR_CS) FROM T"; // + " USING CHAR_CS) FROM T"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java index 479aa431c..42d997ef1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest75_comment.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -30,7 +29,7 @@ public class OracleSelectTest75_comment extends OracleTest { "--CMS???'?o??\n" + "SELECT *\n" + "FROM CDM.CDM_CON_ISSUE_DATE_CONTROL@ERPCMS idc\n" + - "WHERE idc.ecc_contract_header_id = ?"; // + "WHERE idc.ecc_contract_header_id = ?"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java index 60f238071..ff30c2492 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest76_brace.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class OracleSelectTest76_brace extends OracleTest { String sql = // "((SELECT *\n" + "FROM emp\n" + - "WHERE empno = 111));"; // + "WHERE empno = 111));"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java index 58b2a6da6..c80181d04 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest77.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -64,7 +63,7 @@ public class OracleSelectTest77 extends OracleTest { " )\n" + " )\n" + "WHERE\n" + - " a.enabled_flag = 'Y'"; // + " a.enabled_flag = 'Y'"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java index 1a7c9ed1e..3b4e55364 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest78.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -309,7 +308,7 @@ public class OracleSelectTest78 extends OracleTest { "WHERE\n" + " resultnums >:3\n" + " AND\n" + - " resultnums <=:4"; // + " resultnums <=:4"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java index 2193798f1..c9dc274ce 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest79.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; public class OracleSelectTest79 extends OracleTest { public void test_0() throws Exception { String sql = // - "SELECT * FROM `tasks` where projectId=?"; // + "SELECT * FROM `tasks` where projectId=?"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -59,7 +58,6 @@ public class OracleSelectTest79 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - // assertTrue(visitor.getColumns().contains(new TableStat.Column("acduser.vw_acd_info", "xzqh"))); // assertTrue(visitor.getOrderByColumns().contains(new TableStat.Column("employees", "last_name"))); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java index 9b091b248..093c2aee2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest8.java @@ -20,15 +20,14 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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(+)" + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java index a9a87c427..2f47b77ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest80.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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;"; // + "select (o.STORE - o.LAST_STORE) STORE from t_order o;"; OracleStatementParser parser = new OracleStatementParser(sql); List statementList = parser.parseStatementList(); @@ -58,7 +57,6 @@ public class OracleSelectTest80 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - assertTrue(visitor.containsColumn("t_order", "STORE")); assertTrue(visitor.containsColumn("t_order", "LAST_STORE")); // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java index 2151e8d08..6220f0b6f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest81_join_brace.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -41,7 +40,7 @@ public class OracleSelectTest81_join_brace extends OracleTest { " AND c1.enabled_flag = 'Y'\n" + " AND c1.contract_header_id = :headerid\n" + " AND sites.contract_header_id = :headerid\n" + - " AND c1.partition_date = :partiondate;"; // + " AND c1.partition_date = :partiondate;"; System.out.println(sql); @@ -50,7 +49,6 @@ public class OracleSelectTest81_join_brace extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); @@ -86,7 +84,6 @@ public class OracleSelectTest81_join_brace extends OracleTest { assertEquals(4, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); - assertTrue(visitor.containsColumn("tcp_cpr.con_config", "contract_config_id")); assertTrue(visitor.containsColumn("tcp_cpr.con_osg3a_headers", "parent_id")); // diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java index 0b57416b3..59681a6be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest82_wmsysconcat.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleSelectTest82_wmsysconcat extends OracleTest { "inner join sys_org so on st.orgid=so.orgid\n" + "group by st.regid ) t on t.regid = supReg.regid\n" + "WHERE supReg.status in (2,3,4) and supType='0'\n" + - "\n"; // + "\n"; System.out.println(sql); @@ -46,7 +45,6 @@ public class OracleSelectTest82_wmsysconcat extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java index 117c2a749..fcea2cc0c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest83_number_negative.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "select -3.5,4.7 from dual"; System.out.println(sql); @@ -36,7 +35,6 @@ public class OracleSelectTest83_number_negative extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java index db7ffc2ef..6eb228f20 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest84_as.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "select a as, b, c from t"; System.out.println(sql); @@ -36,7 +35,6 @@ public class OracleSelectTest84_as extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java index a70f0a765..59fe1aa5e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest85_in.java @@ -20,14 +20,13 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "select * from t where id not in 3"; System.out.println(sql); @@ -36,7 +35,6 @@ public class OracleSelectTest85_in extends OracleTest { SQLStatement stmt = statementList.get(0); print(statementList); - assertEquals(1, statementList.size()); OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java index 722a7a7a6..3a076dd50 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_comment.java @@ -22,7 +22,6 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleLexer; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserFeature; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,7 @@ public class OracleSelectTest86_comment extends OracleTest { + " 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"; // + + "AND KU$.SCHEMA_OBJ.OWNER_NAME=:SCHEMA2"; System.out.println(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java index b594bdca3..9add4a85e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest86_wmsys_wmconat.java @@ -24,14 +24,13 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "select WMSYS.WM_CONCAT(name) from emp"; System.out.println(sql); @@ -70,7 +69,7 @@ public class OracleSelectTest86_wmsys_wmconat extends OracleTest { public void test_1() throws Exception { String sql = // - "select WMSYS.WM_CONCAT(name) + 1 from emp"; // + "select WMSYS.WM_CONCAT(name) + 1 from emp"; System.out.println(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java index c3f3a6d6d..0f02443d0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest87_bindvar.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -32,7 +31,7 @@ public class OracleSelectTest87_bindvar extends OracleTest { "from a\n" + "where a=:3\n" + "and b= : 4\n" + - "and c= :5and :a = :b"; // + "and c= :5and :a = :b"; System.out.println(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java index 716af77f5..7387312e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest88_bindvar.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -34,7 +33,7 @@ public class OracleSelectTest88_bindvar extends OracleTest { " select *\n" + " from \"rme\" \"rm\" \n" + " where \"rm\".a-interval:\"sys_b_07\" day(:\"sys_b_08\") to second(:\"sys_b_09\")\n" + - ")"; // + ")"; System.out.println(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java index d458bd26b..2b99b035e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest89_condition.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -38,7 +37,7 @@ public class OracleSelectTest89_condition extends OracleTest { "\t\t(select distinct rid from v.p )\n" + "\t)\n" + "\tand \"timestamp\" <= 1298505600000\n" + - "\n"; // + "\n"; System.out.println(sql); @@ -80,6 +79,4 @@ public class OracleSelectTest89_condition extends OracleTest { assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java index 4d750c4ee..e78bebc34 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest9.java @@ -20,18 +20,17 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import static org.junit.Assert.*; 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" + // + 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;"; OracleStatementParser parser = new OracleStatementParser(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java index 71b70b13a..3dc0f70ab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest90_isof.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -29,7 +28,7 @@ public class OracleSelectTest90_isof extends OracleTest { public void test_0() throws Exception { String sql = // "select * from persons p\n" + - " where value(p) is of type(only employee_t)"; // + " where value(p) is of type(only employee_t)"; System.out.println(sql); @@ -63,6 +62,4 @@ public class OracleSelectTest90_isof extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java index ff63044b2..b481450b1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest91.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -33,7 +32,7 @@ public class OracleSelectTest91 extends OracleTest { "inner join sh s\n" + "inner join ca c\n" + "on c.id = s.id\n" + - "on a.va = s.va"; // + "on a.va = s.va"; System.out.println(sql); @@ -68,6 +67,4 @@ public class OracleSelectTest91 extends OracleTest { assertEquals(2, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java index d41d554b7..b210a0147 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest92_lexer.java @@ -21,14 +21,13 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; 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"; // + "select * from dual where 1 < > 2 and 1 ! = 2 and 1 ^ /*aaa */ = 2"; System.out.println(sql); @@ -64,6 +63,4 @@ public class OracleSelectTest92_lexer extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java index 9492bb6b2..12c111c2f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest93_model.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -43,7 +42,7 @@ public class OracleSelectTest93_model extends OracleTest { "s[prod='mouse pad', year=2001] = s['mouse pad', 1999] + s['mouse pad', 2000],\n" + "s['standard mouse', 2002] = s['standard mouse', 2001]\n" + ")\n" + - "order by country, prod, year"; // + "order by country, prod, year"; System.out.println(sql); @@ -84,6 +83,4 @@ public class OracleSelectTest93_model extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(3, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java index 5293c5b43..78876f2a9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest94.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -37,7 +36,7 @@ public class OracleSelectTest94 extends OracleTest { " count(state_code)\n" + " for state_code in (select state_code from preferred_states)\n" + " )\n" + - " order by 1"; // + " order by 1"; System.out.println(sql); @@ -77,6 +76,4 @@ public class OracleSelectTest94 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java index a103f0374..54101277c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest95_pivot.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,7 @@ public class OracleSelectTest95_pivot extends OracleTest { " (2,3) as two_three\n" + " )\n" + " )\n" + - " where d_t = 'p'\n"; // + " where d_t = 'p'\n"; System.out.println(sql); @@ -82,6 +81,4 @@ public class OracleSelectTest95_pivot extends OracleTest { assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java index 92b5f8eff..46265edb7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest96_pivot.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -46,7 +45,7 @@ public class OracleSelectTest96_pivot extends OracleTest { " (2,3) as two_three\n" + " )\n" + " )\n" + - " where d_t = 'p'\n"; // + " where d_t = 'p'\n"; System.out.println(sql); @@ -82,6 +81,4 @@ public class OracleSelectTest96_pivot extends OracleTest { assertEquals(1, visitor.getRelationships().size()); assertEquals(0, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java index 8cc883c95..78acc8be0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest97_wmsys_wmconat.java @@ -24,7 +24,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -35,7 +34,7 @@ public class OracleSelectTest97_wmsys_wmconat extends OracleTest { "FROM ECC_CPR.CCG_GTS_OSG3A_V O\n" + "WHERE O.ENABLED_FLAG = ?\n" + "\tAND NVL(O.PRICE, ?) = ?\n" + - "\tAND O.CONTRACT_HEADER_ID = :B1"; // + "\tAND O.CONTRACT_HEADER_ID = :B1"; System.out.println(sql); @@ -83,7 +82,7 @@ public class OracleSelectTest97_wmsys_wmconat extends OracleTest { "FROM ECC_CPR.CCG_GTS_OSG3A_V O\n" + "WHERE O.ENABLED_FLAG = ?\n" + "\tAND NVL(O.PRICE, ?) = ?\n" + - "\tAND O.CONTRACT_HEADER_ID = :B1"; // + "\tAND O.CONTRACT_HEADER_ID = :B1"; System.out.println(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java index 7cef757a6..30aa9cd6e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest98.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -70,6 +69,4 @@ public class OracleSelectTest98 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java index 9fb38fd76..231db346d 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest99.java @@ -21,7 +21,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -70,6 +69,4 @@ public class OracleSelectTest99 extends OracleTest { assertEquals(0, visitor.getRelationships().size()); assertEquals(1, visitor.getOrderByColumns().size()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java index 5ca1bd204..de4679831 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_connect_by_root.java @@ -19,7 +19,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import java.util.List; @@ -44,7 +43,5 @@ public class OracleSelectTest_connect_by_root extends OracleTest { assertEquals(1, visitor.getTables().size()); // assertEquals(1, visitor.getColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java index 034a9d96a..286b5f93f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE.java @@ -23,7 +23,6 @@ import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import java.util.List; -import static org.junit.Assert.*; public class OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE extends OracleTest { public void test_0() throws Exception { @@ -32,7 +31,7 @@ public class OracleSelectTest_hierarchical_CONNECT_BY_ISCYCLE extends OracleTest " FROM employees\n" + " WHERE level <= 3 AND department_id = 80\n" + " START WITH last_name = 'King'\n" + - " CONNECT BY NOCYCLE PRIOR employee_id = manager_id AND LEVEL <= 4;"; // + " CONNECT BY NOCYCLE PRIOR employee_id = manager_id AND LEVEL <= 4;"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); SQLStatement statemen = statementList.get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_issue_5109.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_issue_5109.java index 71c08d071..8a8773972 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_issue_5109.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_issue_5109.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import static org.junit.Assert.*; import org.junit.Test; public class OracleSelectTest_issue_5109 extends OracleTest { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_param.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_param.java index ebeb10a71..23fab1202 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_param.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSelectTest_param.java @@ -28,7 +28,7 @@ public class OracleSelectTest_param extends OracleTest { public void test_0() throws Exception { String sql = // - "select c1 from t1 t where t.c2=1 and (t.c3=1 or t.c3=5)"; // + "select c1 from t1 t where t.c2=1 and (t.c3=1 or t.c3=5)"; List statementList = SQLUtils.parseStatements(sql, dbType); assertEquals(1, statementList.size()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java index d9daa0481..136280ab0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/select/OracleSysdateTest.java @@ -17,14 +17,10 @@ package com.alibaba.druid.bvt.sql.oracle.select; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.OracleTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleSysdateExpr; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; -import java.util.List; - public class OracleSysdateTest extends OracleTest { private DbType dbType = JdbcConstants.ORACLE; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java index 86103a8bb..6dc232a63 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql.oracle.tomysql; -import static org.junit.Assert.*; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; 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" + // + String sql = "SELECT XX.*, ROWNUM AS RN" + + "\nFROM (SELECT *" + + "\n\tFROM t" + + "\n\tORDER BY id" + + "\n\t) XX" + "\nWHERE ROWNUM <= 10"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); @@ -23,7 +20,6 @@ public class OracleToMySql_PageTest extends TestCase { 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;"; @@ -33,4 +29,3 @@ public class OracleToMySql_PageTest extends TestCase { System.out.println(mysqlSql); } } - \ No newline at end of file diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java index 575374613..408ace338 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest1.java @@ -1,21 +1,18 @@ package com.alibaba.druid.bvt.sql.oracle.tomysql; -import static org.junit.Assert.*; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; 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" + // + 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"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java index 9f70b15d5..9d8c51272 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/tomysql/OracleToMySql_PageTest2.java @@ -1,18 +1,15 @@ package com.alibaba.druid.bvt.sql.oracle.tomysql; -import static org.junit.Assert.*; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; 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" + // + String sql = "SELECT XX.*, ROWNUM AS RN" + + "\nFROM (SELECT *" + + "\n\tFROM t" + + "\n\tORDER BY id" + + "\n\t) XX" + "\nWHERE ROWNUM < 10"; String mysqlSql = SQLUtils.translateOracleToMySql(sql); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java index c88de653e..a0d9ae4d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/ExportParameterDotNumberTest.java @@ -1,20 +1,17 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - import com.alibaba.druid.DbType; -import static org.junit.Assert.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; public class ExportParameterDotNumberTest extends TestCase { /** @@ -43,5 +40,4 @@ public class ExportParameterDotNumberTest extends TestCase { assertTrue(plist.size() > 0); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java index f27eef29a..429af1dab 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleASTVisitorAdapterTest.java @@ -1,8 +1,11 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; -import com.alibaba.druid.sql.ast.statement.SQLExceptionStatement; import com.alibaba.druid.sql.ast.SQLParameter; -import com.alibaba.druid.sql.ast.expr.*; +import com.alibaba.druid.sql.ast.expr.SQLDateExpr; +import com.alibaba.druid.sql.ast.expr.SQLDbLinkExpr; +import com.alibaba.druid.sql.ast.expr.SQLGroupingSetExpr; +import com.alibaba.druid.sql.ast.expr.SQLSizeExpr; +import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.ast.statement.*; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.WhenInsert; import com.alibaba.druid.sql.ast.statement.SQLMergeStatement.WhenUpdate; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java index 57bd1cb8c..e2434f01a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_Aggregate extends TestCase { public void test_0() throws Exception { @@ -50,6 +48,5 @@ public class OracleOutputVisitorTest_Aggregate extends TestCase { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); assertEquals("SELECT MAX(salary)\nFROM emp\nWHERE F1 = DATE '2011-10-01'", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java index 0661f2a16..f50252cd5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java @@ -1,17 +1,16 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; - -import org.junit.Test; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcUtils; +import org.junit.Test; + +import java.util.List; + +import static org.junit.Assert.assertEquals; /** * User: carvin diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java index a56384b01..d3e073981 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_dblink extends TestCase { public void test_0() throws Exception { @@ -49,6 +46,5 @@ public class OracleOutputVisitorTest_dblink extends TestCase { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); assertEquals("SELECT salary\nFROM master@emp", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java index 277dff977..563b24f73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_delete extends TestCase { public void test_0() throws Exception { @@ -49,6 +47,5 @@ public class OracleOutputVisitorTest_delete extends TestCase { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); assertEquals("DELETE FROM employee\nWHERE id = 3", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java index 0c3fb0a97..d81dce3f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_forupdate extends TestCase { public void test_0() throws Exception { @@ -49,6 +47,5 @@ public class OracleOutputVisitorTest_forupdate extends TestCase { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); assertEquals("SELECT salary\nFROM employee\nFOR UPDATE", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java index 8b0189062..56f521125 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_orderBy extends TestCase { public void test_0() throws Exception { @@ -50,6 +48,5 @@ public class OracleOutputVisitorTest_orderBy extends TestCase { OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); assertEquals("SELECT salary\nFROM employee\nORDER BY name", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java index 05f9842ea..9d154a494 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleOutputVisitorTest_selectJoin extends TestCase { public void test_0() throws Exception { @@ -53,6 +51,5 @@ public class OracleOutputVisitorTest_selectJoin extends TestCase { stmt.accept(outputVisitor); assertEquals("SELECT e.salary\nFROM employee e\n\tJOIN department d\nWHERE e.depId = d.id", buf.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java index afa56cfe2..74415b565 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_01.java @@ -46,5 +46,4 @@ public class OracleParameterizedOutputVisitorTest_01 extends TestCase { "\tAND aa.table_name = dd.table_name\n" + "\tAND dd.owner = 'EAIREP'", tempResult); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_02.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_02.java index 96060a2ad..7c8b1636b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_02.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleParameterizedOutputVisitorTest_02.java @@ -1,10 +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.sql.parser.SQLParserUtils; -import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java index eeab3a054..d62d442fc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java @@ -15,24 +15,20 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; + import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import static org.junit.Assert.*; - -import com.alibaba.druid.sql.OracleTest; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.util.Utils; -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 @@ -143,7 +139,7 @@ public class OracleResourceTest extends OracleTest { SQLStatement stmt = statementList.get(0); if (expect != null && !expect.isEmpty()) { String actual = stmt.toString(); - System.out.println("resource=========="+resource); + System.out.println("resource==========" + resource); assertEquals(expect, actual.trim()); } } else { @@ -152,5 +148,4 @@ public class OracleResourceTest extends OracleTest { } } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java index 20967911b..68cc4e14c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest1 extends TestCase { public void test_0() throws Exception { @@ -55,7 +53,6 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { assertEquals(1, visitor.getRelationships().size()); assertEquals("users.groupId = usergroups.id", visitor.getRelationships().iterator().next().toString()); - } public void test_1() throws Exception { @@ -83,6 +80,5 @@ public class OracleSchemaStatVisitorTest1 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("usergroups", "name"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java index 63ba9e09d..c77a18fb1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest2 extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,6 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } public void test_2() throws Exception { @@ -73,7 +70,6 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } public void test_3() throws Exception { @@ -98,6 +94,5 @@ public class OracleSchemaStatVisitorTest2 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java index c904c93b8..91d843518 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest3 extends TestCase { public void test_0() throws Exception { @@ -52,7 +50,5 @@ public class OracleSchemaStatVisitorTest3 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); assertEquals(true, visitor.getColumns().contains(new Column("users2", "name2"))); assertEquals(true, visitor.getColumns().contains(new Column("users2", "id2"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java index b4a1c8b96..c1a87ee55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest4 extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class OracleSchemaStatVisitorTest4 extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java index 36bc51cc5..ef01e5733 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest5.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Condition; - import junit.framework.TestCase; +import java.util.List; + public class OracleSchemaStatVisitorTest5 extends TestCase { public void test_0() throws Exception { String sql = "SELECT B.OBJ_ID AS BDZID,B.BDZMC,count(A.*) " @@ -77,7 +74,5 @@ public class OracleSchemaStatVisitorTest5 extends TestCase { assertEquals(true, visitor.containsTable("T_SB_ZNYC_ZFBZ")); assertEquals(13, visitor.getColumns().size()); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java index 0a82d0573..88b584d37 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest6.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest6 extends TestCase { public void test_0() throws Exception { @@ -32,7 +29,7 @@ public class OracleSchemaStatVisitorTest6 extends TestCase { + " SELECT OID,SSJG,OID " + " FROM (" + " SELECT A.OID,A.SSJG,A.OID " - + " FROM T_TX_ZLSB_ZLDYHGQ A " // + + " FROM T_TX_ZLSB_ZLDYHGQ A " + " WHERE (A.VERSIONID IS NULL OR A.VERSIONID='$SYS_B_2')" + " ) T1 JOIN (" + " SELECT B.OID,B.SSJG,B.OID " @@ -62,7 +59,5 @@ public class OracleSchemaStatVisitorTest6 extends TestCase { // assertEquals(2, visitor.getColumns().size()); // assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); // assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java index 530ebf876..dd4d41f91 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest7.java @@ -15,15 +15,12 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest7 extends TestCase { public void test_0() throws Exception { @@ -53,7 +50,5 @@ public class OracleSchemaStatVisitorTest7 extends TestCase { // assertEquals(2, visitor.getColumns().size()); // assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); // assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java index c99527a14..a2ce4ce98 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest8_merge_into.java @@ -72,7 +72,5 @@ public class OracleSchemaStatVisitorTest8_merge_into extends TestCase { assertTrue(visitor.containsColumn("KPI_M_CW_INCOME_FACT_BAK", "THE_DATE")); assertTrue(visitor.containsColumn("KPI_M_CW_INCOME_FACT_BAK", "AREA_LEVEL")); assertTrue(visitor.containsColumn("KPI_M_CW_INCOME_FACT_BAK", "TYPE_ID")); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java index 2ac964447..7f8d94f35 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest_Delete extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class OracleSchemaStatVisitorTest_Delete extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java index 0dbeda95f..8a09508d3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest_Subquery extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class OracleSchemaStatVisitorTest_Subquery extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java index e8854a694..1fb25f9b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { public void test_0() throws Exception { @@ -52,7 +50,5 @@ public class OracleSchemaStatVisitorTest_Subquery2 extends TestCase { assertEquals(true, visitor.getColumns().contains(new Column("users", "name"))); assertEquals(true, visitor.getColumns().contains(new Column("groups", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("groups", "name"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java index a6c18502b..2bcd3aa4c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.oracle.visitor; -import java.util.List; - -import static org.junit.Assert.*; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; + +import java.util.List; public class OracleSchemaStatVisitorTest_Update extends TestCase { public void test_0() throws Exception { @@ -48,7 +46,5 @@ public class OracleSchemaStatVisitorTest_Update extends TestCase { assertEquals(2, visitor.getColumns().size()); assertEquals(true, visitor.getColumns().contains(new Column("users", "id"))); assertEquals(true, visitor.getColumns().contains(new Column("users", "loginCount"))); - } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest.java index 654cd5cab..33e093510 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest.java @@ -2,14 +2,11 @@ package com.alibaba.druid.bvt.sql.phoenix; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; -import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.sql.dialect.phoenix.visitor.PhoenixSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_1.java index 1828138a7..a9aa83627 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_1.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_2.java index 2157c2961..4b72125a5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_2.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_std.java b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_std.java index 711d6273c..6f534431e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_std.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/phoenix/PhoenixUpsertTest_std.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java index d79974c23..c120e7876 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/polardbx/PolarDBXTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.repository.SchemaObject; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class PolarDBXTest extends TestCase { public void test_polardb_x_1() throws Throwable { @@ -106,7 +105,6 @@ public class PolarDBXTest extends TestCase { System.out.println(table.getStatement()); } - public void test_polardb_x_5_1() throws Throwable { SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql5 = "CREATE TABLE `test` (\t`id` varchar(32) NOT NULL DEFAULT '' COMMENT 'id',\n" @@ -125,7 +123,7 @@ public class PolarDBXTest extends TestCase { System.out.println(table.getStatement()); } - public void test_polardb_x_6(){ + public void test_polardb_x_6() { // test for global index with partition by SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); String sql6 = "CREATE TABLE `test6` (\n" @@ -165,6 +163,6 @@ public class PolarDBXTest extends TestCase { + "\tKEY i_id_ExitId USING BTREE (Id, ExitId),\n" + "\tKEY auto_shard_key_ExitId_id USING BTREE (ExitId, Id)\n" + ") ENGINE = InnoDB CHARSET = utf8\n" - + "PARTITION BY KEY (ExitId, Id) PARTITIONS 16",table.getStatement().toString()); + + "PARTITION BY KEY (ExitId, Id) PARTITIONS 16", table.getStatement().toString()); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java index 89cddbb33..5010d8b23 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGASTVisitorAdapterTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; 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.dialect.postgresql.visitor.PGASTVisitorAdapter; - import junit.framework.TestCase; public class PGASTVisitorAdapterTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java index b12d2862c..e29af4ab3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGCommentTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.bvt.sql.postgresql; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; @@ -26,6 +22,8 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; import com.alibaba.druid.sql.parser.ParserException; import com.alibaba.druid.stat.TableStat; +import java.util.List; + public class PGCommentTest extends PGTest { public void test_0() { String sql = "/*multiline comment test" @@ -74,6 +72,5 @@ public class PGCommentTest extends PGTest { System.out.println("coditions : " + visitor.getConditions()); assertTrue(visitor.getTables().containsKey(new TableStat.Name("a"))); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDoSQLTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDoSQLTest.java index 7f22a4990..9f6be5b64 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDoSQLTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDoSQLTest.java @@ -4,17 +4,16 @@ import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; - import com.alibaba.druid.util.JdbcConstants; import java.util.List; -public class PGDoSQLTest extends PGTest { - public void testDoSQL(){ - String sql1="DO $do$ BEGIN IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 't_pg_do_test') THEN\n" +public class PGDoSQLTest extends PGTest { + public void testDoSQL() { + String sql1 = "DO $do$ BEGIN IF NOT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = 't_pg_do_test') THEN\n" + "CREATE TABLE T_PG_DO_TEST (id BIGINT NOT NULL, content CHARACTER VARYING (36) DEFAULT ' ');\n" + "END IF; END; $do$;"; - String sql1Result="DO $do$\n" + String sql1Result = "DO $do$\n" + "BEGIN\n" + "\tIF NOT EXISTS (\n" + "\t\t\tSELECT 1\n" @@ -31,15 +30,13 @@ public class PGDoSQLTest extends PGTest { + "$do$;"; System.out.println(sql1); System.out.println(sql1Result); - equal(sql1,sql1Result); + equal(sql1, sql1Result); } - - private void equal(String targetSql,String resultSql){ - PGSQLStatementParser parser=new PGSQLStatementParser(targetSql); + private void equal(String targetSql, String resultSql) { + PGSQLStatementParser parser = new PGSQLStatementParser(targetSql); SQLStatement statement = parser.parseStatement(); - assertEquals(resultSql,statement.toString()); - + assertEquals(resultSql, statement.toString()); } public void testDoSQL_WithDeclare_NoTagAndLabel() { @@ -73,8 +70,8 @@ public class PGDoSQLTest extends PGTest { String output = SQLUtils.toSQLString(statementList, JdbcConstants.POSTGRESQL); assertEquals(sql, output); } - - // TODO: Need to improve parser to support the label in format "<>" + + // TODO: Need to improve parser to support the label in format \"<>\" public void testDoSQL_WithDeclare_LabelWithoutTag_NoEndLabel() { String sql = "DO $$\n" + "label1\n" + @@ -92,7 +89,7 @@ public class PGDoSQLTest extends PGTest { assertEquals(sql, output); } - // TODO: Need to improve parser to support the label in format "<>" + // TODO: Need to improve parser to support the label in format \"<>\" public void testDoSQL_WithDeclare_LabelWithoutTag_WithEndLabel() { String sql = "DO $$\n" + "label1\n" + @@ -110,7 +107,7 @@ public class PGDoSQLTest extends PGTest { assertEquals(sql, output); } - // TODO: Need to improve parser to support the label in format "<>" + // TODO: Need to improve parser to support the label in format \"<>\" public void testDoSQL_WithDeclare_TagAndLabel_NoEndLabel() { String sql = "DO $tag1$\n" + "label1\n" + @@ -128,7 +125,7 @@ public class PGDoSQLTest extends PGTest { assertEquals(sql, output); } - // TODO: Need to improve parser to support the label in format "<>" + // TODO: Need to improve parser to support the label in format \"<>\" public void testDoSQL_WithDeclare_TagAndLabel_WithEndLabel() { String sql = "DO $tag1$\n" + "label1\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java index ffb80f05a..bd9c772d7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest.java @@ -1,16 +1,12 @@ package com.alibaba.druid.bvt.sql.postgresql; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGExportParameterVisitor; +import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.List; public class PGExportParameterVisitorTest extends TestCase { public void test_pg() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java index 0f0a79124..3b4fb5aa4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGExportParameterVisitorTest1.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.sql.postgresql; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGExportParameterVisitor; +import junit.framework.TestCase; +import java.util.List; public class PGExportParameterVisitorTest1 extends TestCase { public void test_pg() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java index b2667265e..4fd6f4390 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitStringTest.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.postgresql.datatypes; -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.expr.SQLBinaryExpr; @@ -15,5 +13,4 @@ public class BitStringTest extends PGTest { SQLBinaryExpr expr = (SQLBinaryExpr) parser.expr(); assertEquals("B'101'", SQLUtils.toSQLString(expr, JdbcConstants.POSTGRESQL)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java index 0de7915f1..a74e9ba92 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BitsTest.java @@ -11,5 +11,4 @@ public class BitsTest extends PGTest { PGTypeCastExpr expr = (PGTypeCastExpr) parser.expr(); System.out.println(expr.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java index 215766a61..3b28a91e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/BooleanTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.postgresql.datatypes; -import java.util.List; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; import com.alibaba.druid.stat.TableStat; +import java.util.List; public class BooleanTest extends PGTest { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java index 2a2021ded..249f31aee 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/datatypes/TimestampTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class TimestampTest extends PGTest { public void test_timestamp() throws Exception { String sql = "TIMESTAMP '2004-10-19 10:23:54+02'"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java index 3c275e8da..9ef997074 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/AliasTest_Type.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcUtils; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java index f8dde8cb2..ee0f6676b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ArrayTest.java @@ -1,14 +1,9 @@ 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; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGMacAddrExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; -import static org.junit.Assert.*; - public class ArrayTest extends PGTest { public void test_timestamp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java index 28ca88d27..99cc09ff9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/BoxTest.java @@ -1,15 +1,11 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGBoxExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGPointExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class BoxTest extends PGTest { public void test_timestamp() throws Exception { String sql = "box '((0,0),(1,1))' + point '(2.0,0)'"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java index 96130a105..9bfae6be4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CidrTest.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGCidrExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class CidrTest extends PGTest { public void test_timestamp() throws Exception { String sql = "cidr '10.1.0.0/16'"; PGExprParser parser = new PGExprParser(sql); PGCidrExpr expr = (PGCidrExpr) parser.expr(); assertEquals("cidr '10.1.0.0/16'", expr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java index 903cd5d85..3eb0ff388 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/CircleTest.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGCircleExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class CircleTest extends PGTest { public void test_timestamp() throws Exception { String sql = "circle '((0,0),2)'"; PGExprParser parser = new PGExprParser(sql); PGCircleExpr expr = (PGCircleExpr) parser.expr(); assertEquals("circle '((0,0),2)'", expr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ExtractTest_Year.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ExtractTest_Year.java index 68930da5d..3ad4cb7f6 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ExtractTest_Year.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/ExtractTest_Year.java @@ -4,7 +4,6 @@ import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGExtractExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class ExtractTest_Year extends PGTest { public void test_timestamp() throws Exception { String sql = "EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40')"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java index 557127f68..2e8c8df20 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/InetTest.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGInetExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class InetTest extends PGTest { public void test_timestamp() throws Exception { String sql = "inet '0.0.0.255'"; PGExprParser parser = new PGExprParser(sql); PGInetExpr expr = (PGInetExpr) parser.expr(); assertEquals("inet '0.0.0.255'", expr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java index c581d993d..a5d8b6b11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java @@ -1,11 +1,8 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGLineSegmentsExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; -import static org.junit.Assert.*; - public class LineSegmentsTest extends PGTest { public void test_timestamp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java index 4a05d3418..e6d372b1a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java @@ -1,11 +1,8 @@ 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; -import static org.junit.Assert.*; - public class MacAddrTest extends PGTest { public void test_timestamp() throws Exception { @@ -13,6 +10,5 @@ public class MacAddrTest extends PGTest { PGExprParser parser = new PGExprParser(sql); PGMacAddrExpr expr = (PGMacAddrExpr) parser.expr(); assertEquals("macaddr '12:34:56:78:90:ab'", expr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java index a2ca0a95b..8f839f361 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest.java @@ -1,20 +1,15 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class PolygonTest extends PGTest { public void test_timestamp() throws Exception { String sql = "# '((1,0),(0,1),(-1,0))'"; PGExprParser parser = new PGExprParser(sql); SQLUnaryExpr unaryExpr = (SQLUnaryExpr) parser.expr(); assertEquals(SQLUnaryOperator.Pound, unaryExpr.getOperator()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java index c15c496c5..cf3624331 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/PolygonTest2.java @@ -1,19 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGPolygonExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; - public class PolygonTest2 extends PGTest { public void test_timestamp() throws Exception { String sql = "polygon '((0,0),(1,1))'"; PGExprParser parser = new PGExprParser(sql); PGPolygonExpr expr = (PGPolygonExpr) parser.expr(); assertEquals("polygon '((0,0),(1,1))'", expr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue3538.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue3538.java index 637d95cb0..a8e41c618 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue3538.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue3538.java @@ -1,24 +1,16 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.SQLUtils.FormatOption; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Name; -import com.alibaba.druid.wall.WallUtils; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; /** * @@ -29,13 +21,13 @@ import static org.junit.Assert.assertTrue; public class Issue3538 { @Test public void test_end() throws Exception { - DbType dbType= DbType.postgresql; + DbType dbType = DbType.postgresql; String sql = "end;\nend;"; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); List statements = parser.parseStatementList(); assertEquals(2, statements.size()); FormatOption DEFAULT_FORMAT_OPTION = new FormatOption(false, true, false); - for(SQLStatement statement : statements) { + for (SQLStatement statement : statements) { System.out.println("sql: " + statement.getClass().getName() + " " + statement.toString()); String result = SQLUtils.toSQLString(statement, dbType, DEFAULT_FORMAT_OPTION); System.out.println(result); @@ -43,7 +35,7 @@ public class Issue3538 { } @Test public void test_begin_end() throws Exception { - DbType dbType= DbType.postgresql; + DbType dbType = DbType.postgresql; String sql = "begin;\n" + "update table set name='a', sn='a' where id=1;\n" + "update table set name='b', sn='b' where id=2;\n" @@ -54,7 +46,7 @@ public class Issue3538 { assertEquals(5, statements.size()); com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement jjj; FormatOption DEFAULT_FORMAT_OPTION = new FormatOption(false, true, false); - for(SQLStatement statement : statements) { + for (SQLStatement statement : statements) { System.out.println("sql: " + statement.getClass().getName() + " " + statement.toString()); String result = SQLUtils.toSQLString(statement, dbType, DEFAULT_FORMAT_OPTION); System.out.println(result); @@ -71,7 +63,7 @@ public class Issue3538 { List statements = parser.parseStatementList(); assertEquals(5, statements.size()); FormatOption DEFAULT_FORMAT_OPTION = new FormatOption(false, true, false); - for(SQLStatement statement : statements) { + for (SQLStatement statement : statements) { System.out.println("sql: " + statement.getClass().getName() + " " + statement.toString()); String result = SQLUtils.toSQLString(statement, DbType.postgresql, DEFAULT_FORMAT_OPTION); System.out.println(result); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue4442.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue4442.java index 98083bf15..bab167853 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue4442.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue4442.java @@ -3,7 +3,6 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5287.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5287.java index d3e7e4796..1638445f7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5287.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5287.java @@ -1,25 +1,16 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLOrderBy; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; - import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; /** * 验证 Postgresql 没有解析行号的问题 #5287 @@ -28,7 +19,6 @@ import static org.junit.Assert.assertTrue; * @see 增强 #5287 */ public class Issue5287 { - @Test public void test_get_source_location() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5366.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5366.java index 4afd25a8d..1f306c1ca 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5366.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5366.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,10 +7,11 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; - import org.apache.commons.lang3.StringUtils; import org.junit.Test; +import java.util.Map; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +23,6 @@ import static org.junit.Assert.assertTrue; * @see CREATE TABLE */ public class Issue5366 { - @Test public void test_create_table() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql}) { @@ -80,7 +78,7 @@ public class Issue5366 { System.out.println(dbType + "生成的sql===" + statement); String newSql = statement.toString(); String normalizeNewSql = normalizeSql(newSql); - assertEquals(normalizeSql.toLowerCase(),normalizeNewSql.toLowerCase()); + assertEquals(normalizeSql.toLowerCase(), normalizeNewSql.toLowerCase()); SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(dbType); statement.accept(visitor); System.out.println(dbType + "getTables==" + visitor.getTables()); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5412.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5412.java index 83bdca08d..9319fc483 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5412.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5412.java @@ -1,8 +1,5 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -10,10 +7,11 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.wall.WallUtils; - import org.junit.Test; +import java.util.List; +import java.util.Map; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,7 +22,6 @@ import static org.junit.Assert.assertTrue; * @see 修复 #5412 */ public class Issue5412 { - @Test public void test_analyze_emptytable() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.greenplum, DbType.edb}) { @@ -48,7 +45,6 @@ public class Issue5412 { @Test public void test_analyze() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.greenplum, DbType.edb}) { - for (String sql : new String[]{ "analyze WORK.TABLE1;", "analyze WORK.TABLE1,WORK.TABLE2;", @@ -73,7 +69,6 @@ public class Issue5412 { @Test public void test_vacuum_empty() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.greenplum, DbType.edb}) { - for (String sql : new String[]{ "vacuum ", "vacuum ;vacuum ", diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5444.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5444.java index 523237200..54cf5bb89 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5444.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5444.java @@ -1,7 +1,5 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.Map; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -9,10 +7,10 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; - import org.junit.Test; -import static org.junit.Assert.assertFalse; +import java.util.Map; + import static org.junit.Assert.assertTrue; /** @@ -22,7 +20,6 @@ import static org.junit.Assert.assertTrue; * @see 增强 #5444 */ public class Issue5444 { - @Test public void test_alterdatabase() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5474.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5474.java index 4f93dd32a..390f765e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5474.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5474.java @@ -4,19 +4,14 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - /** * @author lizongbo * @see Issue来源 * @see PostgreSQL CREATE TRIGGER — define a new trigger */ public class Issue5474 { - @Test public void test_create_triger_execute() throws Exception { for (DbType dbType : new DbType[]{DbType.postgresql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5710.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5710.java index 9fc56ef9f..2a22bbb5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5710.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5710.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -16,7 +15,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5710 { - @Test public void test_parse_show_sql() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5752.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5752.java index 6f483591e..7f12d3bdc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5752.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5752.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -19,11 +18,9 @@ import static org.junit.Assert.assertEquals; * @see ALTER TABLE */ public class Issue5752 { - @Test public void test_parse_alter_table_sql() { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.greenplum, DbType.edb}) { - for (String sql : new String[]{ "ALTER TABLE distributors ADD COLUMN address varchar(30);", "ALTER TABLE distributors RENAME COLUMN address TO city;", diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5760.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5760.java index 51d6f42be..4f72735f8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5760.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5760.java @@ -1,22 +1,18 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - 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 org.junit.Test; +import java.util.List; + /** * @author lizongbo * @see Issue来源 */ public class Issue5760 { - @Test public void test_parse_error_sql() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5780.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5780.java index 582982df8..cf0dcac38 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5780.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5780.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,11 +17,9 @@ import static org.junit.Assert.assertEquals; * @see CREATE INDEX */ public class Issue5780 { - @Test public void test_parse_alter_table_sql() { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.greenplum, DbType.edb}) { - for (String sql : new String[]{ "CREATE INDEX \"index_log\" ON \"public\".\"check_log\" USING btree (\n" + " \"t_no\" COLLATE \"pg_catalog\".\"default\" \"pg_catalog\".\"text_ops\" ASC NULLS LAST\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5822.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5822.java index d800266d8..675176e74 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5822.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5822.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -21,7 +20,6 @@ import static org.junit.Assert.assertEquals; * @see Collation Support */ public class Issue5822 { - @Test public void test_parse_postgresql_collate() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5844.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5844.java index b22b47472..d6800ee94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5844.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5844.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; 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.ast.statement.SQLPrimaryKey; -import com.alibaba.druid.sql.ast.statement.SQLTableElement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleCreateTableParser; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -25,7 +19,6 @@ import static org.junit.Assert.assertEquals; * @see TABLESAMPLE */ public class Issue5844 { - @Test public void test_parse_postgresql_tablesample() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5847.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5847.java index 7e8936943..2df2ba0e8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5847.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5847.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -19,7 +18,6 @@ import static org.junit.Assert.assertEquals; * @see Issue来源 */ public class Issue5847 { - @Test public void test_parse() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5870.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5870.java index fe4959187..2645f26dc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5870.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5870.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -20,7 +19,6 @@ import static org.junit.Assert.assertEquals; * @see SET NAMES 'value'; */ public class Issue5870 { - @Test public void test_parse_set_schema() { for (String sql : new String[]{ diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5895.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5895.java index 80699456f..93389c66c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5895.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5895.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see CREATE USER */ public class Issue5895 { - @Test public void test_parse_createuser() { for (DbType dbType : new DbType[]{DbType.postgresql}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5909.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5909.java index b1731c001..52c9ca2bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5909.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5909.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see ... */ public class Issue5909 { - @Test public void test_parse_alter_column() { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.edb}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5922.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5922.java index 11e367003..6f1e226a2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5922.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/issues/Issue5922.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.sql.postgresql.issues; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLParseAssertUtil; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; - import org.junit.Test; +import java.util.List; + import static org.junit.Assert.assertEquals; /** @@ -18,7 +17,6 @@ import static org.junit.Assert.assertEquals; * @see DROP FUNCTION */ public class Issue5922 { - @Test public void test_parse_drop_function() { for (DbType dbType : new DbType[]{DbType.postgresql, DbType.edb}) { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/pl/PGGetDiagnosticsStatementTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/pl/PGGetDiagnosticsStatementTest.java index 1540400e4..51980b6c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/pl/PGGetDiagnosticsStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/postgresql/pl/PGGetDiagnosticsStatementTest.java @@ -8,21 +8,21 @@ import com.alibaba.druid.util.JdbcConstants; import java.util.List; public class PGGetDiagnosticsStatementTest extends PGTest { - public void test_0() throws Exception { - String sql = "DO $$\n" + - "BEGIN\n" + - " GET DIAGNOSTICS n = ROW_COUNT;\n" + - "END $$;"; + public void test_0() throws Exception { + String sql = "DO $$\n" + + "BEGIN\n" + + " GET DIAGNOSTICS n = ROW_COUNT;\n" + + "END $$;"; - List statementList = SQLUtils.parseStatements(sql, JdbcConstants.POSTGRESQL); - assertEquals(1, statementList.size()); + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.POSTGRESQL); + assertEquals(1, statementList.size()); - String output = SQLUtils.toSQLString(statementList, JdbcConstants.POSTGRESQL); - assertEquals("DO $$\n" + - "BEGIN\n" + - "\tGET DIAGNOSTICS n = ROW_COUNT;\n" + - "END;\n" + - "$$;", - output); - } + String output = SQLUtils.toSQLString(statementList, JdbcConstants.POSTGRESQL); + assertEquals("DO $$\n" + + "BEGIN\n" + + "\tGET DIAGNOSTICS n = ROW_COUNT;\n" + + "END;\n" + + "$$;", + output); + } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoAlterTableRename_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoAlterTableRename_0.java index 9dee74623..a62233555 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoAlterTableRename_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoAlterTableRename_0.java @@ -9,7 +9,6 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; public class PrestoAlterTableRename_0 { - @Test public void test_alter_schema() { String sql = "ALTER SCHEMA name RENAME TO new_name"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoSelect_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoSelect_0.java index 0d209e198..0251de32f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoSelect_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/PrestoSelect_0.java @@ -11,7 +11,9 @@ import org.junit.Test; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PrestoSelect_0 { protected final DbType dbType = DbType.presto; @@ -186,5 +188,4 @@ public class PrestoSelect_0 { "\tFROM region\n" + ");", stmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/TrinoResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/TrinoResourceTest.java index 129cb761a..0021b8245 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/presto/TrinoResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/presto/TrinoResourceTest.java @@ -4,8 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.bvt.sql.SQLResourceTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.hive.parser.HiveStatementParser; -import com.alibaba.druid.sql.dialect.hive.visitor.HiveSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; @@ -18,10 +16,9 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class TrinoResourceTest extends SQLResourceTest { - public TrinoResourceTest() { super(DbType.trino); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/redshift/RedshiftResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/redshift/RedshiftResourceTest.java index 788312bfb..effa978be 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/redshift/RedshiftResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/redshift/RedshiftResourceTest.java @@ -14,4 +14,3 @@ public class RedshiftResourceTest extends SQLResourceTest { fileTest(0, 999, i -> "bvt/parser/redshift/" + i + ".txt"); } } - diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/refactor/ClearSchema_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/refactor/ClearSchema_0.java index e37063e60..59ba15161 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/refactor/ClearSchema_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/refactor/ClearSchema_0.java @@ -2,17 +2,13 @@ package com.alibaba.druid.bvt.sql.refactor; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.visitor.SQLASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import java.util.List; - public class ClearSchema_0 extends TestCase { public void test_insert_0() throws Exception { String sql = "INSERT INTO testdb.Websites (name, country)\n" + diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java index 2a0c28959..81973d816 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest.java @@ -17,7 +17,7 @@ public class OracleJoinResolveTest extends TestCase { 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" - , repository.resolve("select a.* from t_user a inner join t_group b where a.uid = id")); + "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/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java index a26a5c479..53ea7d1cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_1_fk.java @@ -1,6 +1,5 @@ package com.alibaba.druid.bvt.sql.repository; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateTableStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.repository.SchemaRepository; @@ -157,7 +156,6 @@ public class OracleJoinResolveTest_1_fk extends TestCase { repository.console(sql_1); - OracleCreateTableStatement stmt = (OracleCreateTableStatement) SQLParserUtils.createSQLStatementParser(sql_2, JdbcConstants.ORACLE).parseStatement(); repository.resolve(stmt); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_2_join.java b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_2_join.java index ee72b718c..c8fa67a33 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_2_join.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/repository/OracleJoinResolveTest_2_join.java @@ -24,8 +24,8 @@ public class OracleJoinResolveTest_2_join extends TestCase { assertEquals("SELECT a.uid, a.gid, a.name, b.id, b.name\n" + "FROM t_user a\n" + "\tINNER JOIN t_group b\n" + - "WHERE a.uid = b.id" - , repository.resolve("select * from t_user a inner join t_group b where a.uid = id")); + "WHERE a.uid = b.id", + repository.resolve("select * from t_user a inner join t_group b where a.uid = id")); String sql = "select a.* from t_user a inner join t_group b where a.uid = id"; List statementList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java index 76d530a11..bc0c42345 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest extends TestCase { public void test_schemaStat() throws Exception { @@ -17,7 +16,6 @@ public class SchemaStatTest extends TestCase { + " from alisec_app.adl_tb_wing_rubbish_laidian_new_reason_realname_fdt " + " order by 来电日期 desc limit 30;"; - DbType dbType = JdbcConstants.ODPS; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java index 9c32d6c62..5999077cb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest10.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.Set; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java index e2c9d5b26..ecf13d6ea 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest12.java @@ -9,7 +9,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.Set; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java index 427848499..c1a96cfc8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest2.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest2 extends TestCase { public void test_schemaStat() throws Exception { @@ -17,7 +16,6 @@ public class SchemaStatTest2 extends TestCase { + " 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); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java index e88f3dbff..4bdf1541c 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest21_issue3980.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.schemaStat; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java index 470a65183..6a3363223 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest3.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest3 extends TestCase { public void test_schemaStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java index 0d4f04eb6..78627a635 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest4.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java index cca964e58..cc4ec92c3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest5.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java index 9462486fb..b05644ecb 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest6.java @@ -8,13 +8,11 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; 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"; - DbType dbType = JdbcConstants.MYSQL; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); SQLStatement stmt = parser.parseStatementList().get(0); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java index aa00ffc6a..40fff7025 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest7.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest7 extends TestCase { public void test_schemaStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java index d69b49a54..a5bbc7850 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest8.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest8 extends TestCase { public void test_schemaStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java index ae7b51b77..e3a7a110e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest9.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static org.junit.Assert.*; public class SchemaStatTest9 extends TestCase { public void test_schemaStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/spark/SparkKeywordsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/spark/SparkKeywordsTest.java index ec6972c91..56fbed7cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/spark/SparkKeywordsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/spark/SparkKeywordsTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.bvt.sql.spark; import com.alibaba.druid.DbType; -import com.alibaba.druid.bvt.sql.SQLResourceTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserFeature; @@ -10,8 +9,6 @@ import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.VisitorFeature; import junit.framework.TestCase; -import static org.junit.Assert.*; -import org.junit.Test; public class SparkKeywordsTest extends TestCase { public void test_keywords() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java index a80931a4e..0fe51515e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_0.java @@ -18,14 +18,11 @@ package com.alibaba.druid.bvt.sql.sqlite; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java index 9bcf14829..9c9d1e7c4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_1.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java index eee8f41a9..02d740b55 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlite/SQLite_SelectTest_2.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; -import static org.junit.Assert.*; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java index fe3d63168..2bdc2c93f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/MSSQLServerExportParameterVisitorTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.bvt.sql.sqlserver; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import com.alibaba.druid.sql.dialect.sqlserver.visitor.MSSQLServerExportParameterVisitor; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; public class MSSQLServerExportParameterVisitorTest extends TestCase { public void test_sqlserver() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java index 503510685..8c9a3bad5 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest.java @@ -15,24 +15,21 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import java.util.List; - -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; 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)"; // + 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)"; - String expect = "SELECT GEN_VAL" + // - "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + // + String expect = "SELECT GEN_VAL" + + "\nFROM ID_GENERATOR WITH (updlock, rowlock)" + "\nWHERE GEN_NAME = ?" + "\n\tAND FID = ?" + "\n\tAND FSTATE IN (?)"; diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java index bdef2aa4a..6327f204f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_1.java @@ -15,17 +15,13 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.TestCase; - -import static org.junit.Assert.*; - import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; 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"; assertSame(ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.SQL_SERVER), sql); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java index a800c179c..da3bc6b94 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerParameterizedOutputVisitorTest_2.java @@ -19,8 +19,6 @@ import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import static 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) )"; @@ -32,5 +30,4 @@ public class SQLServerParameterizedOutputVisitorTest_2 extends TestCase { "\tCONSTRAINT pk_AO_B9A0F0_APPLIED_TEMPLATE_ID PRIMARY KEY (ID)\n" + ")", ParameterizedOutputVisitorUtils.parameterize(sql, JdbcConstants.SQL_SERVER)); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/StarrocksKeywordsTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/StarrocksKeywordsTest.java index bd25a716c..791bffcd3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/StarrocksKeywordsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/StarrocksKeywordsTest.java @@ -10,11 +10,11 @@ import com.alibaba.druid.sql.parser.Token; import com.alibaba.druid.sql.visitor.VisitorFeature; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class StarrocksKeywordsTest { @Test - public void test_keywords(){ + public void test_keywords() { DbType dbType = DbType.starrocks; String sql = "CREATE TABLE test (\n" @@ -35,7 +35,7 @@ public class StarrocksKeywordsTest { + "\t\"replication_num\" = \"tag.location.default: 3\",\n" + "\t\"storage_format\" = \"V2\"\n" + ");"; - SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, + SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, SQLParserFeature.IgnoreNameQuotes); SQLStatement stmt = parser.parseStatement(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue5905.java b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue5905.java index 3f9b3c83e..a313e92c1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue5905.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue5905.java @@ -201,7 +201,7 @@ // + ");", // }) { // SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType); -// System.out.println("当前原始sql========"+sql); +// System.out.println("当前原始sql========" +sql); // List statementList = parser.parseStatementList(); // //assertEquals(1, statementList.size()); // SQLParseAssertUtil.assertParseSql(sql, dbType); diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue6029.java b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue6029.java index 8e0504351..4248c9c73 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue6029.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/starrocks/issues/Issue6029.java @@ -12,7 +12,6 @@ import org.junit.Test; * @see CREATE TABLE */ public class Issue6029 { - static final String[] caseList = new String[]{ // 1.普通建表语句 "CREATE TABLE IF NOT EXISTS `detailDemo` (\n" + @@ -211,5 +210,4 @@ public class Issue6029 { System.out.println(result); } } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/supersql/SuperSqlResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/supersql/SuperSqlResourceTest.java index e508e982f..00ffe98bd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/supersql/SuperSqlResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/supersql/SuperSqlResourceTest.java @@ -5,7 +5,6 @@ import com.alibaba.druid.bvt.sql.SQLResourceTest; import org.junit.Test; public class SuperSqlResourceTest extends SQLResourceTest { - public SuperSqlResourceTest() { super(DbType.supersql); } diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/synapse/SynapseResourceTest.java b/core/src/test/java/com/alibaba/druid/bvt/sql/synapse/SynapseResourceTest.java index 908312f39..94b476f46 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/sql/synapse/SynapseResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/sql/synapse/SynapseResourceTest.java @@ -1,24 +1,10 @@ package com.alibaba.druid.bvt.sql.synapse; -import static org.junit.Assert.assertEquals; - import com.alibaba.druid.DbType; import com.alibaba.druid.bvt.sql.SQLResourceTest; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.parser.SQLParserUtils; -import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.Utils; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; import org.junit.Test; public class SynapseResourceTest extends SQLResourceTest { - public SynapseResourceTest() { super(DbType.synapse); } @@ -27,4 +13,4 @@ public class SynapseResourceTest extends SQLResourceTest { public void synapse_parse() throws Exception { fileTest(0, 999, i -> "bvt/parser/synapse/" + i + ".txt"); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java b/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java index df89365df..7f4c535e9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java @@ -15,24 +15,14 @@ */ package com.alibaba.druid.bvt.stat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.List; -import java.util.Map; - +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidStatService; +import com.alibaba.druid.stat.spring.UserService; +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.http.stat.WebAppStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; - import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.mock.web.MockFilterChain; @@ -42,13 +32,17 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidStatService; -import com.alibaba.druid.stat.spring.UserService; -import com.alibaba.druid.support.http.WebStatFilter; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.util.JdbcUtils; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertThat; public class DruidStatServiceTest extends TestCase { private DruidDataSource dataSource; @@ -200,7 +194,7 @@ public class DruidStatServiceTest extends TestCase { public void test_statService_getActiveConnectionStackTrace() throws Exception { String sql = "select 1"; - dataSource.setRemoveAbandoned(true);// initiative close connection. + dataSource.setRemoveAbandoned(true); // initiative close connection. dataSource.setRemoveAbandonedTimeout(Integer.MAX_VALUE); Connection conn = dataSource.getConnection(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java b/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java index 7cb3e6e74..7b4b9be44 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java @@ -164,5 +164,4 @@ public class DruidStatServiceTest2 extends TestCase { public void test_getWallStatMap() throws Exception { DruidStatService.getInstance().getWallStatMap(Collections.emptyMap()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java b/core/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java index 63373b3ff..12bdf0210 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/stat/JdbcTraceManagerTest.java @@ -1,8 +1,7 @@ package com.alibaba.druid.bvt.stat; -import junit.framework.TestCase; - import com.alibaba.druid.stat.JdbcTraceManager; +import junit.framework.TestCase; @SuppressWarnings("deprecation") public class JdbcTraceManagerTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java index d10ee4df0..99f9d570a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/hibernate/DruidConnectionProviderTest.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.support.hibernate; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import com.alibaba.druid.support.hibernate.DruidConnectionProvider; +import junit.framework.TestCase; import java.sql.Connection; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; - - -import com.alibaba.druid.support.hibernate.DruidConnectionProvider; - - public class DruidConnectionProviderTest extends TestCase { private DruidConnectionProvider provider; diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java index ca3aef8a3..ab0b7f366 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java @@ -15,16 +15,11 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import com.alibaba.druid.support.http.StatViewServlet; import junit.framework.TestCase; - import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockServletConfig; -import com.alibaba.druid.support.http.StatViewServlet; - public class StatViewSerlvetTest_allow extends TestCase { public void test_allow() throws Exception { MockServletConfig servletConfig = new MockServletConfig(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java index 0dabc010f..149b1d6bf 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java @@ -15,15 +15,10 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - -import org.springframework.mock.web.MockServletConfig; - import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.http.StatViewServlet; +import junit.framework.TestCase; +import org.springframework.mock.web.MockServletConfig; public class StatViewServletTest_resetEnable extends TestCase { protected void setUp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java index e40f54e19..2a73217b2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_0_3_Test extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java index 6b789988b..0bdc724c0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_3_Test_2.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_0_3_Test_2 extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java index 97ce4d96d..3c89cc133 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_0_4_Test.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_0_4_Test extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java index 72c311e7b..0939dc03e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_1_Test.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_1_Test extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java index 83588a2da..f99b80fbe 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_2_Test_2.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_2_Test_2 extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java index 1a3e89033..58f7bc074 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentAndroid_4_3_Test_2.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentAndroid_4_3_Test_2 extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java index f0b135fff..6ae73ce6a 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentBotStat extends TestCase { public void test_youdao() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java index 28c619aaf..daa9fea95 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; - +import junit.framework.TestCase; public class UserAgentMacTest extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java index d89cff0e3..9da69f317 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentTest extends TestCase { public void test_agent_ie10() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java index e5477a456..1a1b0d0da 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8ChromeTest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; - +import junit.framework.TestCase; public class UserAgentWin8ChromeTest extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java index abbb2bba0..72f0cec83 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; - +import junit.framework.TestCase; public class UserAgentWin8IETest extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java index 4817abb54..da3bfccb7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWin8IETest_2.java @@ -15,12 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; - +import junit.framework.TestCase; public class UserAgentWin8IETest_2 extends TestCase { public void test_mac_firefox() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java index 4c5bdbdb0..8033c9f11 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java @@ -15,11 +15,8 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.http.stat.WebAppStat; +import junit.framework.TestCase; public class UserAgentWindows extends TestCase { public void test_windows98() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java index db2b4dfb5..83b1a0540 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest.java @@ -15,25 +15,18 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Map; - +import com.alibaba.druid.filter.stat.StatFilterContext; +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.http.stat.WebAppStat; +import com.alibaba.druid.support.http.stat.WebAppStatManager; import junit.framework.TestCase; - import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; -import com.alibaba.druid.filter.stat.StatFilterContext; -import com.alibaba.druid.support.http.WebStatFilter; -import com.alibaba.druid.support.http.stat.WebAppStat; -import com.alibaba.druid.support.http.stat.WebAppStatManager; +import java.util.Map; public class WebStatFilterTest extends TestCase { public void test_sessionStatDisable() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java index a0b157ef8..b9ac1de0f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest2.java @@ -15,12 +15,9 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.http.stat.WebAppStat; import junit.framework.TestCase; - import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; @@ -28,9 +25,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; import org.springframework.mock.web.MockServletContext; -import com.alibaba.druid.support.http.WebStatFilter; -import com.alibaba.druid.support.http.stat.WebAppStat; - public class WebStatFilterTest2 extends TestCase { public void test_lru() throws Exception { MockServletContext servletContext = new MockServletContext(); @@ -64,8 +58,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_0); } - ; - }; + }; filter.doFilter(request, response, chain); @@ -82,8 +75,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_0); } - ; - }; + }; filter.doFilter(request, response, chain); @@ -91,7 +83,6 @@ public class WebStatFilterTest2 extends TestCase { assertEquals(2, appStat.getSessionStat(session_0.getId()).getRequestCount()); } - // 第2个sesion请求1次 { MockHttpServletRequest request = new MockHttpServletRequest(); @@ -101,8 +92,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_1); } - ; - }; + }; filter.doFilter(request, response, chain); @@ -120,8 +110,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_2); } - ; - }; + }; filter.doFilter(request, response, chain); @@ -140,8 +129,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_3); } - ; - }; + }; filter.doFilter(request, response, chain); @@ -161,8 +149,7 @@ public class WebStatFilterTest2 extends TestCase { ((MockHttpServletRequest) request).setSession(session_4); } - ; - }; + }; filter.doFilter(request, response, chain); diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java index 1354ba8e8..2b95aaf14 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/WebStatFilterTest3_WebURIStatNull.java @@ -15,28 +15,19 @@ */ package com.alibaba.druid.bvt.support.http; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import java.util.Map; - +import com.alibaba.druid.filter.stat.StatFilterContext; +import com.alibaba.druid.support.http.WebStatFilter; +import com.alibaba.druid.support.http.stat.WebAppStat; +import com.alibaba.druid.support.http.stat.WebAppStatManager; +import com.alibaba.druid.support.http.stat.WebURIStat; import junit.framework.TestCase; - import org.springframework.mock.web.MockFilterChain; import org.springframework.mock.web.MockFilterConfig; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; -import com.alibaba.druid.filter.stat.StatFilterContext; -import com.alibaba.druid.support.http.WebStatFilter; -import com.alibaba.druid.support.http.stat.WebAppStat; -import com.alibaba.druid.support.http.stat.WebAppStatManager; -import com.alibaba.druid.support.http.stat.WebURIStat; +import java.util.Map; public class WebStatFilterTest3_WebURIStatNull extends TestCase { public void test_sessionStatDisable() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java index 0d6ea9abb..83c93d5f3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/http/util/IPRangeTest.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.bvt.support.http.util; -import junit.framework.TestCase; - import com.alibaba.druid.support.http.util.IPAddress; import com.alibaba.druid.support.http.util.IPRange; +import junit.framework.TestCase; public class IPRangeTest extends TestCase { public void test_ipRange_0() throws Exception { @@ -46,7 +45,6 @@ public class IPRangeTest extends TestCase { assertTrue(rang.isIPAddressInRange(new IPAddress("128.242.127.3"))); assertFalse(rang.isIPAddressInRange(new IPAddress("128.242.127.4"))); - } public void test_ipRange_2() throws Exception { @@ -54,13 +52,11 @@ public class IPRangeTest extends TestCase { assertTrue(rang.isIPAddressInRange(new IPAddress("10.16.200.0"))); assertTrue(rang.isIPAddressInRange(new IPAddress("10.16.200.255"))); - } public void test_ipRange_3() throws Exception { IPRange rang = new IPRange("0.0.0.0/0"); assertTrue(rang.isIPAddressInRange(new IPAddress("2.16.200.0"))); - } public void test_ipRange_4() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/ibatis/DruidDataSourceFactoryTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/ibatis/DruidDataSourceFactoryTest.java index a04dcf08a..b14e9b2a8 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/ibatis/DruidDataSourceFactoryTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/ibatis/DruidDataSourceFactoryTest.java @@ -1,12 +1,10 @@ package com.alibaba.druid.bvt.support.ibatis; -import java.util.Properties; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.ibatis.DruidDataSourceFactory; +import junit.framework.TestCase; +import java.util.Properties; public class DruidDataSourceFactoryTest extends TestCase { public void test_facttory() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java index a4e794479..eb610a415 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest.java @@ -15,16 +15,12 @@ */ package com.alibaba.druid.bvt.support.json; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.support.json.JSONParser; +import junit.framework.TestCase; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - - -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}"); diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java index 8ee5d985c..da1f19f5b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java @@ -1,14 +1,11 @@ package com.alibaba.druid.bvt.support.json; -import static org.junit.Assert.assertEquals; - -import java.util.List; -import java.util.Map; - -import junit.framework.TestCase; - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.util.List; +import java.util.Map; public class JSONParserTest2 extends TestCase { public void test_parse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java index 8480010af..c969048b9 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest3.java @@ -1,12 +1,11 @@ package com.alibaba.druid.bvt.support.json; -import java.util.LinkedHashMap; -import java.util.Map; - -import junit.framework.TestCase; - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.util.LinkedHashMap; +import java.util.Map; public class JSONParserTest3 extends TestCase { public void test_parse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest5.java b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest5.java index 35e6d3e34..29364e8e2 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest5.java @@ -1,9 +1,8 @@ package com.alibaba.druid.bvt.support.json; -import junit.framework.TestCase; - import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; public class JSONParserTest5 extends TestCase { public void test_parse() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java index 087ddf978..b3e8b3cd3 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/logging/JakartaCommonsLoggingImplTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.support.logging; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.JakartaCommonsLoggingImpl; +import junit.framework.TestCase; public class JakartaCommonsLoggingImplTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java index 865ca6e59..cfb7d7d99 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/logging/Jdk14LoggingImplTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.support.logging; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Jdk14LoggingImpl; +import junit.framework.TestCase; public class Jdk14LoggingImplTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java index 82656ba8b..92073cc88 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/logging/Log4jImplTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.support.logging; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log4jImpl; +import junit.framework.TestCase; public class Log4jImplTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java index 97f73752c..a914e057b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/logging/NoLoggingImplTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.support.logging; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.NoLoggingImpl; +import junit.framework.TestCase; public class NoLoggingImplTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java index cd70d3b4a..cdf0147d1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/logging/SLF4JImplTest.java @@ -1,12 +1,8 @@ package com.alibaba.druid.bvt.support.logging; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.SLF4JImpl; +import junit.framework.TestCase; public class SLF4JImplTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java index e43753524..30c0d6a24 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java index 8b62d8655..bb0511dfd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest2.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest2 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java index fcde1b85e..79fc0363e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest3.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest3 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java index 0e96122d3..dcf0abcf4 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest4.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest4 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java index 90a55871c..f7851651e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest5.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest5 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java index 0c154c51c..bbd31c4f1 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/odps/udf/ExportConditionsTest6.java @@ -1,10 +1,6 @@ package com.alibaba.druid.bvt.support.odps.udf; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.support.opds.udf.ExportConditions; - import junit.framework.TestCase; public class ExportConditionsTest6 extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java index 33fc44ba8..fc60f8f5e 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.support.profile; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.support.profile.ProfileEntryKey; import com.alibaba.druid.support.profile.ProfileEntryReqStat; import com.alibaba.druid.support.profile.Profiler; +import junit.framework.TestCase; public class ProfilerTest extends TestCase { public void test_profile() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java index 70bc4d621..2260fe4cd 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobCreatorTest.java @@ -1,15 +1,14 @@ package com.alibaba.druid.bvt.support.spring; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.spring.DruidLobCreator; +import junit.framework.TestCase; + import java.io.ByteArrayInputStream; import java.io.StringReader; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.spring.DruidLobCreator; - public class DruidLobCreatorTest extends TestCase { private DruidDataSource dataSource; @@ -18,7 +17,6 @@ public class DruidLobCreatorTest extends TestCase { dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); dataSource.setInitialSize(1); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java b/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java index aa83f2b94..3a0376309 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/support/spring/DruidLobHandlerTest.java @@ -1,14 +1,13 @@ package com.alibaba.druid.bvt.support.spring; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockBlob; import com.alibaba.druid.mock.MockClob; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.support.spring.DruidLobHandler; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; public class DruidLobHandlerTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java index 67d9a3c95..07e4acc65 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/DaemonThreadFactoryTest.java @@ -1,12 +1,7 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - - import com.alibaba.druid.util.DaemonThreadFactory; - +import junit.framework.TestCase; public class DaemonThreadFactoryTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java index c1972d916..8766ade62 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/DruidWebUtilsTest.java @@ -1,19 +1,13 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertNull; - +import com.alibaba.druid.util.DruidWebUtils; import junit.framework.TestCase; - import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockServletContext; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - -import com.alibaba.druid.util.DruidWebUtils; public class DruidWebUtilsTest extends TestCase { public void test_getContextPath_2_5() throws Exception { - new DruidWebUtils(); // + new DruidWebUtils(); MockServletContext context = new MockServletContext() { public int getMajorVersion() { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java index b2f5cc902..a2d540981 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java @@ -1,10 +1,7 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; - -import junit.framework.TestCase; - import com.alibaba.druid.util.Histogram; +import junit.framework.TestCase; public class HistogramTest extends TestCase { public void test_histo() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java index a91a4a07c..480badcd0 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JSONWriterTest.java @@ -1,25 +1,24 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.support.json.JSONWriter; +import junit.framework.TestCase; import java.io.PrintWriter; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import junit.framework.TestCase; - - -import com.alibaba.druid.support.json.JSONWriter; - -public class JSONWriterTest extends TestCase { - public void test_intArray() throws Exception { +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}); assertEquals("[1,2,3]", writer.toString()); } - public void test_throwable() throws Exception { + public void test_throwable() + throws Exception { JSONWriter writer = new JSONWriter(); writer.writeObject(new Throwable() { public void printStackTrace(PrintWriter s) { @@ -38,7 +37,7 @@ public class JSONWriterTest extends TestCase { public void test_localTime() { JSONWriter writer = new JSONWriter(); - LocalTime localTime = LocalTime.of(12, 0,1); + LocalTime localTime = LocalTime.of(12, 0, 1); writer.writeObject(localTime); assertEquals("\"12:00:01\"", writer.toString()); } @@ -46,10 +45,9 @@ public class JSONWriterTest extends TestCase { public void test_localDateTime() { JSONWriter writer = new JSONWriter(); LocalDate localDate = LocalDate.of(2023, 12, 21); - LocalTime localTime = LocalTime.of(12, 0,1); + LocalTime localTime = LocalTime.of(12, 0, 1); LocalDateTime localDateTime = LocalDateTime.of(localDate, localTime); writer.writeObject(localDateTime); assertEquals("\"2023-12-21 12:00:01\"", writer.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java index 42386dbc0..5902a8335 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java @@ -15,7 +15,11 @@ */ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockStatement; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.SQLException; import java.sql.SQLRecoverableException; @@ -23,13 +27,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.mock.MockStatement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class JdbcUtilsTest extends TestCase { private DruidDataSource dataSource; @@ -40,7 +37,6 @@ public class JdbcUtilsTest extends TestCase { dataSource.setTestOnBorrow(false); JdbcUtils.execute(dataSource, "CREATE TABLE user (id INT, name VARCHAR(40))"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java index a394f8b65..ad1e8f5c7 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest1.java @@ -1,13 +1,8 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.util.JdbcUtils; - +import junit.framework.TestCase; public class JdbcUtilsTest1 extends TestCase { public void test_jdbc() throws Exception { @@ -17,7 +12,6 @@ public class JdbcUtilsTest1 extends TestCase { public void test_jdbc_1() throws Exception { class MyClassLoader extends ClassLoader { } - ; MyClassLoader classLoader = new MyClassLoader(); assertTrue(JdbcUtils.createDriver(classLoader, MockDriver.class.getName()) instanceof MockDriver); @@ -29,7 +23,6 @@ public class JdbcUtilsTest1 extends TestCase { return null; } } - ; MyClassLoader classLoader = new MyClassLoader(); @@ -47,7 +40,6 @@ public class JdbcUtilsTest1 extends TestCase { return null; } } - ; MyClassLoader classLoader = new MyClassLoader(); diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java index b5ee363cc..3597449cc 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.utils; - import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; - public class JdbcUtilsTest2 extends TestCase { public void test_get_0() throws Exception { assertEquals(JdbcConstants.ORACLE_DRIVER, JdbcUtils.getDriverClassName("JDBC:oracle:")); diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java index a50581335..ae1c59383 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest_for_odps.java @@ -1,11 +1,7 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; - - import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; public class JdbcUtilsTest_for_odps extends TestCase { diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java index d4d325b01..61c1b948f 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java @@ -1,18 +1,12 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.sql.Driver; - import com.alibaba.druid.DbType; - import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; +import java.sql.Driver; + public class JdbcUtils_driver extends TestCase { public void test_null() throws Exception { assertNull(JdbcUtils.getDriverClassName(null)); @@ -56,17 +50,17 @@ public class JdbcUtils_driver extends TestCase { } public void test_log4jdbc_es() throws Exception { - assertEquals(JdbcConstants.ELASTIC_SEARCH - , JdbcUtils.getDbType("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster", null)); + assertEquals(JdbcConstants.ELASTIC_SEARCH, + JdbcUtils.getDbType("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster", null)); } public void test_log4jdbc_es_1() throws Exception { - assertEquals(JdbcConstants.ELASTIC_SEARCH - , JdbcUtils.getDbType("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster", "com.alibaba.xdriver.elastic.jdbc.ElasticDriver")); + assertEquals(JdbcConstants.ELASTIC_SEARCH, + JdbcUtils.getDbType("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster", "com.alibaba.xdriver.elastic.jdbc.ElasticDriver")); } public void test_log4jdbc_es_driver() throws Exception { - assertEquals(JdbcConstants.ELASTIC_SEARCH_DRIVER - , JdbcUtils.getDriverClassName("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster")); + assertEquals(JdbcConstants.ELASTIC_SEARCH_DRIVER, + JdbcUtils.getDriverClassName("jdbc:elastic://100.69.202.4:9300/tcbuyer?cluster.name=refund_cluster")); } } diff --git a/core/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java b/core/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java index 11aa21947..e616f086b 100644 --- a/core/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java +++ b/core/src/test/java/com/alibaba/druid/bvt/utils/LocalResultSetTest.java @@ -1,13 +1,7 @@ package com.alibaba.druid.bvt.utils; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import junit.framework.TestCase; - - import com.alibaba.druid.util.jdbc.LocalResultSet; +import junit.framework.TestCase; public class LocalResultSetTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java b/core/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java index 68eef30f0..330c2409f 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/CreateTableSetSchemaDemo.java @@ -7,14 +7,9 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import org.apache.commons.io.FileUtils; -import java.io.File; import java.util.List; -import java.util.Set; public class CreateTableSetSchemaDemo extends TestCase { public void test_schemaStat() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/Demo_for_issue_1815.java b/core/src/test/java/com/alibaba/druid/demo/sql/Demo_for_issue_1815.java index ca9db6c19..c21b12c78 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/Demo_for_issue_1815.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/Demo_for_issue_1815.java @@ -4,7 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java b/core/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java index 718647c54..1f6c8a1ff 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/ExportParameters.java @@ -1,16 +1,14 @@ package com.alibaba.druid.demo.sql; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; -import com.alibaba.druid.util.JdbcConstants; - import junit.framework.TestCase; +import java.util.List; + public class ExportParameters extends TestCase { public void test_export_parameters() throws Exception { String sql = "select * from t where id = 3 and name = 'abc'"; diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/Issue2038.java b/core/src/test/java/com/alibaba/druid/demo/sql/Issue2038.java index 130799362..8198779de 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/Issue2038.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/Issue2038.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitorAdapter; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.List; @@ -18,7 +17,6 @@ public class Issue2038 extends TestCase { List stmtList = SQLUtils.parseStatements(sql, DbType.db2); - SQLASTVisitor visitor = new DB2ASTVisitorAdapter() { public boolean visit(SQLUnionQuery x) { System.out.println("union"); diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java b/core/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java index 2f12da99c..57f694469 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/MySqlVisitorDemo.java @@ -6,9 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; -import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.HashMap; diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java b/core/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java index 5981bcaca..746eab6ec 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/OracleVisitorDemo.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLTableSource; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.HashMap; diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java b/core/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java index 49beeef1e..017101037 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/PGVisitorDemo.java @@ -5,9 +5,7 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.ast.statement.SQLTableSource; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitorAdapter; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import java.util.HashMap; diff --git a/core/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java b/core/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java index 01345b73d..d54ee419f 100644 --- a/core/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java +++ b/core/src/test/java/com/alibaba/druid/demo/sql/SchemaStatTest_odps.java @@ -7,11 +7,8 @@ import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.junit.Assert; import java.io.File; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java b/core/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java index e9eb6056f..04c34efd8 100644 --- a/core/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java +++ b/core/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java @@ -1,18 +1,16 @@ package com.alibaba.druid.filter.config; +import com.alibaba.druid.pool.DruidDataSourceFactory; +import com.alibaba.druid.util.JdbcUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; + import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import org.junit.Assert; - -import org.junit.After; -import org.junit.Before; - -import com.alibaba.druid.pool.DruidDataSourceFactory; -import com.alibaba.druid.util.JdbcUtils; - /** * @author Jonas Yang */ @@ -50,5 +48,4 @@ public class ConfigFileGenerator { file.delete(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java b/core/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java index b1dbe042a..fccbfde2a 100644 --- a/core/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java +++ b/core/src/test/java/com/alibaba/druid/kylin/KylinDriverSupportTest.java @@ -48,5 +48,4 @@ public class KylinDriverSupportTest { } } - } diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java b/core/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java index d0ae283fa..9ea0ed0bc 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.mysql; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; - public class MySqlBigTableTest extends TestCase { final int COUNT = 800; diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java b/core/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java index 323cea9aa..960a371c1 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySqlHexTest.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.mysql; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class MySqlHexTest extends TestCase { final int COUNT = 800; @@ -46,10 +45,8 @@ public class MySqlHexTest extends TestCase { dataSource.setPoolPreparedStatements(true); dataSource.setUsername(user); dataSource.setPassword(password); - } - public void test_0() throws Exception { Connection conn = dataSource.getConnection(); @@ -64,5 +61,4 @@ public class MySqlHexTest extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java b/core/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java index d941dda1f..58b34f433 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySqlInsertTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.mysql; import com.alibaba.druid.DbTestCase; -import junit.framework.TestCase; import java.sql.Connection; import java.sql.Statement; diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java b/core/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java index 3adea83ae..cca54020e 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySql_Connect_test.java @@ -1,15 +1,10 @@ package com.alibaba.druid.mysql; import com.alibaba.druid.DbTestCase; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.MySqlUtils; import com.alibaba.fastjson2.util.TypeUtils; -//import com.mysql.jdbc.ConnectionImpl; import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; import java.sql.Statement; /** @@ -31,7 +26,6 @@ public class MySql_Connect_test extends DbTestCase { System.out.println( MySqlUtils.getLastPacketReceivedTimeMs(conn)); - stmt.close(); // rs.close(); diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySql_Failover_test.java b/core/src/test/java/com/alibaba/druid/mysql/MySql_Failover_test.java index 5577e14b6..87337c816 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySql_Failover_test.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySql_Failover_test.java @@ -2,7 +2,6 @@ package com.alibaba.druid.mysql; import com.alibaba.druid.DbTestCase; import com.alibaba.druid.DbType; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; import java.sql.Connection; @@ -21,7 +20,6 @@ public class MySql_Failover_test extends DbTestCase { String createTableScript = JdbcUtils.getCreateTableScript(conn, DbType.mysql); System.out.println(createTableScript); - conn.close(); } } diff --git a/core/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java b/core/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java index d05ca5b4d..71b4c18d6 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MySql_getCreateTableScriptTest.java @@ -2,13 +2,9 @@ package com.alibaba.druid.mysql; import com.alibaba.druid.DbTestCase; import com.alibaba.druid.DbType; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.MySqlUtils; -import com.alibaba.druid.util.OracleUtils; import java.sql.Connection; -import java.util.List; /** * Created by wenshao on 23/07/2017. @@ -24,7 +20,6 @@ public class MySql_getCreateTableScriptTest extends DbTestCase { String createTableScript = JdbcUtils.getCreateTableScript(conn, DbType.mysql); System.out.println(createTableScript); - conn.close(); } } diff --git a/core/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java b/core/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java index 1b7702731..4dc76f54c 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MysqlLimitTest.java @@ -12,7 +12,6 @@ import java.util.List; * 类说明： */ public class MysqlLimitTest extends TestCase { - public void testLimit() { String sql = "select * from aaa limit 20exx"; SQLStatementParser statementParser = SQLParserUtils.createSQLStatementParser(sql, "mysql"); @@ -22,6 +21,5 @@ public class MysqlLimitTest extends TestCase { assertTrue(e.getMessage().contains("is not a number!")); } - } } diff --git a/core/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java b/core/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java index 955855e32..52e1fafae 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/MysqlVarantRefTest.java @@ -8,7 +8,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSetStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; -import com.alibaba.druid.util.JdbcConstants; import org.junit.Assert; import org.junit.Test; @@ -42,10 +41,8 @@ public class MysqlVarantRefTest { String text = SQLUtils.toSQLString(stmtList, DbType.mysql); Assert.assertEquals("SET @@session.tx_variables = 1, @@session.asdfsa = 2", text); - } - @Test public void test11() { String sql = "set session TRANSACTION ISOLATION LEVEL SERIALIZABLE"; @@ -82,7 +79,6 @@ public class MysqlVarantRefTest { Assert.assertTrue(!resultExpr2.isSession()); } - @Test public void test3() { String sql = "set tx_variables = 1, asdfsa = 2 "; @@ -97,7 +93,6 @@ public class MysqlVarantRefTest { Assert.assertTrue(!resultExpr2.isSession()); } - @Test public void test4() { String sql = "set tx_variables = 1,session asdfsa = 2 "; @@ -112,7 +107,6 @@ public class MysqlVarantRefTest { Assert.assertTrue(resultExpr2.isSession()); } - @Test public void test5() { String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3 "; @@ -129,7 +123,6 @@ public class MysqlVarantRefTest { Assert.assertTrue(resultExpr3.isSession()); } - @Test public void test6() { String sql = "set tx_variables = 1,session asdfsa = 2,session dfd = 3, sdfsdf =3,session adfa =9 "; @@ -149,5 +142,4 @@ public class MysqlVarantRefTest { Assert.assertTrue(!resultExpr4.isSession()); Assert.assertTrue(resultExpr5.isSession()); } - } diff --git a/core/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java b/core/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java index d4c2d8240..0be396957 100644 --- a/core/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java +++ b/core/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java @@ -1,15 +1,13 @@ package com.alibaba.druid.mysql; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - - public class QueryTimeoutTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java b/core/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java index 063529d0f..242007f0f 100644 --- a/core/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java +++ b/core/src/test/java/com/alibaba/druid/not_support/sql/mysql/MySqlSelectTest_69_mysql8_windows_function.java @@ -23,7 +23,6 @@ import com.alibaba.druid.sql.parser.SQLParserFeature; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcConstants; import java.util.List; diff --git a/core/src/test/java/com/alibaba/druid/not_support/sql/sqlserver/AntlrSqlServerTest.java b/core/src/test/java/com/alibaba/druid/not_support/sql/sqlserver/AntlrSqlServerTest.java index 542f8b1a5..3b86124f4 100644 --- a/core/src/test/java/com/alibaba/druid/not_support/sql/sqlserver/AntlrSqlServerTest.java +++ b/core/src/test/java/com/alibaba/druid/not_support/sql/sqlserver/AntlrSqlServerTest.java @@ -4,7 +4,6 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.wall.spi.MySqlWallProvider; import junit.framework.TestCase; import org.apache.commons.io.FileUtils; diff --git a/core/src/test/java/com/alibaba/druid/oceanbase/OceanBaseOracleXATest.java b/core/src/test/java/com/alibaba/druid/oceanbase/OceanBaseOracleXATest.java index 6e98601cd..0057fd2a3 100644 --- a/core/src/test/java/com/alibaba/druid/oceanbase/OceanBaseOracleXATest.java +++ b/core/src/test/java/com/alibaba/druid/oceanbase/OceanBaseOracleXATest.java @@ -11,6 +11,7 @@ import javax.sql.XAConnection; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -18,7 +19,6 @@ import java.sql.SQLException; @Ignore("OceanBase Oracle Mode is not open source") public class OceanBaseOracleXATest extends PoolTestCase { - private DruidXADataSource dataSource; private XAConnection xaConnection; private XAResource xaResource; @@ -43,7 +43,6 @@ public class OceanBaseOracleXATest extends PoolTestCase { " c2 NUMBER(10) NOT NULL,\n" + " PRIMARY KEY (c1)\n" + ");"); - } protected void tearDown() throws Exception { @@ -125,7 +124,7 @@ public class OceanBaseOracleXATest extends PoolTestCase { public void testObOracleXAWithError() throws Exception { connection.setAutoCommit(false); - + String gtridStr = "gtrid_test_wgs_ob_oracle_xa_with_error"; String bqualStr = "bqual_test_wgs_ob_oracle_xa_with_error"; @@ -155,7 +154,6 @@ public class OceanBaseOracleXATest extends PoolTestCase { } public void testObOracleXACheckAcAndError() throws Exception { - String gtridStr = "gtrid_test_wgs_ob_oracle_xa_check_ac_and_error"; String bqualStr = "bqual_test_wgs_ob_oracle_xa_check_ac_and_error"; @@ -178,7 +176,6 @@ public class OceanBaseOracleXATest extends PoolTestCase { } public void testObOracleXACheckAcAndEndError() throws Exception { - String gtridStr = "gtrid_test_wgs_ob_oracle_xa_check_ac_and_end_error_3"; String bqualStr = "bqual_test_wgs_ob_oracle_xa_check_ac_and_end_error_3"; @@ -187,7 +184,6 @@ public class OceanBaseOracleXATest extends PoolTestCase { Assert.assertTrue(connection.getAutoCommit()); xaResource.start(xid, XAResource.TMNOFLAGS); Assert.assertFalse(connection.getAutoCommit()); - // ps test PreparedStatement pstmt = null; ResultSet rs = null; diff --git a/core/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java b/core/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java index fcb0db7a7..82ad015e5 100644 --- a/core/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java +++ b/core/src/test/java/com/alibaba/druid/oracle/OracleKillSessionTest.java @@ -1,20 +1,16 @@ package com.alibaba.druid.oracle; import com.alibaba.druid.DbTestCase; -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 junit.framework.TestCase; import oracle.jdbc.driver.OracleConnection; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; public class OracleKillSessionTest extends DbTestCase { private static final Log LOG = LogFactory.getLog(OracleKillSessionTest.class); @@ -62,7 +58,6 @@ public class OracleKillSessionTest extends DbTestCase { } } - class Task implements Runnable { @Override public void run() { diff --git a/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java b/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java index 78d4b3096..b5e146498 100644 --- a/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java +++ b/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.oracle; import com.alibaba.druid.DbTestCase; -import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.Collections; -import java.util.List; /** * Created by wenshao on 23/07/2017. diff --git a/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest2.java b/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest2.java index 3ce8917dd..4b1f00e21 100644 --- a/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest2.java +++ b/core/src/test/java/com/alibaba/druid/oracle/Oracle_PSCacheTest2.java @@ -1,11 +1,15 @@ package com.alibaba.druid.oracle; import com.alibaba.druid.DbTestCase; -import com.alibaba.druid.benckmark.proxy.BenchmarkExecutor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.OracleUtils; -import java.sql.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; /** * Created by wenshao on 23/07/2017. @@ -47,7 +51,6 @@ public class Oracle_PSCacheTest2 extends DbTestCase { dropColumn(); JdbcUtils.close(conn); - } private void executeQuery(PreparedStatement pstmt) throws SQLException { diff --git a/core/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java b/core/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java index 9a075795e..f656beb62 100644 --- a/core/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java +++ b/core/src/test/java/com/alibaba/druid/oracle/Oracle_getCreateTableScriptTest.java @@ -1,13 +1,10 @@ package com.alibaba.druid.oracle; import com.alibaba.druid.DbTestCase; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.OracleUtils; import java.sql.Connection; -import java.util.List; /** * Created by wenshao on 23/07/2017. diff --git a/core/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java b/core/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java index 23443e21f..8d8183f95 100644 --- a/core/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/polardb/PolarDBDataSourceTest.java @@ -1,19 +1,17 @@ package com.alibaba.druid.polardb; +import com.alibaba.druid.DbType; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; - public class PolarDBDataSourceTest extends TestCase { private String jdbcUrl; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/polardb/PolarDBWallFilterTest.java b/core/src/test/java/com/alibaba/druid/polardb/PolarDBWallFilterTest.java index 1abdff247..cec3560be 100644 --- a/core/src/test/java/com/alibaba/druid/polardb/PolarDBWallFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/polardb/PolarDBWallFilterTest.java @@ -4,6 +4,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; +import org.junit.Assert; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,10 +13,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import junit.framework.TestCase; - -import org.junit.Assert; - public class PolarDBWallFilterTest extends TestCase { private DruidDataSource dataSource; @@ -84,4 +82,4 @@ public class PolarDBWallFilterTest extends TestCase { Assert.assertTrue(sql_filtered); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2DbTypeTest.java b/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2DbTypeTest.java index 5ffda3b10..fb250f084 100644 --- a/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2DbTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2DbTypeTest.java @@ -4,15 +4,13 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import org.junit.Assert; - public class PolarDB2DbTypeTest extends TestCase { private String jdbcUrl; private String jdbcUrl1; diff --git a/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2WallFilterTest.java b/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2WallFilterTest.java index 40578d6cc..5b5a58ab3 100644 --- a/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2WallFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/polardb2/PolarDB2WallFilterTest.java @@ -4,6 +4,8 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; +import junit.framework.TestCase; +import org.junit.Assert; import java.sql.Connection; import java.sql.PreparedStatement; @@ -11,10 +13,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import junit.framework.TestCase; - -import org.junit.Assert; - public class PolarDB2WallFilterTest extends TestCase { private DruidDataSource dataSource; @@ -83,4 +81,4 @@ public class PolarDB2WallFilterTest extends TestCase { Assert.assertTrue(sql_filtered); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/Case0.java b/core/src/test/java/com/alibaba/druid/pool/Case0.java index 9d74e8c0a..4a606bff1 100644 --- a/core/src/test/java/com/alibaba/druid/pool/Case0.java +++ b/core/src/test/java/com/alibaba/druid/pool/Case0.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.pool; -import java.sql.Connection; - -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.util.JMXUtils; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Connection; public class Case0 extends TestCase { private String jdbcUrl; diff --git a/core/src/test/java/com/alibaba/druid/pool/Case3.java b/core/src/test/java/com/alibaba/druid/pool/Case3.java index 7322499f4..e71078b9c 100644 --- a/core/src/test/java/com/alibaba/druid/pool/Case3.java +++ b/core/src/test/java/com/alibaba/druid/pool/Case3.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import org.junit.Assert; -import junit.framework.TestCase; - public class Case3 extends TestCase { public void test_1() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/pool/ClosePoolableStatementTest.java b/core/src/test/java/com/alibaba/druid/pool/ClosePoolableStatementTest.java index 8a9c39ed7..0e8adcf1a 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ClosePoolableStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ClosePoolableStatementTest.java @@ -1,11 +1,5 @@ package com.alibaba.druid.pool; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.sql.PreparedStatement; -import java.sql.SQLException; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -17,6 +11,12 @@ import org.springframework.jdbc.core.PreparedStatementSetter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import java.sql.PreparedStatement; +import java.sql.SQLException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * 测试开启PSCache后关闭DruidPooledPreparedStatement时的情况 * diff --git a/core/src/test/java/com/alibaba/druid/pool/CobarTest.java b/core/src/test/java/com/alibaba/druid/pool/CobarTest.java index 0a4e979c6..6a0323a74 100644 --- a/core/src/test/java/com/alibaba/druid/pool/CobarTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/CobarTest.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.pool; -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import java.sql.Connection; public class CobarTest extends TestCase { private String jdbcUrl; diff --git a/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java b/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java index 1a22bc62d..618cdfdf9 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.util.concurrent.CountDownLatch; -import junit.framework.TestCase; - -import org.junit.Assert; - public class ConcurrentTest extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java b/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java index c36b49256..c51723333 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java +++ b/core/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; + import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; -import junit.framework.TestCase; - public class ConcurrentTest2 extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/pool/DBCPTest.java b/core/src/test/java/com/alibaba/druid/pool/DBCPTest.java index 8efb3fac7..e45d2412c 100644 --- a/core/src/test/java/com/alibaba/druid/pool/DBCPTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/DBCPTest.java @@ -15,14 +15,12 @@ */ package com.alibaba.druid.pool; -import java.sql.CallableStatement; -import java.sql.Connection; - +import com.alibaba.druid.mock.MockDriver; import junit.framework.TestCase; - import org.apache.commons.dbcp.BasicDataSource; -import com.alibaba.druid.mock.MockDriver; +import java.sql.CallableStatement; +import java.sql.Connection; public class DBCPTest extends TestCase { public void test_dbcp() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pool/DruidDataSourceTest.java b/core/src/test/java/com/alibaba/druid/pool/DruidDataSourceTest.java index c81991aaa..825ede161 100644 --- a/core/src/test/java/com/alibaba/druid/pool/DruidDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/DruidDataSourceTest.java @@ -3,7 +3,6 @@ package com.alibaba.druid.pool; import junit.framework.TestCase; public class DruidDataSourceTest extends TestCase { - /** * 验证将mysql jdbc url中可能出现的密码信息全都掩码的效果，目前会出现的密码key名有password,password1,password2,password3,trustCertificateKeyStorePassword,clientCertificateKeyStorePassword * @see ... @@ -81,7 +80,5 @@ public class DruidDataSourceTest extends TestCase { System.out.println("原始url=" + url); System.out.println("掩码后url=" + urlNew); assertEquals(expectedUrl, urlNew); - - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/DruidTest.java b/core/src/test/java/com/alibaba/druid/pool/DruidTest.java index 4fe6bb381..45747e5a2 100644 --- a/core/src/test/java/com/alibaba/druid/pool/DruidTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/DruidTest.java @@ -109,5 +109,4 @@ public class DruidTest { fileWriter.flush(); fileWriter.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java b/core/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java index ad3c77ddf..083df311a 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ExeptionSorterTest.java @@ -28,7 +28,6 @@ public class ExeptionSorterTest extends TestCase { assertEquals(dataSource.getExceptionSorter().getClass(), MySqlExceptionSorter.class); } - public static class MyDriver extends Driver { /** * Construct a new driver and register it with DriverManager diff --git a/core/src/test/java/com/alibaba/druid/pool/MemTest.java b/core/src/test/java/com/alibaba/druid/pool/MemTest.java index bbaeb38e0..a8633dbdf 100644 --- a/core/src/test/java/com/alibaba/druid/pool/MemTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/MemTest.java @@ -1,18 +1,6 @@ package com.alibaba.druid.pool; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.PriorityQueue; -import java.util.Properties; -import java.util.Stack; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.Vector; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/core/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java b/core/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java index 03e9b0f73..3c0751c3a 100644 --- a/core/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java @@ -15,11 +15,10 @@ */ package com.alibaba.druid.pool; -import java.sql.Connection; - +import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; import junit.framework.TestCase; -import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; +import java.sql.Connection; public class MySqlValdConnectionTest extends TestCase { private String jdbcUrl; diff --git a/core/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java b/core/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java index 0f83ae838..1c41addc7 100644 --- a/core/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/OracleConnectionPoolDataSourceTest.java @@ -18,7 +18,6 @@ package com.alibaba.druid.pool; import junit.framework.TestCase; import oracle.jdbc.pool.OracleConnectionPoolDataSource; - public class OracleConnectionPoolDataSourceTest extends TestCase { public void test_oraclePool() throws Exception { OracleConnectionPoolDataSource pool = new OracleConnectionPoolDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java b/core/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java index 8839e2d7c..29bc0c5bc 100644 --- a/core/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java @@ -1,15 +1,12 @@ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - - public class QueryTimeoutTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java b/core/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java index 30bcbf600..1eb58c806 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.TestCase; - -import com.alibaba.druid.util.JdbcUtils; - public class TestDruidOraclePreparedStatement extends TestCase { private String jdbcUrl; private String user; @@ -86,6 +85,7 @@ public class TestDruidOraclePreparedStatement extends TestCase { stmt.setInt(1, 1); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process the result set } rs.close(); diff --git a/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java b/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java index 9feec96b3..4832e7e03 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.mock.MockDriver; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.util.concurrent.CountDownLatch; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; - public class TestIdle3_Concurrent_MaxActive extends TestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java b/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java index e0a8ab0d7..44013e0e2 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java @@ -15,19 +15,18 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.mock.MockDriver; +import junit.framework.TestCase; +import org.junit.Assert; + +import javax.management.ObjectName; + import java.lang.management.ManagementFactory; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.ObjectName; - -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; - public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { private MockDriver driver; private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pool/TestMockPerf.java b/core/src/test/java/com/alibaba/druid/pool/TestMockPerf.java index 2c2d3a486..7c9da9eaf 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestMockPerf.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestMockPerf.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.Statement; import java.util.concurrent.CountDownLatch; -import junit.framework.TestCase; - public class TestMockPerf extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pool/TestMySql.java b/core/src/test/java/com/alibaba/druid/pool/TestMySql.java index 7cfe0b552..bbc571fbd 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestMySql.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestMySql.java @@ -1,9 +1,9 @@ package com.alibaba.druid.pool; -import java.sql.Connection; - import junit.framework.TestCase; +import java.sql.Connection; + public class TestMySql extends TestCase { private DruidDataSource dataSource = new DruidDataSource(); diff --git a/core/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java b/core/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java index 5e326aa25..1240002c6 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java @@ -15,19 +15,18 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.OracleUtils; +import junit.framework.TestCase; +import oracle.jdbc.OracleConnection; +import oracle.jdbc.OraclePreparedStatement; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; -import oracle.jdbc.OracleConnection; -import oracle.jdbc.OraclePreparedStatement; - -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.OracleUtils; - public class TestOraclePreparedStatement extends TestCase { private String jdbcUrl; private String user; @@ -53,9 +52,7 @@ public class TestOraclePreparedStatement extends TestCase { Statement stmt = conn.createStatement(); stmt.execute("DROP TABLE T"); - ; stmt.execute("CREATE TABLE T (FID INT, FNAME VARCHAR2(4000), FDESC CLOB)"); - ; stmt.close(); conn.close(); @@ -78,7 +75,7 @@ public class TestOraclePreparedStatement extends TestCase { // // PreparedStatement stmt = conn.prepareStatement(SQL); // stmt.close(); -// +// // PreparedStatement stmt2 = conn.prepareStatement(SQL); // stmt2.close(); // } @@ -92,6 +89,7 @@ public class TestOraclePreparedStatement extends TestCase { stmt.setInt(1, 327); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); @@ -104,6 +102,7 @@ public class TestOraclePreparedStatement extends TestCase { stmt.setInt(1, 327); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); diff --git a/core/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java b/core/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java index 3fb7c2fdd..0dbb9045b 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java @@ -15,17 +15,16 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.pool.vendor.OracleExceptionSorter; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; import java.util.concurrent.CountDownLatch; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.vendor.OracleExceptionSorter; -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.support.json.JSONUtils; - public class TestOracle_DruidDataSource extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java b/core/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java index d72d55eb3..bd6c68a50 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -22,10 +25,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Random; -import junit.framework.TestCase; - -import com.alibaba.druid.util.JdbcUtils; - public class TestPoolStatement extends TestCase { private DruidDataSource dataSource; @@ -81,6 +80,7 @@ public class TestPoolStatement extends TestCase { stmt.setLong(1, new Random().nextInt(1000 * 100)); ResultSet rs = stmt.executeQuery(); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); diff --git a/core/src/test/java/com/alibaba/druid/pool/TestRollBack.java b/core/src/test/java/com/alibaba/druid/pool/TestRollBack.java index 160dcd5d4..41c36fe0e 100644 --- a/core/src/test/java/com/alibaba/druid/pool/TestRollBack.java +++ b/core/src/test/java/com/alibaba/druid/pool/TestRollBack.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.util.JdbcUtils; - public class TestRollBack extends TestCase { private DruidDataSource dataSource; @@ -113,5 +112,4 @@ public class TestRollBack extends TestCase { conn.close(); } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/Test_C2.java b/core/src/test/java/com/alibaba/druid/pool/Test_C2.java index 8a4c6ce8d..1b21b4389 100644 --- a/core/src/test/java/com/alibaba/druid/pool/Test_C2.java +++ b/core/src/test/java/com/alibaba/druid/pool/Test_C2.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.util.concurrent.CountDownLatch; -import junit.framework.TestCase; - -import org.junit.Assert; - public class Test_C2 extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/pool/Test_kyline.java b/core/src/test/java/com/alibaba/druid/pool/Test_kyline.java index 2e86aece3..b56304d6a 100644 --- a/core/src/test/java/com/alibaba/druid/pool/Test_kyline.java +++ b/core/src/test/java/com/alibaba/druid/pool/Test_kyline.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.DriverManager; -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"; diff --git a/core/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java b/core/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java index c83eb6d23..9988fd04e 100644 --- a/core/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java +++ b/core/src/test/java/com/alibaba/druid/pool/bonecp/TestLRU.java @@ -15,21 +15,19 @@ */ package com.alibaba.druid.pool.bonecp; -import java.lang.reflect.Field; -import java.sql.Connection; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.jolbox.bonecp.BoneCPDataSource; import com.jolbox.bonecp.ConnectionHandle; import com.mchange.v2.c3p0.ComboPooledDataSource; import com.mchange.v2.c3p0.impl.NewProxyConnection; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + +import java.lang.reflect.Field; +import java.sql.Connection; public class TestLRU extends TestCase { public void f_test_boneCP() throws Exception { @@ -109,5 +107,4 @@ public class TestLRU extends TestCase { return conn.unwrap(MockConnection.class); } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java b/core/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java index 1fc37fa8a..9f6407ddd 100644 --- a/core/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java +++ b/core/src/test/java/com/alibaba/druid/pool/bonecp/TestPSCache.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.pool.bonecp; -import java.lang.reflect.Field; -import java.sql.Connection; -import java.sql.PreparedStatement; - -import javax.sql.DataSource; - -import junit.framework.TestCase; - -import org.apache.commons.dbcp.BasicDataSource; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; @@ -33,6 +23,14 @@ import com.jolbox.bonecp.ConnectionHandle; import com.mchange.v2.c3p0.ComboPooledDataSource; import com.mchange.v2.c3p0.impl.NewProxyConnection; import com.mchange.v2.c3p0.impl.NewProxyPreparedStatement; +import junit.framework.TestCase; +import org.apache.commons.dbcp.BasicDataSource; + +import javax.sql.DataSource; + +import java.lang.reflect.Field; +import java.sql.Connection; +import java.sql.PreparedStatement; public class TestPSCache extends TestCase { public void test_boneCP() throws Exception { @@ -123,5 +121,4 @@ public class TestPSCache extends TestCase { return conn.unwrap(MockConnection.class); } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java b/core/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java index bd5d79fba..535040624 100644 --- a/core/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java +++ b/core/src/test/java/com/alibaba/druid/pool/dbcp/Test0.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.pool.dbcp; -import java.sql.Connection; - +import com.alibaba.druid.mock.MockDriver; import junit.framework.TestCase; - import org.apache.commons.dbcp.BasicDataSource; -import com.alibaba.druid.mock.MockDriver; +import java.sql.Connection; public class Test0 extends TestCase { public void test_idle() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java b/core/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java index d3094d18a..82a802d0b 100644 --- a/core/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java +++ b/core/src/test/java/com/alibaba/druid/pool/dbcp/TestIdleForKylin.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.pool.dbcp; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; public class TestIdleForKylin extends TestCase { public void test_idle() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pool/demo/Demo0.java b/core/src/test/java/com/alibaba/druid/pool/demo/Demo0.java index 3a97108b0..75e64d2f1 100644 --- a/core/src/test/java/com/alibaba/druid/pool/demo/Demo0.java +++ b/core/src/test/java/com/alibaba/druid/pool/demo/Demo0.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.pool.demo; -import java.sql.Connection; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JMXUtils; +import junit.framework.TestCase; + +import java.sql.Connection; public class Demo0 extends TestCase { private String jdbcUrl; diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java index f382d522f..832962273 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/HighAvailableDataSourceTest.java @@ -8,7 +8,8 @@ import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class HighAvailableDataSourceTest { @Test @@ -46,4 +47,4 @@ public class HighAvailableDataSourceTest { assertTrue(count[1] > 0); haDataSource.destroy(); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java b/core/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java index a13695c8b..798dce061 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/MockDataSource.java @@ -4,6 +4,7 @@ import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.WrapperAdapter; import javax.sql.DataSource; + import java.io.PrintWriter; import java.sql.Connection; import java.sql.SQLException; diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java index e77e31b0b..e7e4ba425 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/node/FileNodeListenerTest.java @@ -125,4 +125,4 @@ public class FileNodeListenerTest { assertEquals("prefix1.foo", event.getNodeName()); assertEquals("jdbc:derby:memory:foo1;create=true", event.getUrl()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java index c397b5162..a9d957548 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/node/NodeEventTest.java @@ -39,4 +39,4 @@ public class NodeEventTest { assertEquals("foo_username", event.getUsername()); assertEquals("foo_password", event.getPassword()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java index 71bbc6669..832f9b063 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/node/PoolUpdaterTest.java @@ -8,6 +8,7 @@ import org.junit.Before; import org.junit.Test; import javax.sql.DataSource; + import java.util.HashMap; import java.util.Map; @@ -164,4 +165,4 @@ public class PoolUpdaterTest { event.setType(NodeEventTypeEnum.ADD); updater.addNode(event); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java index c16eace14..69796e40b 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeListenerTest.java @@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java index 8f2c66fad..68f98b532 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/node/ZookeeperNodeRegisterTest.java @@ -104,4 +104,4 @@ public class ZookeeperNodeRegisterTest { assertEquals(node.getUsername(), properties.getProperty(node.getPrefix() + "username")); assertEquals(node.getPassword(), properties.getProperty(node.getPrefix() + "password")); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java index 4b5cddbf3..26a4f03a6 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/selector/BaseRandomDataSourceSelectorTest.java @@ -6,6 +6,7 @@ import org.junit.After; import org.junit.Before; import javax.sql.DataSource; + import java.util.HashMap; import java.util.Map; diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java index 7910bd9ed..d2203c074 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelectorTest.java @@ -11,7 +11,8 @@ import javax.sql.DataSource; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class NamedDataSourceSelectorTest { private Map dataSourceMap; @@ -62,4 +63,4 @@ public class NamedDataSourceSelectorTest { selector.setDefaultName("bar"); assertEquals("bar", ((MockDataSource) selector.get()).getName()); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java index 2b15133f0..6ae2cc3e9 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorSingleDataSourceTest.java @@ -1,17 +1,16 @@ package com.alibaba.druid.pool.ha.selector; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - 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 org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class RandomDataSourceSelectorSingleDataSourceTest { private static final Log LOG = LogFactory diff --git a/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java b/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java index 9ff92577a..f926c5eaf 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelectorWithFilterTest.java @@ -10,6 +10,7 @@ import org.junit.Before; import org.junit.Test; import javax.sql.DataSource; + import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; diff --git a/core/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java b/core/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java index 24cf53ddb..6967f06b5 100644 --- a/core/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java @@ -1,10 +1,9 @@ package com.alibaba.druid.pool.oceanbase; -import java.sql.Connection; - +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; -import com.alibaba.druid.pool.DruidDataSource; +import java.sql.Connection; public class OBTest extends TestCase { private DruidDataSource dataSource; @@ -33,5 +32,4 @@ public class OBTest extends TestCase { conn.close(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java b/core/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java index 850fcad48..4b10c82f0 100644 --- a/core/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java +++ b/core/src/test/java/com/alibaba/druid/pool/oracle/DruidDataSourceTest_oracle3.java @@ -1,16 +1,14 @@ package com.alibaba.druid.pool.oracle; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; - -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker; - /** * 这个场景测试minIdle > maxActive * @@ -49,6 +47,7 @@ public class DruidDataSourceTest_oracle3 extends TestCase { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -61,6 +60,7 @@ public class DruidDataSourceTest_oracle3 extends TestCase { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); @@ -73,6 +73,7 @@ public class DruidDataSourceTest_oracle3 extends TestCase { Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT 1 FROM DUAL"); while (rs.next()) { + // Process result set rows } rs.close(); stmt.close(); diff --git a/core/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java b/core/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java index 018c341dc..20bbceafb 100644 --- a/core/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java +++ b/core/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java @@ -1,16 +1,14 @@ package com.alibaba.druid.pool.oracle; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.CountDownLatch; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class QueryTimeoutTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java b/core/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java index ec16c742f..82be1ed09 100644 --- a/core/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java +++ b/core/src/test/java/com/alibaba/druid/pool/postgres/PG_500_connection_Test.java @@ -1,5 +1,11 @@ package com.alibaba.druid.pool.postgres; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.vendor.PGValidConnectionChecker; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -8,14 +14,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.vendor.PGValidConnectionChecker; -import com.alibaba.druid.util.JdbcUtils; - -import junit.framework.TestCase; - /** * 这个场景测试minIdle > maxActive * @@ -62,6 +60,7 @@ public class PG_500_connection_Test extends TestCase { stmt = conn.createStatement(); rs = stmt.executeQuery("SELECT 1"); while (rs.next()) { + // Process result set rows } } catch (SQLException ex) { // skip @@ -79,6 +78,5 @@ public class PG_500_connection_Test extends TestCase { executor.submit(task); } endLatch.await(); - } } diff --git a/core/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java b/core/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java index 3708f132c..1e06acc8c 100644 --- a/core/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java +++ b/core/src/test/java/com/alibaba/druid/pool/qa/MySqlTestSuit.java @@ -1,16 +1,15 @@ package com.alibaba.druid.pool.qa; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class MySqlTestSuit extends TestCase { private DruidDataSource dataSource; @@ -87,5 +86,4 @@ public class MySqlTestSuit extends TestCase { e.printStackTrace(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java index 388456e25..ee27ec297 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java +++ b/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java @@ -15,6 +15,12 @@ */ package com.alibaba.druid.pool.ui; +import com.alibaba.druid.TestUtil; +import com.alibaba.druid.pool.DruidDataSource; + +import javax.management.ObjectName; +import javax.swing.*; + import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.EventQueue; @@ -33,18 +39,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.ObjectName; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextField; -import javax.swing.SpringLayout; - -import com.alibaba.druid.TestUtil; -import com.alibaba.druid.pool.DruidDataSource; - public class DruidDataSourceUIManager extends JFrame { private static final long serialVersionUID = 1L; @@ -649,6 +643,5 @@ public class DruidDataSourceUIManager extends JFrame { manager.setVisible(true); } }); - } } diff --git a/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java b/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java index 92665e137..02afef47e 100644 --- a/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java +++ b/core/src/test/java/com/alibaba/druid/pool/ui/DruidDataStatusPanel.java @@ -15,25 +15,25 @@ */ package com.alibaba.druid.pool.ui; -import java.awt.GridLayout; -import java.util.HashMap; -import java.util.Map; - import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; +import java.awt.GridLayout; +import java.util.HashMap; +import java.util.Map; + public class DruidDataStatusPanel extends JPanel { private static final long serialVersionUID = 1L; private final Map fields = new HashMap(); - private final String[] fieldNames = new String[]{ // + 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" // + "CreateTimespanNano", "DestroyCount", + "ConnectCount", "ConnectErrorCount", "CloseCount", "RecycleCount", "ActiveCount", + "PoolingCount", "IdleCheckCount", "UI_GettingCount", "UI_GetCount", "UI_ReleaseCount", + "UI_ExecutingCount" }; public DruidDataStatusPanel() { @@ -58,5 +58,4 @@ public class DruidDataStatusPanel extends JPanel { public Map getFields() { return fields; } - } diff --git a/core/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java b/core/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java index 13ba6dc64..715b66f0d 100644 --- a/core/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java +++ b/core/src/test/java/com/alibaba/druid/postgresql/PGLimitTest.java @@ -11,7 +11,7 @@ public class PGLimitTest { * @param args */ public static void main(String[] args) { - DbType dbType = JdbcConstants.POSTGRESQL;// "postgresql"; + 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, @@ -19,7 +19,5 @@ public class PGLimitTest { System.out.println("sqlLimit == " + sqlLimit); String sqlCount = com.alibaba.druid.sql.PagerUtils.count(sql, dbType); System.out.println("sqlCount == " + sqlCount); - } - } diff --git a/core/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java b/core/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java index b3cf5ea4a..1acbc3447 100644 --- a/core/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java +++ b/core/src/test/java/com/alibaba/druid/postgresql/PGUpsertTest.java @@ -15,5 +15,4 @@ public class PGUpsertTest extends TestCase { SQLStatement statement = parser.parseStatement(); Assert.assertEquals(targetSql, statement.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java b/core/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java index 1a968ab40..571210023 100644 --- a/core/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java +++ b/core/src/test/java/com/alibaba/druid/postgresql/PG_getCreateTableScriptTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.postgresql; import com.alibaba.druid.DbTestCase; -import com.alibaba.druid.benckmark.proxy.BenchmarkExecutor; import com.alibaba.druid.pool.vendor.PGValidConnectionChecker; import com.alibaba.druid.util.JdbcConstants; import com.alibaba.druid.util.JdbcUtils; @@ -9,7 +8,6 @@ import com.alibaba.druid.util.JdbcUtils; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import java.util.Collections; import java.util.List; /** @@ -32,7 +30,7 @@ public class PG_getCreateTableScriptTest extends DbTestCase { //System.out.println(createTableScript); 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/core/src/test/java/com/alibaba/druid/proxy/DruidDriverTest.java b/core/src/test/java/com/alibaba/druid/proxy/DruidDriverTest.java index b6360aa4c..b6cd1beaa 100644 --- a/core/src/test/java/com/alibaba/druid/proxy/DruidDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/proxy/DruidDriverTest.java @@ -17,62 +17,59 @@ public class DruidDriverTest { //non driver property , getRawDriverClassName() = convert(jdbc:sqlite:) = org.sqlite.JDBC url = "jdbc:wrap-jdbc:jdbc:sqlite:"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , JdbcConstants.SQLITE_DRIVER); - Assert.assertEquals(config.getRawUrl() , "jdbc:sqlite:"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), JdbcConstants.SQLITE_DRIVER); + Assert.assertEquals(config.getRawUrl(), "jdbc:sqlite:"); //have driver property , getRawDriverClassName() = driver1 , getRawUrl()=jdbc:sqlite: url = "jdbc:wrap-jdbc:driver=driver1:filters=com.alibaba.druid.filter.stat.StatFilter,com.alibaba.druid.filter.encoding.EncodingConvertFilter:name=name1:jmx=true:jdbc:sqlite:"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , "driver1"); - Assert.assertEquals(config.getName() , "name1"); - Assert.assertEquals(config.isJmxOption() , true); - Assert.assertEquals(config.getRawUrl() , "jdbc:sqlite:"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), "driver1"); + Assert.assertEquals(config.getName(), "name1"); + Assert.assertEquals(config.isJmxOption(), true); + Assert.assertEquals(config.getRawUrl(), "jdbc:sqlite:"); //non driver property , getRawDriverClassName() = convert(jdbc:sqlite:) = org.sqlite.JDBC url = "jdbc:wrap-jdbc:name=name2:jmx=true:jdbc:sqlite:"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getName() , "name2"); - Assert.assertEquals(config.getRawDriverClassName() , JdbcConstants.SQLITE_DRIVER); - Assert.assertEquals(config.getRawUrl() , "jdbc:sqlite:"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getName(), "name2"); + Assert.assertEquals(config.getRawDriverClassName(), JdbcConstants.SQLITE_DRIVER); + Assert.assertEquals(config.getRawUrl(), "jdbc:sqlite:"); //mix properties order, have driver property , getRawDriverClassName() = driver2 url = "jdbc:wrap-jdbc:jmx=false:name=name2:filters=com.alibaba.druid.filter.stat.StatFilter:driver=driver2:jdbc:sqlite:"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , "driver2"); - Assert.assertEquals(config.getName() , "name2"); - Assert.assertEquals(config.isJmxOption() , false); - Assert.assertEquals(config.getRawUrl() , "jdbc:sqlite:"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), "driver2"); + Assert.assertEquals(config.getName(), "name2"); + Assert.assertEquals(config.isJmxOption(), false); + Assert.assertEquals(config.getRawUrl(), "jdbc:sqlite:"); //mix properties order, have driver property , getRawDriverClassName() = driver2 url = "jdbc:wrap-jdbc:jmx=true:name=name2:filters=com.alibaba.druid.filter.stat.StatFilter:driver=driver2:jdbc:sqlite:"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , "driver2"); - Assert.assertEquals(config.getName() , "name2"); - Assert.assertEquals(config.isJmxOption() , true); - Assert.assertEquals(config.getRawUrl() , "jdbc:sqlite:"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), "driver2"); + Assert.assertEquals(config.getName(), "name2"); + Assert.assertEquals(config.isJmxOption(), true); + Assert.assertEquals(config.getRawUrl(), "jdbc:sqlite:"); url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=basicType:jdbc:derby:memory:basicTypeTestDB;create=true"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , "org.apache.derby.jdbc.EmbeddedDriver"); - Assert.assertEquals(config.getName() , "basicType"); - Assert.assertEquals(config.isJmxOption() , false); - Assert.assertEquals(config.getRawUrl() , "jdbc:derby:memory:basicTypeTestDB;create=true"); + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), "org.apache.derby.jdbc.EmbeddedDriver"); + Assert.assertEquals(config.getName(), "basicType"); + Assert.assertEquals(config.isJmxOption(), false); + Assert.assertEquals(config.getRawUrl(), "jdbc:derby:memory:basicTypeTestDB;create=true"); url = "jdbc:wrap-jdbc:jmx=true:filters=default,commonLogging,log4j:name=mydsqlds:jdbc:mysql://127.0.0.1:3306/test?useInformationSchema=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=utf-8"; properties = new Properties(); - config = DruidDriver.parseConfig(url,properties); - Assert.assertEquals(config.getRawDriverClassName() , "com.mysql.cj.jdbc.Driver"); - Assert.assertEquals(config.getName() , "mydsqlds"); - Assert.assertEquals(config.isJmxOption() , true); - Assert.assertEquals(config.getRawUrl() , "jdbc:mysql://127.0.0.1:3306/test?useInformationSchema=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=utf-8"); - - - + config = DruidDriver.parseConfig(url, properties); + Assert.assertEquals(config.getRawDriverClassName(), "com.mysql.cj.jdbc.Driver"); + Assert.assertEquals(config.getName(), "mydsqlds"); + Assert.assertEquals(config.isJmxOption(), true); + Assert.assertEquals(config.getRawUrl(), "jdbc:mysql://127.0.0.1:3306/test?useInformationSchema=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&characterEncoding=utf-8"); } } diff --git a/core/src/test/java/com/alibaba/druid/proxy/TestOracle.java b/core/src/test/java/com/alibaba/druid/proxy/TestOracle.java index 3fc85d075..5c6705a7f 100644 --- a/core/src/test/java/com/alibaba/druid/proxy/TestOracle.java +++ b/core/src/test/java/com/alibaba/druid/proxy/TestOracle.java @@ -15,18 +15,17 @@ */ package com.alibaba.druid.proxy; +import com.alibaba.druid.stat.JdbcStatManager; +import com.alibaba.druid.support.json.JSONUtils; +import junit.framework.TestCase; + +import javax.management.openmbean.TabularData; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; -import javax.management.openmbean.TabularData; - -import junit.framework.TestCase; - -import com.alibaba.druid.stat.JdbcStatManager; -import com.alibaba.druid.support.json.JSONUtils; - public class TestOracle extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java b/core/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java index 08531b1fd..a7152260d 100644 --- a/core/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java +++ b/core/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.proxy.demo; +import com.alibaba.druid.stat.JdbcStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.DriverManager; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.stat.JdbcStatManager; - public class Demo1 extends TestCase { public void test_0() throws Exception { JdbcStatManager.getInstance().reset(); // 重置计数器 diff --git a/core/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java b/core/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java index b07ff73ef..27d23903d 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java +++ b/core/src/test/java/com/alibaba/druid/pvt/filter/wall/WallPerformanceTest_1.java @@ -15,11 +15,10 @@ */ package com.alibaba.druid.pvt.filter.wall; -import junit.framework.TestCase; - import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import junit.framework.TestCase; /** * @author yako 2014年10月21日 下午5:07:37 @@ -42,7 +41,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "SELECT plaza_id,plaza_name,plaza_logo,plaza_address,plaza_averageMoney,plaza_discount,2*ASIN(SQRT(POW(SIN(PI()*(22.54605355-plaza_latitude)/360),2)+COS(PI()*22.54605355/180)*COS(plaza_latitude*PI()/180)*POW(SIN(PI()*(114.02597366-plaza_longitude)/360),2)))*6378.137*1000 as jl FROM plaza where 2*ASIN(SQRT(POW(SIN(PI()*(22.54605355-plaza_latitude)/360),2)+COS(PI()*22.54605355/180)*COS(plaza_latitude*PI()/180)*POW(SIN(PI()*(114.02597366-plaza_longitude)/360),2)))*6378.137*1000<= 5000 and plaza_check=2 ORDER BY jl ASC"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--1--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--1--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -50,7 +49,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "SELECT TECH_ID, NAME, ALIAS_NAME, GENDER, MOBILE, PASSWORD, CITY_NAME, ADDRESS, LONGITUDE, LATITUDE, HEAD_PORTRAIT_URL, ID_CARD, ID_BEFORE_URL, ID_BACK_URL, DATE_FORMAT(CREATE_TIME, '%Y%m%d%H%i%s'), DATE_FORMAT(OPERATION_TIME, '%Y%m%d%H%i%s'), STATE, REMARK, CONVERT(SERVICE_RANGE,char), CONVERT(round(DISTANCE),char), CONVERT(INTEGRAL,char), CONVERT(SUCCESS_MONEY,char), CONVERT(success_orders,char), CONVERT(round(success_money/success_orders),char) avg_money, PRODUCT_NUMS from ( SELECT a.*, b.INTEGRAL, b.SUCCESS_MONEY, b.success_orders, acos(sin('NULL' * PI() / 180) * sin(latitude * PI() / 180) + cos('NULL' * PI() / 180) * cos(latitude * PI() / 180) * cos('NULL' * PI() / 180 - longitude * PI() / 180)) * 6371000 distance, CONVERT(count(c.tech_id),char) PRODUCT_NUMS FROM tech_info a, tech_account_book b, tech_service_product_info c,tech_service_type_info d WHERE a.latitude <= ('NULL' * PI() / 180 + 'NULL' / 6371000) * 180 / PI() AND a.latitude >= ('NULL' * PI() / 180 - 'NULL' / 6371000) * 180 / PI() AND a.longitude <= ('NULL' * PI() / 180 + ASIN(SIN('NULL' / 6371000) / COS('NULL' * PI() / 180))) * 180 / PI() AND a.longitude >= ('NULL' * PI() / 180 - ASIN(SIN('NULL' / 6371000) / COS('NULL' * PI() / 180))) * 180 / PI() AND a.tech_id = b.tech_id and a.tech_id=c.tech_id and c.state=1 and a.tech_id=d.tech_id and d.service_type_id='NULL' and c.service_type_id='NULL' GROUP BY a.tech_id) T order by distance limit 0,20"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--2--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--2--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -58,7 +57,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "create table EcOrder736ad4 ( [St_flag] int not null default(0), [Cust_flag] int not null default(0), [Pj_id] bigint not null default(0), [Store_id] bigint not null default(0), [Rtn] int not null default(0), [Ec_type] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ec_nick] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Cust_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ship_to_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ship_to] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ec_order_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ec_order_line_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ec_ref_order_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Ec_ref_order_line_no] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Sku_key] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Sku_cd] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Cust_name] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [District] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Address] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [City] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Province] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Country] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Zip] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Phone] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Mobile] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''), [Email] nvarchar(4000) COLLATE Chinese_PRC_CI_AS not null default(''))"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.SQL_SERVER)); for (int i = 0; i < times; i++) { - System.out.println("--3--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--3--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -66,7 +65,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "select top 1 '210002428' as currentMaterialid, inventory.warehouse,commoditysummary.materialname,commoditysummary.goodsname,inventory.customname,inboundnbr,commoditysummary.costunitprice from inventory left join commoditysummary on commoditysummary.materialname=inventory.materialid and commoditysummary.customname=inventory.customname where (materialid='210002428' or CommoditySummary.KeyWord = (select keyword from commoditysummarykeyword where materialid = '210002428' and bak in('苏泊尔官方旗舰店') )) and inventory.customname in('苏泊尔官方旗舰店') and warehouse not in(select warehousename from logisticswarehouse where warehousetype ='物流宝仓' ) and dynamicsum >= 1 union select top 1 '运费' as currentMaterialid, inventory.warehouse,commoditysummary.materialname,commoditysummary.goodsname,inventory.customname,inboundnbr,commoditysummary.costunitprice from inventory left join commoditysummary on commoditysummary.materialname=inventory.materialid and commoditysummary.customname=inventory.customname where (materialid='运费' or CommoditySummary.KeyWord = (select keyword from commoditysummarykeyword where materialid = '运费' and bak in('苏泊尔官方旗舰店') )) and inventory.customname in('苏泊尔官方旗舰店') and warehouse not in(select warehousename from logisticswarehouse where warehousetype ='物流宝仓' ) and dynamicsum >= 1 union select top 1 'ZPCGJ002' as currentMaterialid, inventory.warehouse,commoditysummary.materialname,commoditysummary.goodsname,inventory.customname,inboundnbr,commoditysummary.costunitprice from inventory left join commoditysummary on commoditysummary.materialname=inventory.materialid and commoditysummary.customname=inventory.customname where (materialid='ZPCGJ002' or CommoditySummary.KeyWord = (select keyword from commoditysummarykeyword where materialid = 'ZPCGJ002' and bak in('苏泊尔官方旗舰店') )) and inventory.customname in('苏泊尔官方旗舰店') and warehouse not in(select warehousename from logisticswarehouse where warehousetype ='物流宝仓' ) and dynamicsum >= 1 union select top 1 'ZPXWB001' as currentMaterialid, inventory.warehouse,commoditysummary.materi"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.SQL_SERVER)); for (int i = 0; i < times; i++) { - System.out.println("--4--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--4--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -74,7 +73,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "select a.Store_id,a.Ec_order_no,a.Ec_order_line_no,a.Pj_id, Usm_sku_id=isnull(usm.Sku_id,0),Cu_unit_id=isnull(cu.Unit_id,0),Sp_unit_id=isnull(sp.Unit_id,0), oh.Order_head_id,oh.Order_status,oh.Order_no,Cust_id=oh.Cust_id,Ship_to_id=oh.Ship_to_id,Od_ref_order_id=oh.Ref_order_id, oh.add_name,oh.Phone,oh.Fax,oh.Country,oh.Province,oh.City,oh.Area_or_loc,oh.Address_1,oh.Zip,oh.Address_2, ol.Order_line_id,ol.Order_line_status,Sku_id=ol.Sku_id,P_discount_price=ol.P_discount_price,ol.Dn_if_id,Od_ref_order_line_id=ol.Ref_order_line_id from [EcOrder55be71] a left join Unit cu with(nolock) on cu.Pj_id = a.Pj_id and cu.Unit_no = a.Cust_no and cu.Unit_status>=0 and Unit_type='CU' left join Unit_sku_master usm with(nolock) on usm.Orig_unit_id=a.Store_id and usm.Unit_sku_cd=a.Sku_key and usm.Status>=0 and Io_type='IN' left join Unit sp with(nolock) on a.Store_id = sp.Parent_unit_id and a.Ship_to_no = sp.Unit_no and sp.Unit_status>=0 left join Scm_order_head oh with(nolock) on oh.Rtn=a.Rtn and oh.Orig_order_no=a.Ec_order_no and oh.Supp_id=a.Store_id and oh.import_type='IFS' and oh.Order_status>=0 left join Scm_order_line ol with(nolock) on ol.Order_head_id = oh.Order_head_id and ol.Order_line_no=a.Ec_order_line_no and ol.Order_line_status >= 0 order by a.Store_id,a.Ec_order_no,a.Ec_order_line_no,ol.create_time"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.SQL_SERVER)); for (int i = 0; i < times; i++) { - System.out.println("--5--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--5--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -82,7 +81,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "select shoplocati0_.shop_location_id as shop1_25_0_, promotionp1_.id as id9_1_, shoplocati0_.latitude as latitude25_0_, shoplocati0_.longitude as longitude25_0_, shoplocati0_.remark as remark25_0_, shoplocati0_.shop_id as shop5_25_0_, promotionp1_.product_id as product5_9_1_, promotionp1_.remark as remark9_1_, promotionp1_.save_time as save3_9_1_, promotionp1_.status as status9_1_ from eShop.shop_location shoplocati0_, eShop.promotion_product promotionp1_, eShop.v_product_positive_ratio vproductpo2_, eShop.v_product_evaluate_num vproductev3_, eShop.product product4_, eShop.shop shop5_ where promotionp1_.product_id=product4_.product_id and shoplocati0_.shop_id=shop5_.shop_id and shoplocati0_.shop_id=product4_.shop_id and promotionp1_.product_id=vproductpo2_.product_id and promotionp1_.product_id=vproductev3_.product_id and shop5_.status='1' and product4_.status='1' and promotionp1_.status='1' and vproductev3_.total_num>='10' and acos(sin(36.686290*3.1415/180)*sin(shoplocati0_.latitude*3.1415/180)+cos(36.686290*3.1415/180)*cos(shoplocati0_.latitude*3.1415/180)*cos(117.080900*3.1415/180-(shoplocati0_.longitude*3.1415/180)))*6380<=15.000000 and vproductpo2_.positive_ratio>=1.000000 order by acos(sin(36.686290*3.1415/180)*sin(shoplocati0_.latitude*3.1415/180)+cos(36.686290*3.1415/180)*cos(shoplocati0_.latitude*3.1415/180)*cos(117.080900*3.1415/180-(shoplocati0_.longitude*3.1415/180)))*6380 asc, promotionp1_.id desc limit 10"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--6--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--6--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -90,7 +89,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "select * from( select a.*,(select WorkOrderName from WorkOrder where WorkOrder.WorkOrderID=a.WorkOrderID) as WorkOrderName, (select TrainName from Train where Train.TrainID=a.TrainID) as TrainName, (select MemberName from MemberInfo where MemberInfo.MemberID=a.MemberID) as MemberName, (select UserName from SYS_UserInfo where SYS_UserInfo.UserID=a.TaskCreaterID) as UserInfo_UserName, (select ProcessName from SYS_ProcessDefine where SYS_ProcessDefine.ProcessID=a.ProcessID) as ProcessName, (select ShopName from shop where shop.ShopID=a.ShopID) as ShopName, (select UserName from SYS_UserInfo where SYS_UserInfo.UserID=a.AssessID) as Assess_UserName, (select UserName from SYS_UserInfo where SYS_UserInfo.UserID=a.Executuserid) as Executuser_UserName, ROW_NUMBER() OVER(order by a.TaskID desc,a.TaskCreateDate asc) as row from [Task] as a where AccountID=48 and (( a.TaskExecutorID = 12 and a.TaskStatus !='2' and IFValid=1 ) or a.TaskID in (select a.TaskID from [Task] as a ,WorkOLDTaskMould as b where a.TaskMouldOLDID=b.TaskMouldOLDID and a.TaskExecutorID=0 and a.TaskStatus=0 and ( b.Deal_User like '%,12,%' or b.Deal_Dept like '%,18,%' or b.Deal_Dept like '%,53,%' or b.Deal_Dept like '%,129,%' or b.Deal_Dept like '%,151,%' or b.Deal_Dept like '%,79,%' or b.Deal_Dept like '%,116,%' or b.Deal_Dept like '%,117,%' or b.Deal_Post like '%,52,%' or b.Deal_Post like '%,6,%' or b.Deal_Post like '%,12,%' or b.Deal_Post like '%,13,%' or b.Deal_Post like '%,30,%' or b.Deal_Post like '%,64,%' or b.Deal_Post like '%,56,%' or b.Deal_Group like '%,6,%' or b.Deal_Group like '%,12,%' or b.Deal_Group like '%,14,%' ))) ) a where row between 1 and 100"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--7--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--7--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -98,7 +97,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "SELECT pr.order_no,pr.receipt_no,pr.datetime, pt.type_name,pr.amount,u.username FROM payments_record pr inner join tasks t on t.order_no= pr.order_no inner join orders o on o.order_number=t.order_no inner join pay_type pt on pt.id=pr.payment_type inner join users u on u.id=pr.operator_id where t.order_no=o.order_number and o.order_status=4 and t.task_status=6 and o.station_collection=1 and pr.client_status='success' and pr.operator_id=29 and (pt.id=1 or pt.id=2) and pr.datetime between '2014-10-22 00:00:00' and '2014-10-22 23:59:59'"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--8--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--8--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -106,7 +105,7 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "SELECT COUNT(*) FROM ReportSalesOrderList t0 LEFT JOIN ReportProductList t1 ON t0.SkuCode = t1.SkuCode WHERE (ShopId = 0 OR 0 = 0) AND (ShopOrderNo = '' OR '' = '') AND (CustomerName LIKE CONCAT ('%', '', '%') OR '' = '')AND (t0.OrderType = '0' OR '0' = '0')AND ( (t0.orderStatus >0 AND t0.orderStatus <=45 AND 10 = 20 ) OR (t0.orderStatus >45 AND t0.orderStatus <= 60 AND 10 = 30 ) OR (t0.orderStatus >60 AND t0.orderStatus <= 70 AND 10 = 40 ) OR (t0.orderStatus >70 AND t0.orderStatus <= 90 AND 10 = 50 )OR 10 = 10 ) AND ( ('30' = '10' AND t0.ShopPayTime >= '2014-10-01 00:00:00 ' AND t0.ShopPayTime < '2014-10-23 00:00:00 ' ) OR ('30' = '20' AND t0.DeliveryTime >= '2014-10-01 00:00:00 ' AND t0.DeliveryTime < '2014-10-23 00:00:00 ' ) OR ('30' = '30' AND t0.EndTime >= '2014-10-01 00:00:00 ' AND t0.EndTime < '2014-10-23 00:00:00 ' ) OR ('30' = '40' AND t0.RefundTime >= '2014-10-01 00:00:00 ' AND t0.RefundTime < '2014-10-23 00:00:00 ' ) ) GROUP BY t0.OrderNo HAVING ( GROUP_CONCAT(t1.ItemCode) LIKE CONCAT ('%', '', '%') OR GROUP_CONCAT(t1.ItemName) LIKE CONCAT ('%', '', '%') OR GROUP_CONCAT(t1.SkuCode) LIKE CONCAT ('%', '', '%') OR GROUP_CONCAT(DISTINCT t1.SkuName) LIKE CONCAT ('%', '', '%') OR '' = '') AND (GROUP_CONCAT(t1.BrandName) LIKE CONCAT ('%', '', '%') Or '' = '')AND ('10' = '10' OR ('10'= '20' AND GROUP_CONCAT(t0.RefundType) IS NULL ) OR('10' = '30' AND GROUP_CONCAT(t0.RefundType) != ''))"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--9--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--9--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -114,35 +113,35 @@ public class WallPerformanceTest_1 extends TestCase { String sql = "insert into saleB_63ceb9cbab074f3f91dda04a3fe79a57_z (billid,tblastmodate,seller_CourierId,r3_billtype,tags_color,seller_momo,buyer_momo,buyer_province,buyer_city,buyer_area,buyer_mail_code,post_fee,ele_shopname,ele_sordercode,type,codfee,codfamt,ExpressCode,PointFee,invoiceType,invoicePayer,invoiceContent) select 719685,Modified,0,isnull(r3_billtype,''),isnull(SellerFlag,''),isnull(SellerMemo,''),isnull(BuyerMessage,''),isnull(ReceiverState,''),isnull(ReceiverCity,''),isnull(ReceiverDistrict,''),isnull(ReceiverZip,''),isnull(PostFee,''),isnull(Title,''),isnull(Tid,''),isnull(type,''),isnull(codfee,''),isnull(ExpressAgencyFee,''),isnull(Ext5,''),isnull(PointFee,''),isnull(Ext1,''),isnull(Ext2,''),isnull(Ext3,'') from taobao_order where r3_billid=837361947087831 and shopConfigid=2"; // System.out.println("sql: \n" + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL)); for (int i = 0; i < times; i++) { - System.out.println("--10--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--10--use time：" + this.evaluate(sql, "mssql", 1000L)); } } public void test_11() throws Exception { String sql = "create view tempview_CTbillflow_material as SELECT billflow.billtype, billflow.billid, billflow.itemno, billflow.MaterialID, billflow.quantity, billflow.ioflag, billflow.storeid, content.CT1, content.CT2 FROM billflow INNER JOIN content ON billflow.billtype = content.tableid AND billflow.billid = content.billid AND billflow.itemno = content.itemno WHERE billflow.billflowid>0 and billflow.storeid<>1 and billflow.storeid<>2 and billflow.storeid<>3 and billflow.storeid<>5 and billflow.storeid<>7 and billflow.storeid<>8 and billflow.storeid<>9 and billflow.storeid<>10 and billflow.storeid<>11 and (1=2 or billflow.MaterialID=893 or billflow.MaterialID=904 or billflow.MaterialID=80 or billflow.MaterialID=8 or billflow.MaterialID=8) UNION ALL SELECT billflow.billtype, billflow.billid, billflow.itemno, billflow.MaterialID, billflow.quantity, billflow.ioflag, billflow.storeid, content.CT1, content.CT2 FROM billflow INNER JOIN content ON billflow.billtype = content.tableid AND billflow.billid = content.billid AND billflow.itemno = content.itemno inner join Material on billflow.MaterialID=Material.MaterialID and Material.feature=1 WHERE billflow.billflowid< 0 and (1=2 or content.CT1<>'' or content.CT2<>'') and billflow.storeid<>1 and billflow.storeid<>2 and billflow.storeid<>3 and billflow.storeid<>5 and billflow.storeid<>7 and billflow.storeid<>8 and billflow.storeid<>9 and billflow.storeid<>10 and billflow.storeid<>11 and (1=2 or billflow.MaterialID=893 or billflow.MaterialID=904 or billflow.MaterialID=80 or billflow.MaterialID=8 or billflow.MaterialID=8) UNION ALL SELECT billflow.billtype, billflow.billid, billflow.itemno, billflow.MaterialID, billflow.quantity, billflow.ioflag, billflow.storeid, content.CT1, content.CT2 FROM billflow INNER JOIN content ON billflow.billtype = content.tableid AND billflow.billid = content.billid AND billflow.itemno = content.itemno inner join Material on billflow.MaterialID=Material.MaterialID and Mater"; for (int i = 0; i < times; i++) { - System.out.println("--11--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--11--use time：" + this.evaluate(sql, "mssql", 1000L)); } } public void test_12() throws Exception { String sql = "select b.*,c.county,c.shangquan,c.naturevar,directionsvar,fitmentvar,c.villagename,c.titles,c.address,c.smallpath,c.imgcount,c.hall,c.layer,c.totallayer,c.tags from (select * from(select rentid,room,updatetime,minarea,minprice,avgprice,labelstate,unixdate,isimgs,zongdianid,mendianid,zongdianval,mendianval, Row_Number() over(order by minarea desc,rentid desc) as RowID from house_rent_search_kunshan where isaudit=0 and isdel=0 and state=0 and countyid=@countyid and nature=@nature and directions=@directions) as a where RowID>=1 and RowID<=20) as b inner join house_rent_list_kunshan as c on b.rentid=c.rentid order by minarea desc,rentid desc"; for (int i = 0; i < times; i++) { - System.out.println("--12--use time：" + this.evaluate(sql, "mssql", 1000l)); + System.out.println("--12--use time：" + this.evaluate(sql, "mssql", 1000L)); } } public void test_13() throws Exception { String sql = "SELECT COUNT(*) cn1 FROM KUKA_SystemOrder WHERE 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 AND 1=1 "; for (int i = 0; i < times; i++) { - System.out.println("--13--use time：" + this.evaluate(sql, "mssql", 1000l)); + 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++) { - System.out.println("--14--use time：" + this.evaluate(sql, "mysql", 1000l)); + System.out.println("--14--use time：" + this.evaluate(sql, "mysql", 1000L)); } } @@ -187,5 +186,4 @@ public class WallPerformanceTest_1 extends TestCase { } } - } diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java index 157820318..246481c61 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest.java @@ -1,5 +1,9 @@ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.SQLException; import java.util.concurrent.CountDownLatch; @@ -7,12 +11,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.TestCase; - -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; - public class AsyncCloseTest extends TestCase { protected DruidDataSource dataSource; private ExecutorService connExecutor; @@ -29,7 +27,6 @@ public class AsyncCloseTest extends TestCase { connExecutor = Executors.newFixedThreadPool(100); closeExecutor = Executors.newFixedThreadPool(100); - } protected void tearDown() throws Exception { @@ -96,7 +93,5 @@ public class AsyncCloseTest extends TestCase { closeLatch.await(); Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(16, dataSource.getPoolingCount()); - - } } diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java index 68524040a..c90bf5ffb 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest1.java @@ -1,5 +1,14 @@ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.Log4jImpl; +import com.alibaba.druid.support.logging.NoLoggingImpl; +import junit.framework.TestCase; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.junit.Assert; + import java.lang.reflect.Field; import java.sql.Connection; import java.sql.SQLException; @@ -8,17 +17,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.Log4jImpl; -import com.alibaba.druid.support.logging.NoLoggingImpl; - -import junit.framework.TestCase; - public class AsyncCloseTest1 extends TestCase { protected DruidDataSource dataSource; private ExecutorService connExecutor; @@ -52,7 +50,6 @@ public class AsyncCloseTest1 extends TestCase { connExecutor = Executors.newFixedThreadPool(128); closeExecutor = Executors.newFixedThreadPool(128); - } protected void tearDown() throws Exception { @@ -124,7 +121,5 @@ public class AsyncCloseTest1 extends TestCase { closeLatch.await(); Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(16, dataSource.getPoolingCount()); - - } } diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java index 326fcde81..5b3e3bc5f 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest2.java @@ -1,18 +1,5 @@ package com.alibaba.druid.pvt.pool; -import java.lang.reflect.Field; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.junit.Assert; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; @@ -21,8 +8,19 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.Log4jImpl; import com.alibaba.druid.support.logging.NoLoggingImpl; - import junit.framework.TestCase; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.junit.Assert; + +import java.lang.reflect.Field; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; public class AsyncCloseTest2 extends TestCase { protected DruidDataSource dataSource; @@ -49,7 +47,6 @@ public class AsyncCloseTest2 extends TestCase { noLoggingImpl.setErrorEnabled(false); } - dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); dataSource.setAsyncCloseConnectionEnable(true); @@ -69,7 +66,6 @@ public class AsyncCloseTest2 extends TestCase { connExecutor = Executors.newFixedThreadPool(128); closeExecutor = Executors.newFixedThreadPool(128); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java index 956bfc481..da4c6b287 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/AsyncCloseTest3.java @@ -1,19 +1,5 @@ package com.alibaba.druid.pvt.pool; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Field; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.junit.Assert; - import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; @@ -23,8 +9,20 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.Log4jImpl; import com.alibaba.druid.support.logging.NoLoggingImpl; - import junit.framework.TestCase; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.junit.Assert; + +import java.lang.management.ManagementFactory; +import java.lang.reflect.Field; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; public class AsyncCloseTest3 extends TestCase { protected DruidDataSource dataSource; @@ -77,7 +75,6 @@ public class AsyncCloseTest3 extends TestCase { connExecutor = Executors.newFixedThreadPool(2); closeExecutor = Executors.newFixedThreadPool(2); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java b/core/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java index 613fc404c..020a0e01b 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/DiscardTest.java @@ -1,5 +1,13 @@ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.mock.MockStatementBase; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; @@ -7,21 +15,12 @@ import java.sql.Statement; import java.util.Properties; import java.util.concurrent.CountDownLatch; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockStatementBase; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; -import com.alibaba.druid.util.JdbcUtils; - public class DiscardTest extends TestCase { private DruidDataSource dataSource; private MockDriver driver; - private volatile boolean failed = false; + private volatile boolean failed; protected void setUp() throws Exception { driver = new MockDriver() { diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java b/core/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java index 2305f7220..b5026e17a 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/Large10ConcurrentTest.java @@ -1,5 +1,12 @@ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + +import javax.sql.DataSource; + import java.lang.management.ManagementFactory; import java.sql.Connection; import java.sql.SQLException; @@ -9,15 +16,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicLong; -import javax.sql.DataSource; - -import org.junit.Assert; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - -import junit.framework.TestCase; - public class Large10ConcurrentTest extends TestCase { private DruidDataSource[] dataSources; private ScheduledExecutorService scheduler; diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java b/core/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java index 74c7ada1b..261005bc9 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/Large10KTest.java @@ -1,15 +1,14 @@ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.sql.Connection; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class Large10KTest extends TestCase { private DruidDataSource[] dataSources; private ScheduledExecutorService scheduler; diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java b/core/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java index 8d897f80b..c7b1aaa70 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/PSCacheTest5.java @@ -1,15 +1,13 @@ package com.alibaba.druid.pvt.pool; -import java.sql.Connection; -import java.sql.PreparedStatement; - -import org.junit.Assert; - -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockPreparedStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Connection; +import java.sql.PreparedStatement; public class PSCacheTest5 extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java b/core/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java index 07a7be2d5..cdc073687 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/TestAbondon.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.pvt.pool; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; public class TestAbondon extends TestCase { private DruidDataSource dataSource; @@ -35,7 +34,6 @@ public class TestAbondon extends TestCase { dataSource.setTimeBetweenEvictionRunsMillis(10); dataSource.setMinEvictableIdleTimeMillis(300 * 1000); dataSource.setUrl("jdbc:mock:xxx"); - } protected void tearDown() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java b/core/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java index 3311bc587..5693029ce 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/TestConcurrent.java @@ -15,18 +15,17 @@ */ package com.alibaba.druid.pvt.pool; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.concurrent.CountDownLatch; - -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DataSourceMonitorable; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.concurrent.CountDownLatch; public class TestConcurrent extends TestCase { private MockDriver driver; diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java index e94a46728..6f3157033 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent.java @@ -15,18 +15,17 @@ */ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestIdle3_Concurrent extends TestCase { protected void setUp() throws Exception { DruidDataSourceStatManager.clear(); @@ -135,6 +134,5 @@ public class TestIdle3_Concurrent extends TestCase { int max = count > dataSource.getMaxActive() ? dataSource.getMaxActive() : count; Assert.assertEquals(max, driver.getConnections().size()); - } } diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java index 0adbfafde..b86493809 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.pvt.pool; -import java.sql.Connection; -import java.util.Random; -import java.util.concurrent.CountDownLatch; - -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Connection; +import java.util.Random; +import java.util.concurrent.CountDownLatch; public class TestIdle3_Concurrent_MaxActive extends TestCase { private MockDriver driver; @@ -48,7 +47,6 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - } protected void tearDown() throws Exception { @@ -91,7 +89,6 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { conn.close(); } // Assert.assertEquals(2, dataSource.getPoolingCount()); - } private void concurrent(final int threadCount) throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java index d6817cc54..de76643a7 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/core/src/test/java/com/alibaba/druid/pvt/pool/TestIdle3_Concurrent_Starvation.java @@ -15,6 +15,12 @@ */ package com.alibaba.druid.pvt.pool; +import com.alibaba.druid.mock.MockDriver; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -22,13 +28,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestIdle3_Concurrent_Starvation extends TestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -51,7 +50,6 @@ public class TestIdle3_Concurrent_Starvation extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - } protected void tearDown() throws Exception { @@ -92,7 +90,6 @@ public class TestIdle3_Concurrent_Starvation extends TestCase { conn.close(); } // Assert.assertEquals(2, dataSource.getPoolingCount()); - } private void concurrent(final int threadCount) throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java b/core/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java index 87c301f5e..578554096 100644 --- a/core/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java +++ b/core/src/test/java/com/alibaba/druid/pvt/support/monitor/MonitorDaoJdbcImplTest.java @@ -1,11 +1,5 @@ package com.alibaba.druid.pvt.support.monitor; -import java.util.Collections; -import java.util.Date; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.JdbcSqlStatValue; import com.alibaba.druid.support.monitor.MonitorClient; @@ -13,10 +7,11 @@ import com.alibaba.druid.support.monitor.dao.MonitorDaoJdbcImpl; import com.alibaba.druid.support.monitor.dao.MonitorDaoJdbcImpl.BeanInfo; import com.alibaba.druid.support.monitor.dao.MonitorDaoJdbcImpl.FieldInfo; import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.wall.WallFunctionStatValue; -import com.alibaba.druid.wall.WallProviderStatValue; -import com.alibaba.druid.wall.WallSqlStatValue; -import com.alibaba.druid.wall.WallTableStatValue; +import junit.framework.TestCase; + +import java.util.Collections; +import java.util.Date; +import java.util.List; public class MonitorDaoJdbcImplTest extends TestCase { private DruidDataSource dataSource; diff --git a/core/src/test/java/com/alibaba/druid/spring/ISequenceService.java b/core/src/test/java/com/alibaba/druid/spring/ISequenceService.java index 1a257c603..a477b2055 100644 --- a/core/src/test/java/com/alibaba/druid/spring/ISequenceService.java +++ b/core/src/test/java/com/alibaba/druid/spring/ISequenceService.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.spring; - public interface ISequenceService { long nextValue(); } diff --git a/core/src/test/java/com/alibaba/druid/spring/IUserDao.java b/core/src/test/java/com/alibaba/druid/spring/IUserDao.java index 695d67ea2..894578f4b 100644 --- a/core/src/test/java/com/alibaba/druid/spring/IUserDao.java +++ b/core/src/test/java/com/alibaba/druid/spring/IUserDao.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.spring; - public interface IUserDao { void addUser(User user); } diff --git a/core/src/test/java/com/alibaba/druid/spring/IUserService.java b/core/src/test/java/com/alibaba/druid/spring/IUserService.java index 6f752bad4..fe36c1ca6 100644 --- a/core/src/test/java/com/alibaba/druid/spring/IUserService.java +++ b/core/src/test/java/com/alibaba/druid/spring/IUserService.java @@ -15,7 +15,6 @@ */ package com.alibaba.druid.spring; - public interface IUserService { void addUser(User user); } diff --git a/core/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java b/core/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java index 801b1a16f..bf56cf961 100644 --- a/core/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java +++ b/core/src/test/java/com/alibaba/druid/spring/MBeanServerFactoryBean.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.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 { @@ -33,5 +33,4 @@ public class MBeanServerFactoryBean implements FactoryBean { public boolean isSingleton() { return true; } - } diff --git a/core/src/test/java/com/alibaba/druid/spring/SequenceDao.java b/core/src/test/java/com/alibaba/druid/spring/SequenceDao.java index a09eab896..4a6cf3ce5 100644 --- a/core/src/test/java/com/alibaba/druid/spring/SequenceDao.java +++ b/core/src/test/java/com/alibaba/druid/spring/SequenceDao.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.spring; +import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport; + import java.util.HashMap; import java.util.Map; -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(); diff --git a/core/src/test/java/com/alibaba/druid/spring/SequenceService.java b/core/src/test/java/com/alibaba/druid/spring/SequenceService.java index af66509c8..cfe990bbb 100644 --- a/core/src/test/java/com/alibaba/druid/spring/SequenceService.java +++ b/core/src/test/java/com/alibaba/druid/spring/SequenceService.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.spring; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - public class SequenceService implements SequenceServiceMBean, ISequenceService { private Lock lock = new ReentrantLock(); @@ -93,5 +93,4 @@ public class SequenceService implements SequenceServiceMBean, ISequenceService { lock.unlock(); } } - } diff --git a/core/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java b/core/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java index 758dedf9b..c5044d06e 100644 --- a/core/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java +++ b/core/src/test/java/com/alibaba/druid/spring/SequenceServiceMBean.java @@ -15,6 +15,5 @@ */ package com.alibaba.druid.spring; - public interface SequenceServiceMBean { } diff --git a/core/src/test/java/com/alibaba/druid/spring/User.java b/core/src/test/java/com/alibaba/druid/spring/User.java index 4ff71089a..3d690c14e 100644 --- a/core/src/test/java/com/alibaba/druid/spring/User.java +++ b/core/src/test/java/com/alibaba/druid/spring/User.java @@ -42,5 +42,4 @@ public class User { public void setName(String name) { this.name = name; } - } diff --git a/core/src/test/java/com/alibaba/druid/spring/UserService.java b/core/src/test/java/com/alibaba/druid/spring/UserService.java index c4109fc70..baf50f266 100644 --- a/core/src/test/java/com/alibaba/druid/spring/UserService.java +++ b/core/src/test/java/com/alibaba/druid/spring/UserService.java @@ -43,5 +43,4 @@ public class UserService implements IUserService { public void setSequenceService(ISequenceService sequenceService) { this.sequenceService = sequenceService; } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/DB2Test.java b/core/src/test/java/com/alibaba/druid/sql/DB2Test.java index 360a4ef66..31475d142 100644 --- a/core/src/test/java/com/alibaba/druid/sql/DB2Test.java +++ b/core/src/test/java/com/alibaba/druid/sql/DB2Test.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.sql; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.visitor.DB2OutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class DB2Test extends TestCase { protected String output(List stmtList) { @@ -40,6 +39,6 @@ public class DB2Test extends TestCase { if ("false".equals(outputProperty)) { return; } -// System.out.println(text); + // System.out.println(text); } } diff --git a/core/src/test/java/com/alibaba/druid/sql/DeleteTest.java b/core/src/test/java/com/alibaba/druid/sql/DeleteTest.java index 051019a61..ec884f1dc 100644 --- a/core/src/test/java/com/alibaba/druid/sql/DeleteTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/DeleteTest.java @@ -1,21 +1,16 @@ package com.alibaba.druid.sql; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement; -import com.alibaba.druid.sql.parser.SQLStatementParser; import org.junit.Test; +import java.util.List; /** * @author lingo * @date 2025/8/7 12:11 * @description */ public class DeleteTest { - @Test public void test() { String sql = "delete a from users a force index(a1) where id < 10"; diff --git a/core/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java b/core/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java index 96b9eee63..befeb4cc5 100644 --- a/core/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/KeywordsMySqlTest.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.sql.parser.Keywords; +import junit.framework.TestCase; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import junit.framework.TestCase; - -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/core/src/test/java/com/alibaba/druid/sql/MysqlTest.java b/core/src/test/java/com/alibaba/druid/sql/MysqlTest.java index 7d745cce6..2bffff1e2 100644 --- a/core/src/test/java/com/alibaba/druid/sql/MysqlTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/MysqlTest.java @@ -44,7 +44,6 @@ public class MysqlTest extends TestCase { System.out.println(text); } - protected void parseTrue(String sql, String except) { SQLStatement statement = SQLUtils.parseSingleMysqlStatement(sql); Assert.assertEquals(except, SQLUtils.toMySqlString(statement)); @@ -58,5 +57,4 @@ public class MysqlTest extends TestCase { MySqlStatementParser parser = new MySqlStatementParser(sql); return parser.parseStatementList(); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java b/core/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java index d4b0dc370..0966924de 100644 --- a/core/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java +++ b/core/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java @@ -15,16 +15,15 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.TestCase; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.util.JdbcUtils; - public class OnlineOracleTest3 extends TestCase { private String jdbcUrl; private String user; diff --git a/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 021a8c319..637b56079 100644 --- a/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -15,6 +15,14 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVisitor; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; @@ -23,15 +31,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -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"; diff --git a/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index e320d1e38..41a6b5f90 100644 --- a/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/core/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -15,19 +15,18 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import junit.framework.TestCase; +import org.junit.Assert; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; import java.util.List; -import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -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"; diff --git a/core/src/test/java/com/alibaba/druid/sql/OracleTest.java b/core/src/test/java/com/alibaba/druid/sql/OracleTest.java index 97cc90624..21fe50464 100644 --- a/core/src/test/java/com/alibaba/druid/sql/OracleTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/OracleTest.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.sql; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class OracleTest extends TestCase { protected String output(List stmtList) { @@ -42,6 +41,4 @@ public class OracleTest extends TestCase { } System.out.println(text); } - - } diff --git a/core/src/test/java/com/alibaba/druid/sql/PGTest.java b/core/src/test/java/com/alibaba/druid/sql/PGTest.java index 6bf7005ab..030e9f75b 100644 --- a/core/src/test/java/com/alibaba/druid/sql/PGTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/PGTest.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.sql; -import java.util.List; - -import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; +import junit.framework.TestCase; import org.junit.Assert; +import java.util.List; + public class PGTest extends TestCase { protected String output(List stmtList) { StringBuilder out = new StringBuilder(); diff --git a/core/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java b/core/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java index cab9bb2b0..2c8f96491 100644 --- a/core/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.sql; -import org.junit.Assert; -import junit.framework.TestCase; - 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.parser.SQLExprParser; - +import junit.framework.TestCase; +import org.junit.Assert; public class SQLExprParserTest extends TestCase { public void test_binary() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/sql/SQLParseAssertUtil.java b/core/src/test/java/com/alibaba/druid/sql/SQLParseAssertUtil.java index e0ca7c829..05fd14fd9 100644 --- a/core/src/test/java/com/alibaba/druid/sql/SQLParseAssertUtil.java +++ b/core/src/test/java/com/alibaba/druid/sql/SQLParseAssertUtil.java @@ -1,19 +1,18 @@ package com.alibaba.druid.sql; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; +import java.util.List; + import static org.junit.Assert.assertEquals; /** * @author lizongbo */ public class SQLParseAssertUtil { - /** * 将sql解析成语法树1，然后再将语法树1生成sql1，将sql1再解析成语法树2，然后再将语法树2生成sql2，比较两次解析生成的sql是否一致 * 针对有些sql虽然正常解析，但是再次生成的sql不正确的场景，加强验证，确认其幂等性 @@ -37,5 +36,4 @@ public class SQLParseAssertUtil { System.out.println(dbType + "再次解析生成的sql===" + sqlGenNew); assertEquals(statementList.toString(), statementListNew.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/core/src/test/java/com/alibaba/druid/sql/TestMigrate.java index b7bf6eb94..fdb5c87b0 100644 --- a/core/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/core/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -15,6 +15,14 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.support.json.JSONUtils; +import oracle.jdbc.OracleStatement; +import org.junit.Assert; + import java.sql.Connection; import java.sql.Date; import java.sql.PreparedStatement; @@ -23,15 +31,6 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; -import oracle.jdbc.OracleStatement; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.support.json.JSONUtils; - public class TestMigrate extends OracleTest { private String jdbcUrl; private String user; @@ -53,7 +52,7 @@ public class TestMigrate extends OracleTest { dataSource.setMaxOpenPreparedStatements(100); } - private int updateCount = 0; + private int updateCount; public void updateRecord(String sqlId, String result) throws Exception { Connection conn = dataSource.getConnection(); @@ -75,7 +74,6 @@ public class TestMigrate extends OracleTest { System.out.println((this.updateCount++) + " : " + sqlId); } - public void schemaStatInternal(Record r) throws Exception { String sql = r.getSqlText(); @@ -132,10 +130,10 @@ public class TestMigrate extends OracleTest { 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) " + // + 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"; Statement stmt = conn.createStatement(); @@ -223,7 +221,6 @@ public class TestMigrate extends OracleTest { buf.append("\nrelationships " + visitor.getRelationships().toString()); r.setResult(buf.toString()); - } public void insert(List list) throws Exception { @@ -231,9 +228,9 @@ public class TestMigrate extends OracleTest { return; } - 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)" + // + 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 (?, ?, ?, ?, ?, ?, ?, ?, ?)"; Connection conn = dataSource.getConnection(); diff --git a/core/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java b/core/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java index c47c85d5b..aa89bbe6a 100644 --- a/core/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java +++ b/core/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.TestCase; - -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"; diff --git a/core/src/test/java/com/alibaba/druid/sql/TestTransform.java b/core/src/test/java/com/alibaba/druid/sql/TestTransform.java index 8adb9217b..39bcf2a83 100644 --- a/core/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/core/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -15,6 +15,14 @@ */ package com.alibaba.druid.sql; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.support.json.JSONUtils; +import oracle.jdbc.OracleStatement; +import org.junit.Assert; + import java.sql.Connection; import java.sql.Date; import java.sql.PreparedStatement; @@ -25,15 +33,6 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.junit.Assert; -import oracle.jdbc.OracleStatement; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.support.json.JSONUtils; - public class TestTransform extends OracleTest { private String jdbcUrl; private String user; @@ -68,7 +67,7 @@ public class TestTransform extends OracleTest { conn.close(); } - private int updateCount = 0; + private int updateCount; public void updateRecord(String sqlId, String result) throws Exception { Connection conn = dataSource.getConnection(); @@ -106,10 +105,10 @@ public class TestTransform extends OracleTest { } 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" + // + 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"; Statement stmt = conn.createStatement(); @@ -228,10 +227,10 @@ public class TestTransform extends OracleTest { 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) " + // + 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"; Statement stmt = conn.createStatement(); @@ -323,7 +322,6 @@ public class TestTransform extends OracleTest { buf.append("\nrelationships " + visitor.getRelationships().toString()); r.setResult(buf.toString()); - } public void insert(List list) throws Exception { @@ -331,9 +329,9 @@ public class TestTransform extends OracleTest { return; } - 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)" + // + 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 (?, ?, ?, ?, ?, ?, ?, ?, ?)"; Connection conn = dataSource.getConnection(); diff --git a/core/src/test/java/com/alibaba/druid/sql/ast/SQLParameterTest.java b/core/src/test/java/com/alibaba/druid/sql/ast/SQLParameterTest.java index ccc8b0dad..e6c4eebd2 100644 --- a/core/src/test/java/com/alibaba/druid/sql/ast/SQLParameterTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/ast/SQLParameterTest.java @@ -7,7 +7,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; public class SQLParameterTest { - @Test public void testDefaultConstructor() { SQLParameter parameter = new SQLParameter(); @@ -27,7 +26,7 @@ public class SQLParameterTest { assertEquals(name, sqlParameter.getName()); assertEquals(dataType, sqlParameter.getDataType()); assertNull(sqlParameter.getDefaultValue()); - + // Test parent relationship assertEquals(sqlParameter, name.getParent()); assertEquals(sqlParameter, dataType.getParent()); diff --git a/core/src/test/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExprTest.java b/core/src/test/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExprTest.java index 4f5445393..c4c30458d 100644 --- a/core/src/test/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExprTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExprTest.java @@ -5,7 +5,6 @@ import org.junit.Assert; import org.junit.Test; public class SQLMethodInvokeExprTest { - @Test public void testMethodRemoveBrackets() { SQLMethodInvokeExpr methodInvokeExpr = new SQLMethodInvokeExpr("CURRENT_SCHEMA"); diff --git a/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLExprStatementTest.java b/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLExprStatementTest.java index 5d217ea88..48e10a15b 100644 --- a/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLExprStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLExprStatementTest.java @@ -7,7 +7,6 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; public class SQLExprStatementTest { - @Test public void testDefaultConstructor() { SQLExpr sqlExpr = new SQLBinaryOpExpr(); @@ -15,7 +14,7 @@ public class SQLExprStatementTest { stmt.setExpr(sqlExpr); assertEquals(sqlExpr, stmt.getExpr()); - + // Test parent relationship assertEquals(stmt, sqlExpr.getParent()); } @@ -27,7 +26,7 @@ public class SQLExprStatementTest { stmt.setExpr(sqlExpr); assertEquals(sqlExpr, stmt.getExpr()); - + // Test parent relationship assertEquals(stmt, sqlExpr.getParent()); } diff --git a/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatementTest.java b/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatementTest.java index f2d09d637..700003c3f 100644 --- a/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatementTest.java @@ -3,17 +3,15 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.builder.SQLBuilderFactory; -import com.alibaba.druid.sql.builder.SQLUpdateBuilder; import com.alibaba.druid.sql.builder.impl.SQLUpdateBuilderImpl; import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class SQLUpdateStatementTest { @Test public void testGetTableName() { - SQLUpdateBuilderImpl updateBuilder = (SQLUpdateBuilderImpl)SQLBuilderFactory.createUpdateBuilder("UPDATE a\n" + + SQLUpdateBuilderImpl updateBuilder = (SQLUpdateBuilderImpl) SQLBuilderFactory.createUpdateBuilder("UPDATE a\n" + "LEFT JOIN b ON b.id = a.id\n" + "LEFT JOIN c ON c.id = a.id\n" + "set a.id=11,b.id=11,c.id=11", DbType.mysql); diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParserTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParserTest.java index d0d2a3c6f..045b37329 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParserTest.java @@ -9,7 +9,6 @@ import junit.framework.TestCase; * @author abomb4 2022-08-29 */ public class DB2StatementParserTest extends TestCase { - /** * 测试修改了 parseDeleteStatement 后 delete 语句能否正常解析 */ diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitorTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitorTest.java index 4bc7833c5..2541694dd 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitorTest.java @@ -14,10 +14,8 @@ import java.util.List; * @author abomb4 2022-06-19 */ public class DB2OutputVisitorTest { - @Test public void test() { - List testCases = Arrays.asList( new TestCase("interval 表达式应该带括号 select", "SELECT A, B, C FROM D WHERE C < CURRENT TIMESTAMP + (10 * 60) SECONDS", diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java index 2b66c99ec..f925b1684 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/h2/visitor/H2OutputVisitorTest.java @@ -5,9 +5,18 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PushbackInputStream; +import java.io.Reader; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.sql.Connection; @@ -18,8 +27,7 @@ import java.util.List; import java.util.zip.GZIPInputStream; public class H2OutputVisitorTest { - - private final static Log LOG = LogFactory.getLog(H2OutputVisitorTest.class); + private static final Log LOG = LogFactory.getLog(H2OutputVisitorTest.class); @BeforeClass public static void loadDriver() { @@ -74,14 +82,14 @@ public class H2OutputVisitorTest { LOG.info("Executing script " + s); InputStream input = new BufferedInputStream(getClass().getResourceAsStream("/com/alibaba/druid/sql/dialect/h2/visitor/" + s)); - PushbackInputStream pb = new PushbackInputStream( input, 2 ); + PushbackInputStream pb = new PushbackInputStream(input, 2); byte [] magicbytes = new byte[2]; pb.read(magicbytes); pb.unread(magicbytes); ByteBuffer bb = ByteBuffer.wrap(magicbytes); bb.order(ByteOrder.LITTLE_ENDIAN); short magic = bb.getShort(); - if( magic == (short) GZIPInputStream.GZIP_MAGIC ) { + if (magic == (short) GZIPInputStream.GZIP_MAGIC) { executeScript(new InputStreamReader(new GZIPInputStream(pb))); } else { executeScript(new InputStreamReader(pb)); @@ -141,5 +149,4 @@ public class H2OutputVisitorTest { public void testChampScripts() throws Exception { loadScript("champ.sql"); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParserTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParserTest.java index f514fa8c4..9330a256a 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/hive/parser/HiveStatementParserTest.java @@ -6,7 +6,6 @@ import junit.framework.TestCase; import org.junit.Test; public class HiveStatementParserTest extends TestCase { - /** * 验证add jar类型SQL可以正常解析 * 例子： add jar hdfs:///hadoop/parser.h.file @@ -19,5 +18,4 @@ public class HiveStatementParserTest extends TestCase { assertTrue(sqlStatement instanceof HiveAddJarStatement); assertEquals("ADD JAR hdfs:///hadoop/parser.h.file", sqlStatement.toString()); } - -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatementTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatementTest.java index 91767d6e7..7fbd22020 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatementTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlCreateTableStatementTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.repository.SchemaObject; import com.alibaba.druid.sql.repository.SchemaRepository; import com.alibaba.druid.util.JdbcConstants; - import org.junit.Test; import static org.junit.Assert.assertArrayEquals; @@ -48,11 +47,11 @@ public class MySqlCreateTableStatementTest { private Object[] findColumnNames(SchemaObject schemaObject) { SQLStatement statement = schemaObject.getStatement(); assert statement instanceof MySqlCreateTableStatement; - return ((MySqlCreateTableStatement)statement).getTableElementList() + return ((MySqlCreateTableStatement) statement).getTableElementList() .stream() .filter(element -> element instanceof SQLColumnDefinition) - .map(element -> ((SQLColumnDefinition)element).getName()) + .map(element -> ((SQLColumnDefinition) element).getName()) .map(SQLName::getSimpleName) .toArray(); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticTest.java index 46359879d..91fafe3a2 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleAnalyticTest.java @@ -3,7 +3,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; - import junit.framework.TestCase; /** @@ -13,7 +12,6 @@ import junit.framework.TestCase; * @see ... */ public class OracleAnalyticTest extends TestCase { - public void testToString() { SQLAggregateExpr sqlAggregateExpr = new SQLAggregateExpr("count"); OracleAnalytic oracleAnalytic = new OracleAnalytic(); @@ -22,6 +20,5 @@ public class OracleAnalyticTest extends TestCase { oracleAnalytic.setOrderBy(sqlOrderBy); sqlAggregateExpr.setFilter(oracleAnalytic); System.out.println(sqlAggregateExpr.toString()); - } } diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTypeTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTypeTest.java index a43ffe52a..7517c471e 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTypeTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleCreateTypeTest.java @@ -7,12 +7,12 @@ import org.junit.Assert; import org.junit.Test; public class OracleCreateTypeTest { - @Test - public void testCreateAssocArrayType() { - String sql = "CREATE TYPE email_list_tab AS TABLE OF VARCHAR2(30) INDEX BY BINARY_INTEGER;"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testCreateAssocArrayType() { + String sql = "CREATE TYPE email_list_tab AS TABLE OF VARCHAR2(30) INDEX BY BINARY_INTEGER;"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } } diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleParameterParserTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleParameterParserTest.java index d74103403..62629ce6c 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleParameterParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleParameterParserTest.java @@ -7,42 +7,42 @@ import org.junit.Assert; import org.junit.Test; public class OracleParameterParserTest { - @Test - public void testNestedParameter() { - String sql = "DECLARE\n" + - " TYPE Foursome IS TABLE OF VARCHAR2(15);\n" + - " team Foursome := Foursome('John', 'Mary', 'Alberto', 'Juanita');\n" + - "BEGIN\n" + - " DBMS_OUTPUT.PUT_LINE('2001 Team:');\n" + - " FOR i IN 1..4\n" + - " LOOP\n" + - " DBMS_OUTPUT.PUT_LINE(i || '.' || team(i));\n" + - " END LOOP;\n" + - "END;"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testNestedParameter() { + String sql = "DECLARE\n" + + " TYPE Foursome IS TABLE OF VARCHAR2(15);\n" + + " team Foursome := Foursome('John', 'Mary', 'Alberto', 'Juanita');\n" + + "BEGIN\n" + + " DBMS_OUTPUT.PUT_LINE('2001 Team:');\n" + + " FOR i IN 1..4\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE(i || '.' || team(i));\n" + + " END LOOP;\n" + + "END;"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testNestedParameter_NumberIndexBy() { - String sql = "DECLARE\n" + - "\tTYPE NUMBER_ARRAY_TYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n" + - "\tmyArray NUMBER_ARRAY_TYPE;\n" + - "BEGIN\n" + - "\tFOR i IN 1..10\n" + - "\tLOOP\n" + - "\t\tmyArray(i) := i * 10;\n" + - "\tEND LOOP;\n" + - "\tFOR i IN 1..10\n" + - "\tLOOP\n" + - "\t\tDBMS_OUTPUT.PUT_LINE('Index: ' || i || ', Value: ' || myArray(i));\n" + - "\tEND LOOP;\n" + - "END;"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testNestedParameter_NumberIndexBy() { + String sql = "DECLARE\n" + + " TYPE NUMBER_ARRAY_TYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n" + + " myArray NUMBER_ARRAY_TYPE;\n" + + "BEGIN\n" + + " FOR i IN 1..10\n" + + " LOOP\n" + + " myArray(i) := i * 10;\n" + + " END LOOP;\n" + + " FOR i IN 1..10\n" + + " LOOP\n" + + " DBMS_OUTPUT.PUT_LINE('Index: ' || i || ', Value: ' || myArray(i));\n" + + " END LOOP;\n" + + "END;"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } } diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParserUnpivotTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParserUnpivotTest.java index 59fc37e2e..4e314bd49 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParserUnpivotTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParserUnpivotTest.java @@ -1,7 +1,8 @@ package com.alibaba.druid.sql.dialect.oracle.parser; -import java.util.Arrays; - +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -9,141 +10,135 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; - public class OracleSelectParserUnpivotTest { + @BeforeClass + public static void setUpBeforeClass() throws Exception { + } - @BeforeClass - public static void setUpBeforeClass() throws Exception { - } + @AfterClass + public static void tearDownAfterClass() throws Exception { + } - @AfterClass - public static void tearDownAfterClass() throws Exception { - } + @Before + public void setUp() throws Exception { + } - @Before - public void setUp() throws Exception { - } + @After + public void tearDown() throws Exception { + } - @After - public void tearDown() throws Exception { - } + @Test + public void testUnpivotSingleColumn() { + String sql = "SELECT TERM, subject, STU_NAME, score\n" + + "FROM (\n" + + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" + + " , '71' AS czxt\n" + + " FROM DUAL\n" + + ")\n" + + "UNPIVOT (score FOR subject IN (wjf AS '微积分', xxds AS '线性代数', sjjg AS '数据结构', czxt AS '操作系统')) t"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testUnpivotSingleColumn() { - String sql = "SELECT TERM, subject, STU_NAME, score\n" - + "FROM (\n" - + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" - + " , '71' AS czxt\n" - + " FROM DUAL\n" - + ")\n" - + "UNPIVOT (score FOR subject IN (wjf AS '微积分', xxds AS '线性代数', sjjg AS '数据结构', czxt AS '操作系统')) t"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testUnpivotSingleColumn2() { + String sql = "SELECT TERM, subject, STU_NAME, score, hello\n" + + "FROM (\n" + + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" + + " , '72' AS czxt\n" + + " FROM DUAL\n" + + ")\n" + + "UNPIVOT (score FOR (subject, hello) IN (wjf\n" + + "AS ('微积分', '微积分'), xxds\n" + + "AS ('线性代数', 'abc'), sjjg\n" + + "AS ('数据结构', 'def'), czxt\n" + + "AS ('操作系统', 'ghk'))) t"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testUnpivotSingleColumn2() { - String sql = "SELECT TERM, subject, STU_NAME, score, hello\n" - + "FROM (\n" - + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" - + " , '72' AS czxt\n" - + " FROM DUAL\n" - + ")\n" - + "UNPIVOT (score FOR (subject, hello) IN (wjf\n" - + "AS ('微积分', '微积分'), xxds\n" - + "AS ('线性代数', 'abc'), sjjg\n" - + "AS ('数据结构', 'def'), czxt\n" - + "AS ('操作系统', 'ghk'))) t"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testUnpivotMultiColumns() { + String sql = "SELECT TERM, subject, NAME, score\n" + + "FROM (\n" + + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" + + " , '73' AS czxt\n" + + " FROM DUAL\n" + + " UNION ALL\n" + + " SELECT '罗游' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" + + " , '74' AS czxt\n" + + " FROM DUAL\n" + + ")\n" + + "UNPIVOT ( (NAME, score) FOR subject IN ((STU_NAME, wjf) AS '微积分', (STU_NAME, xxds) AS '线性代数', (STU_NAME, sjjg) AS '数据结构', (STU_NAME, czxt) AS '操作系统')) t"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testUnpivotMultiColumns() { - String sql = "SELECT TERM, subject, NAME, score\n" - + "FROM (\n" - + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" - + " , '73' AS czxt\n" - + " FROM DUAL\n" - + " UNION ALL\n" - + " SELECT '罗游' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" - + " , '74' AS czxt\n" - + " FROM DUAL\n" - + ")\n" - + "UNPIVOT ( (NAME, score) FOR subject IN ((STU_NAME, wjf) AS '微积分', (STU_NAME, xxds) AS '线性代数', (STU_NAME, sjjg) AS '数据结构', (STU_NAME, czxt) AS '操作系统')) t"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testUnpivotMultiColumns2() { + String sql = "SELECT TERM, subject, NAME, score, hello\n" + + "FROM (\n" + + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" + + " , '75' AS czxt\n" + + " FROM DUAL\n" + + " UNION ALL\n" + + " SELECT '罗游' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" + + " , '76' AS czxt\n" + + " FROM DUAL\n" + + " UNION ALL\n" + + " SELECT '罗飞' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" + + " , '77' AS czxt\n" + + " FROM DUAL\n" + + ")\n" + + "UNPIVOT ( (NAME, score) FOR (subject, hello) IN ((STU_NAME, wjf)\n" + + "AS ('微积分', '123'), (STU_NAME, xxds)\n" + + "AS ('线性代数', 'abc'), (STU_NAME, sjjg)\n" + + "AS ('数据结构', 'def'), (STU_NAME, czxt)\n" + + "AS ('操作系统', 'ghk'))) t"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testUnpivotMultiColumns2() { - String sql = "SELECT TERM, subject, NAME, score, hello\n" - + "FROM (\n" - + " SELECT '罗飞' AS STU_NAME, '2001-2002' AS TERM, '90' AS wjf, '88' AS xxds, '85' AS sjjg\n" - + " , '75' AS czxt\n" - + " FROM DUAL\n" - + " UNION ALL\n" - + " SELECT '罗游' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" - + " , '76' AS czxt\n" - + " FROM DUAL\n" - + " UNION ALL\n" - + " SELECT '罗飞' AS STU_NAME, '2002-2003' AS TERM, '91' AS wjf, '81' AS xxds, '81' AS sjjg\n" - + " , '77' AS czxt\n" - + " FROM DUAL\n" - + ")\n" - + "UNPIVOT ( (NAME, score) FOR (subject, hello) IN ((STU_NAME, wjf)\n" - + "AS ('微积分', '123'), (STU_NAME, xxds)\n" - + "AS ('线性代数', 'abc'), (STU_NAME, sjjg)\n" - + "AS ('数据结构', 'def'), (STU_NAME, czxt)\n" - + "AS ('操作系统', 'ghk'))) t"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testOdpsUnpivotSingleColumn() { + String sql = "SELECT *\n" + + "FROM mf_shops\n" + + "UNPIVOT (sales FOR shop IN (shop1 AS 'shop_name_1', shop2 AS 'shop_name_2', shop3 AS 'shop_name_3', shop4 AS 'shop_name_4'))"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } - @Test - public void testOdpsUnpivotSingleColumn() { - String sql = "SELECT *\n" - + "FROM mf_shops\n" - + "UNPIVOT (sales FOR shop IN (shop1 AS 'shop_name_1', shop2 AS 'shop_name_2', shop3 AS 'shop_name_3', shop4 AS 'shop_name_4'))"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } - - @Test - public void testOdpsUnpivotMultiColumns() { - String sql = "SELECT *\n" - + "FROM mf_shops\n" - + "UNPIVOT ( (sales1, sales2) FOR shop IN ((shop1, shop2) AS 'east_shop', (shop3, shop4) AS 'west_shop'))"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } - - @Test - public void testOdpsUnpivotMultiColumns2() { - String sql = "SELECT *\n" - + "FROM mf_shops\n" - + "UNPIVOT ( (sales1, sales2) FOR (shop_name, location) IN ((shop1, shop2)\n" - + "AS ('east_shop', 'east'), (shop3, shop4)\n" - + "AS ('west_shop', 'west')))"; - SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); - System.out.println(stat.toString()); - Assert.assertEquals(sql, stat.toString()); - System.out.println("============="); - } + @Test + public void testOdpsUnpivotMultiColumns() { + String sql = "SELECT *\n" + + "FROM mf_shops\n" + + "UNPIVOT ( (sales1, sales2) FOR shop IN ((shop1, shop2) AS 'east_shop', (shop3, shop4) AS 'west_shop'))"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } + @Test + public void testOdpsUnpivotMultiColumns2() { + String sql = "SELECT *\n" + + "FROM mf_shops\n" + + "UNPIVOT ( (sales1, sales2) FOR (shop_name, location) IN ((shop1, shop2)\n" + + "AS ('east_shop', 'east'), (shop3, shop4)\n" + + "AS ('west_shop', 'west')))"; + SQLStatement stat = SQLUtils.parseSingleStatement(sql, DbType.oracle, false); + System.out.println(stat.toString()); + Assert.assertEquals(sql, stat.toString()); + System.out.println("============="); + } } diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExprTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExprTest.java index c096e47e4..230f0ba3e 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExprTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExprTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; public class PGTypeCastExprTest { - @Test public void testDefaultConstructor() { PGTypeCastExpr pgTypeCastExpr = new PGTypeCastExpr(); @@ -30,12 +29,12 @@ public class PGTypeCastExprTest { assertNotNull(pgTypeCastExpr); assertEquals(sqlCharExpr, pgTypeCastExpr.getExpr()); assertEquals(sqlDataType, pgTypeCastExpr.getDataType()); - + // Test parent relationship assertEquals(pgTypeCastExpr, sqlCharExpr.getParent()); assertEquals(pgTypeCastExpr, sqlDataType.getParent()); } - + @Test public void testClone() { // '100'::INT diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksCreateTableParserTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksCreateTableParserTest.java index 6b9eb9b13..d156fea4b 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksCreateTableParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksCreateTableParserTest.java @@ -220,7 +220,6 @@ public class StarRocksCreateTableParserTest extends TestCase { ")" }; - public void testCreateTable() { for (int i = 0; i < caseList.length; i++) { final String sql = caseList[i]; diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksStatementParserTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksStatementParserTest.java index 798b6d220..3b2b075a6 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksStatementParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/parser/StarRocksStatementParserTest.java @@ -66,4 +66,4 @@ public class StarRocksStatementParserTest extends TestCase { assertEquals(ddl, stmt.toString()); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/visitor/StarRocksOutputVisitorTest.java b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/visitor/StarRocksOutputVisitorTest.java index 2926a188b..bbff0bc13 100644 --- a/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/visitor/StarRocksOutputVisitorTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/dialect/starrocks/visitor/StarRocksOutputVisitorTest.java @@ -11,9 +11,7 @@ import junit.framework.TestCase; import org.junit.Assert; public class StarRocksOutputVisitorTest extends TestCase { - public void testStarRocksOutputVisitor() { - String message = "output error"; String origin = @@ -51,7 +49,6 @@ public class StarRocksOutputVisitorTest extends TestCase { " [\"replication_num\" = \"3\"]\n" + ")"; - String expected = "CREATE TABLE IF NOT EXISTS `detailDemo` ( `recruit_date` DATE NOT NULL COMMENT 'YYYY-MM-DD', `region_num` TINYINT COMMENT 'range [-128, 127]', `num_plate` SMALLINT COMMENT 'range [-32768, 32767] ', `tel` INT COMMENT 'range [-2147483648, 2147483647]', `id` BIGINT COMMENT 'range [-2^63 + 1 ~ 2^63 - 1]', `password` LARGEINT COMMENT 'range [-2^127 + 1 ~ 2^127 - 1]', `name` CHAR(20) NOT NULL COMMENT 'range char(m),m in (1-255)', `profile` VARCHAR(500) NOT NULL COMMENT 'upper limit value 1048576 bytes', `hobby` STRING NOT NULL COMMENT 'upper limit value 65533 bytes', `leave_time` DATETIME COMMENT 'YYYY-MM-DD HH:MM:SS', `channel` FLOAT COMMENT '4 bytes', `income` DOUBLE COMMENT '8 bytes', `account` DECIMAL(12, 4) COMMENT '\"\"', `ispass` BOOLEAN COMMENT 'true/false' ) ENGINE = OLAP DUPLICATE KEY (`recruit_date`, `region_num`) COMMENT 'xxxxx' PARTITION BY RANGE(`recruit_date`) ( PARTITION p202101 VALUES [(\"20210101\"),(\"20210201\")), PARTITION p202102 VALUES [(\"20210201\"),(\"20210301\")), PARTITION p202103 VALUES [(\"20210301\"),(MAXVALUE)) ) DISTRIBUTED BY HASH(`recruit_date`, `region_num`) BUCKETS 8 PROPERTIES ( \"storage_medium\" = \"[SSD|HDD]\", \"dynamic_partition.enable\" = \"true|false\", \"dynamic_partition.time_unit\" = \"DAY|WEEK|MONTH\", \"dynamic_partition.start\" = \"${integer_value}\", [\"storage_cooldown_time\" = \"yyyy-MM-dd HH:mm:ss\",] [\"replication_num\" = \"3\"] )"; SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(origin, DbType.starrocks); @@ -78,4 +75,3 @@ public class StarRocksOutputVisitorTest extends TestCase { assertEquals(expected, stmt.toString()); } } - diff --git a/core/src/test/java/com/alibaba/druid/sql/issues/Issue3989.java b/core/src/test/java/com/alibaba/druid/sql/issues/Issue3989.java index 5b4904da6..ae34c5803 100644 --- a/core/src/test/java/com/alibaba/druid/sql/issues/Issue3989.java +++ b/core/src/test/java/com/alibaba/druid/sql/issues/Issue3989.java @@ -1,8 +1,5 @@ package com.alibaba.druid.sql.issues; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; @@ -10,13 +7,13 @@ import com.alibaba.druid.sql.ast.statement.SQLCreateTriggerStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; - import junit.framework.TestCase; +import java.util.ArrayList; +import java.util.List; + public class Issue3989 extends TestCase { - public void test_create_trigger() { - String ddl2 = "CREATE TABLE table_1 (\n" + " id INT AUTO_INCREMENT,\n" + " name VARCHAR(100),\n" + diff --git a/core/src/test/java/com/alibaba/druid/sql/issues/Issue4610.java b/core/src/test/java/com/alibaba/druid/sql/issues/Issue4610.java index 2d20b1944..66d741ef4 100644 --- a/core/src/test/java/com/alibaba/druid/sql/issues/Issue4610.java +++ b/core/src/test/java/com/alibaba/druid/sql/issues/Issue4610.java @@ -1,5 +1,9 @@ package com.alibaba.druid.sql.issues; +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -13,25 +17,12 @@ import java.sql.Clob; import java.sql.NClob; import java.sql.SQLException; import java.text.SimpleDateFormat; -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.OffsetDateTime; -import java.time.OffsetTime; -import java.time.ZonedDateTime; +import java.time.*; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import com.alibaba.druid.DbType; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; - -import junit.framework.TestCase; - /** * 验证各种类型的参数的格式化sql合法性的用例 * @@ -39,8 +30,6 @@ import junit.framework.TestCase; * @see LocalDateTime等类型的输出问题 */ public class Issue4610 extends TestCase { - - public void test_printParameter_BigDecimal() throws Exception { String sql = "update t set bigdecimal_val = ?"; String sqlNeed = "UPDATE t\nSET bigdecimal_val = 50000000000"; @@ -110,12 +99,10 @@ public class Issue4610 extends TestCase { @Override public void truncate(long len) throws SQLException { - } @Override public void free() throws SQLException { - } @Override @@ -181,7 +168,6 @@ public class Issue4610 extends TestCase { String sqlNeed = "UPDATE t\nSET clob_val = ''"; List parameters = new ArrayList<>(); parameters.add(new NClob() { - @Override public long length() throws SQLException { return 0; @@ -234,12 +220,10 @@ public class Issue4610 extends TestCase { @Override public void truncate(long len) throws SQLException { - } @Override public void free() throws SQLException { - } @Override @@ -258,7 +242,6 @@ public class Issue4610 extends TestCase { String sqlNeed = "UPDATE t\nSET clob_val = ''"; List parameters = new ArrayList<>(); parameters.add(new Clob() { - @Override public long length() throws SQLException { return 0; @@ -311,12 +294,10 @@ public class Issue4610 extends TestCase { @Override public void truncate(long len) throws SQLException { - } @Override public void free() throws SQLException { - } @Override @@ -512,7 +493,6 @@ public class Issue4610 extends TestCase { @Override public void close() throws IOException { - } }); String fromatedSql = SQLUtils.format(sql, DbType.mysql, parameters); @@ -574,7 +554,6 @@ public class Issue4610 extends TestCase { assertEquals(sqlNeed, fromatedSql); } - /** * 来自 com.mysql.cj.NativeQueryBindings.DEFAULT_MYSQL_TYPES */ @@ -632,6 +611,4 @@ public class Issue4610 extends TestCase { System.out.println(javaCode); } } - - } diff --git a/core/src/test/java/com/alibaba/druid/sql/issues/Issue5317.java b/core/src/test/java/com/alibaba/druid/sql/issues/Issue5317.java index b2df9a932..e407cba04 100644 --- a/core/src/test/java/com/alibaba/druid/sql/issues/Issue5317.java +++ b/core/src/test/java/com/alibaba/druid/sql/issues/Issue5317.java @@ -2,7 +2,6 @@ package com.alibaba.druid.sql.issues; import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.statement.SQLSelect; - import junit.framework.TestCase; /** @@ -10,7 +9,6 @@ import junit.framework.TestCase; * @see ... */ public class Issue5317 extends TestCase { - public void test_cloneSQLSelect() { SQLSelect select = new SQLSelect(); SQLCommentHint hint = new SQLCommentHint("a"); @@ -18,5 +16,4 @@ public class Issue5317 extends TestCase { SQLSelect selectNew = select.clone(); assertEquals(select.getHints().get(0), selectNew.getHints().get(0)); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java b/core/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java index 67820d549..f4a23dbe5 100644 --- a/core/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java +++ b/core/src/test/java/com/alibaba/druid/sql/mysql/demo/Demo0.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.sql.mysql.demo; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class Demo0 extends TestCase { public void test_demo_0() throws Exception { @@ -30,7 +29,7 @@ public class Demo0 extends TestCase { // parser得到AST SQLStatementParser parser = new MySqlStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); // 将AST通过visitor输出 StringBuilder out = new StringBuilder(); diff --git a/core/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java b/core/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java index 56f0230ab..d34ad3fc1 100644 --- a/core/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java +++ b/core/src/test/java/com/alibaba/druid/sql/odps/Issue2102.java @@ -1,6 +1,5 @@ package com.alibaba.druid.sql.odps; -import com.alibaba.druid.bvt.pool.TestClone; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java b/core/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java index b9f35bc0b..842481b30 100644 --- a/core/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/odps/OdpsFileTest.java @@ -15,23 +15,21 @@ */ package com.alibaba.druid.sql.odps; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; - -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import junit.framework.TestCase; - -import org.junit.Assert; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.dialect.odps.visitor.OdpsSchemaStatVisitor; import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; public class OdpsFileTest extends TestCase { public void test_0() throws Exception { @@ -83,6 +81,4 @@ public class OdpsFileTest extends TestCase { Assert.assertEquals(expect, out.toString()); } - - } diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java index 11898bf00..226c9a0fe 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo0.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.sql.oracle.demo; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.List; public class Demo0 extends TestCase { public void test_demo_0() throws Exception { @@ -30,7 +29,7 @@ public class Demo0 extends TestCase { // parser得到AST SQLStatementParser parser = new OracleStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); // 将AST通过visitor输出 StringBuilder out = new StringBuilder(); diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java index 1ee9ad6a2..37e32c527 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo1.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.sql.oracle.demo; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; @@ -32,6 +27,10 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; public class Demo1 extends TestCase { public void test_0() throws Exception { @@ -41,7 +40,7 @@ public class Demo1 extends TestCase { parameters.add("wenshao"); SQLStatementParser parser = new OracleStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); SQLStatement first = (SQLStatement) stmtList.get(0); @@ -68,7 +67,7 @@ public class Demo1 extends TestCase { } private static class GetVariantVisitor extends OracleASTVisitorAdapter { - private int varIndex = 0; + private int varIndex; private List variantList = new ArrayList(); public boolean visit(SQLVariantRefExpr x) { @@ -155,5 +154,4 @@ public class Demo1 extends TestCase { return true; } } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java index 15086cbe2..b56926366 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo2.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.sql.oracle.demo; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; @@ -32,6 +27,10 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.List; public class Demo2 extends TestCase { public void test_0() throws Exception { @@ -41,14 +40,13 @@ public class Demo2 extends TestCase { parameters.add("wenshao"); SQLStatementParser parser = new MySqlStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); SQLStatement first = (SQLStatement) stmtList.get(0); MyVisitor visitor = new MyVisitor(); first.accept(visitor); - SQLExpr firstVar = visitor.getVariantList().get(0); int userId; @@ -90,7 +88,7 @@ public class Demo2 extends TestCase { } private static class MyVisitor extends MySqlASTVisitorAdapter { - private int varIndex = 0; + private int varIndex; private List variantList = new ArrayList(); private List tableSourceList = new ArrayList(); @@ -137,6 +135,4 @@ public class Demo2 extends TestCase { } } - - } diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java index 3dc28d41b..0f629e010 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo3.java @@ -15,13 +15,6 @@ */ package com.alibaba.druid.sql.oracle.demo; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLStatement; @@ -36,6 +29,12 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class Demo3 extends TestCase { public void test_0() throws Exception { @@ -80,7 +79,7 @@ public class Demo3 extends TestCase { private String convert(String sql, List parameters) { SQLStatementParser parser = new MySqlStatementParser(sql); - List stmtList = parser.parseStatementList(); // + List stmtList = parser.parseStatementList(); SQLStatement first = (SQLStatement) stmtList.get(0); @@ -130,7 +129,7 @@ public class Demo3 extends TestCase { } private static class MyVisitor extends MySqlASTVisitorAdapter { - private int varIndex = 0; + private int varIndex; private List variantList = new ArrayList(); private List tableSourceList = new ArrayList(); @@ -235,5 +234,4 @@ public class Demo3 extends TestCase { } } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java index b8c7205e7..9ea2f434e 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_casewhen.java @@ -19,9 +19,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLCaseExpr; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; -import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; -import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java index 780e422fd..7874082a4 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/Demo_getTable.java @@ -3,7 +3,6 @@ package com.alibaba.druid.sql.oracle.demo; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java index fe91edfc6..59382100a 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest.java @@ -21,15 +21,10 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.Utils; import org.apache.commons.io.FileUtils; import org.junit.Assert; import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import java.util.List; public class OracleResourceTest extends OracleTest { @@ -76,5 +71,4 @@ public class OracleResourceTest extends OracleTest { Assert.assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java index f108b98be..47ef07fec 100644 --- a/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java +++ b/core/src/test/java/com/alibaba/druid/sql/oracle/demo/OracleResourceTest2.java @@ -71,5 +71,4 @@ public class OracleResourceTest2 extends OracleTest { Assert.assertEquals(expect, out.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java index a9a382b51..1e925eefd 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/CommentTest.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.sql.parser; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class CommentTest extends TestCase { public void test_0() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java index c1177f36f..56adefa8a 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/DeallocatePrepareTest.java @@ -1,12 +1,10 @@ package com.alibaba.druid.sql.parser; -import org.junit.Assert; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MysqlDeallocatePrepareStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; - import junit.framework.TestCase; +import org.junit.Assert; public class DeallocatePrepareTest extends TestCase { public void test() { @@ -18,5 +16,4 @@ public class DeallocatePrepareTest extends TestCase { Assert.assertEquals("stmt1", dpStmt.getStatementName().getSimpleName()); Assert.assertEquals(sql, dpStmt.toString()); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/DialectFeatureTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/DialectFeatureTest.java index 45936faf5..9214b1835 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/DialectFeatureTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/DialectFeatureTest.java @@ -1,10 +1,10 @@ package com.alibaba.druid.sql.parser; -import java.util.Arrays; - import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; + public class DialectFeatureTest { @Test public void parserFeatureDuplicateTest() { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4OracleTestCase.java b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4OracleTestCase.java index 9bf5f3c52..44819110a 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4OracleTestCase.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4OracleTestCase.java @@ -15,28 +15,24 @@ */ package com.alibaba.druid.sql.parser; -import org.junit.Assert; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; import com.alibaba.druid.sql.visitor.ParameterizedVisitor; - import junit.framework.TestCase; +import org.junit.Assert; public class ExportAndParameterizedVisitor4OracleTestCase extends TestCase { - public void testParameterizedVisitor() { Object[][] sqlAndExpectedCases = { - { "SELECT XMLSERIALIZE(CONTENT XMLTYPE('Grandco') as varchar(200) ) AS xmlserialize_doc FROM DUAL",1}, + {"SELECT XMLSERIALIZE(CONTENT XMLTYPE('Grandco') as varchar(200) ) AS xmlserialize_doc FROM DUAL", 1}, }; final DbType[] dbTypes = { DbType.oracle }; for (final DbType dbType : dbTypes) { System.out.println("dbType:" + dbType); for (Object[] arr : sqlAndExpectedCases) { - final String sql = (String) arr[0]; StringBuilder out = new StringBuilder(); @@ -50,7 +46,7 @@ public class ExportAndParameterizedVisitor4OracleTestCase extends TestCase { System.out.println("before:" + sql); System.out.println("after:" + out); System.out.println("size:" + vistor2.getParameters()); - final int expectedSize = arr.length > 1 ? (Integer) arr[1] : 0 ; + final int expectedSize = arr.length > 1 ? (Integer) arr[1] : 0; Assert.assertEquals(expectedSize, vistor2.getParameters().size()); } } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4db2TestCase.java b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4db2TestCase.java index fbb35f3f6..eff31296f 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4db2TestCase.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitor4db2TestCase.java @@ -15,29 +15,25 @@ */ package com.alibaba.druid.sql.parser; -import org.junit.Assert; - import com.alibaba.druid.DbType; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; import com.alibaba.druid.sql.visitor.ParameterizedVisitor; - import junit.framework.TestCase; +import org.junit.Assert; public class ExportAndParameterizedVisitor4db2TestCase extends TestCase { - public void testParameterizedVisitor() { - Object[][] sqlAndExpectedCases = { - { "select XMLSERIALIZE(content fld1 as varchar(2000) ) fld1 from test_tab1 where name='1' ",1}, - { "select XMLSERIALIZE(fld1 as varchar(2000) ) fld1 from test_tab1 where name='1' ",1}, - { "select fld as b from test_tab1 where name='1' ",1}, + Object[][] sqlAndExpectedCases = { + {"select XMLSERIALIZE(content fld1 as varchar(2000) ) fld1 from test_tab1 where name='1' ", 1}, + {"select XMLSERIALIZE(fld1 as varchar(2000) ) fld1 from test_tab1 where name='1' ", 1}, + {"select fld as b from test_tab1 where name='1' ", 1}, }; final DbType[] dbTypes = { DbType.db2 }; for (DbType dbType : dbTypes) { System.out.println("dbType:" + dbType); for (Object[] arr : sqlAndExpectedCases) { - final String sql = (String) arr[0]; StringBuilder out = new StringBuilder(); @@ -49,7 +45,7 @@ public class ExportAndParameterizedVisitor4db2TestCase extends TestCase { System.out.println("before:" + sql); System.out.println("after:" + out); System.out.println("size:" + vistor2.getParameters()); - final int expectedSize = arr.length>1 ? (Integer) arr[1] : 0; + final int expectedSize = arr.length > 1 ? (Integer) arr[1] : 0; Assert.assertEquals(expectedSize, vistor2.getParameters().size()); } } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java index 56553492c..c8d427c96 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/ExportAndParameterizedVisitorTestCase.java @@ -16,16 +16,12 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.DbType; -import junit.framework.TestCase; - -import org.junit.Assert; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; import com.alibaba.druid.sql.visitor.ParameterizedVisitor; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; public class ExportAndParameterizedVisitorTestCase extends TestCase { public void testParameterizedVisitor() { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/LateralViewTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/LateralViewTest.java index d88d0dc3e..08ca97ad9 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/LateralViewTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/LateralViewTest.java @@ -6,8 +6,7 @@ import junit.framework.TestCase; import java.util.List; public class LateralViewTest extends TestCase { - - private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = { + private static final SQLParserFeature[] FORMAT_DEFAULT_FEATURES = { SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup }; diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/LimitOffsetSQLTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/LimitOffsetSQLTest.java index c3ba6747d..e5a7985a1 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/LimitOffsetSQLTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/LimitOffsetSQLTest.java @@ -9,13 +9,10 @@ import junit.framework.TestCase; * 类说明： */ public class LimitOffsetSQLTest extends TestCase { - - public void testPGLimitOffsetSQL() { String sql1 = "SELECT * FROM table1 LIMIT 10 OFFSET 20"; String sql1Result = new PGSQLStatementParser(sql1).parseSelect().toString() .replace("\n", " "); - ; assertEquals(sql1, sql1Result); @@ -25,14 +22,12 @@ public class LimitOffsetSQLTest extends TestCase { // OFFSET 20 LIMIT 20 会被解析成 OFFSET 20 LIMIT 10 assertEquals(sql1, sql2Result); - } public void testOscarLimitOffsetSQL() { String sql1 = "SELECT * FROM table1 LIMIT 10 OFFSET 20"; String sql1Result = new OscarStatementParser(sql1).parseSelect().toString() .replace("\n", " "); - ; assertEquals(sql1, sql1Result); @@ -42,8 +37,5 @@ public class LimitOffsetSQLTest extends TestCase { // OFFSET 20 LIMIT 20 会被解析成 OFFSET 20 LIMIT 10 assertEquals(sql1, sql2Result); - } - - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java index 1546dceb1..cbbbd891d 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/LoadDataSQLParserTest.java @@ -6,7 +6,6 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import junit.framework.TestCase; import org.junit.Assert; - /** * Created by magicdoom on 2015/6/5. */ @@ -14,12 +13,11 @@ 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(); // + 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()); - } } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java index 22ceced43..fc71e1c33 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java @@ -36,7 +36,6 @@ public class MySQLCharSetTest extends TestCase { equal(targetSql, resultSql); } - public void testAlterCharset() { String targetSql = "ALTER TABLE acct_certificate MODIFY COLUMN `nodeid` varchar(5) CHARSET `gbk` COLLATE `gbk_chinese_ci` NULL COMMENT ''"; @@ -45,12 +44,10 @@ public class MySQLCharSetTest extends TestCase { equal(targetSql, resultSql); } - 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/core/src/test/java/com/alibaba/druid/sql/parser/OraclePivotCloneTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/OraclePivotCloneTest.java index fded6a213..e37ff0f83 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/OraclePivotCloneTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/OraclePivotCloneTest.java @@ -13,9 +13,7 @@ import org.junit.Assert; * @date 2022/8/11 下午4:46 */ public class OraclePivotCloneTest extends TestCase { - public void testCreateCharset() { - String sql = "SELECT DEPT_ID, M01, M02, M03, M04\n" + "\t, M05, M06, M07, M08, M09\n" + "\t, M10, M11, M12\n" + @@ -32,9 +30,6 @@ public class OraclePivotCloneTest extends TestCase { System.out.println(sqlStatement1.toString()); - Assert.assertTrue(sqlStatement1.toString().equals(sql)); - } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/OracleSqlCommentTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/OracleSqlCommentTest.java index 278ec8417..8dc9e6915 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/OracleSqlCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/OracleSqlCommentTest.java @@ -16,14 +16,9 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; -import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; -import java.util.List; - /** * for pr #5877 */ @@ -34,15 +29,15 @@ public class OracleSqlCommentTest extends TestCase { System.out.println(SQLUtils.parseSingleStatement(sql, JdbcConstants.ORACLE, true)); } public void test_1() throws Exception { - String sql = "insert into user (id,name) select '501'||/*啊打发*/'|502|' as id, s,name from order s"; + String sql = "insert into user (id,name) select '501'||/*啊打发*/'|502|' as id, s,name from order s"; System.out.println(SQLUtils.parseSingleStatement(sql, JdbcConstants.ORACLE, true)); } public void test_2() throws Exception { - String sql = "update user set age=3 where id in ( select '501'||/*啊打发*/'|502|' as id from order s)"; + String sql = "update user set age=3 where id in ( select '501'||/*啊打发*/'|502|' as id from order s)"; System.out.println(SQLUtils.parseSingleStatement(sql, JdbcConstants.ORACLE, true)); } public void test_3() throws Exception { - String sql = "delete from user where id in (select '501'||/*啊打发*/'|502|' as id from order s)"; + String sql = "delete from user where id in (select '501'||/*啊打发*/'|502|' as id from order s)"; System.out.println(SQLUtils.parseSingleStatement(sql, JdbcConstants.ORACLE, true)); } } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/PGAlterTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/PGAlterTest.java index 6f56797b6..cb5fbe363 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/PGAlterTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/PGAlterTest.java @@ -1,16 +1,11 @@ package com.alibaba.druid.sql.parser; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableChangeOwner; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; -import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; -import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; import junit.framework.TestCase; import org.junit.Assert; -import java.util.List; - /** * PG alter语法解析 * @@ -19,7 +14,6 @@ import java.util.List; * @date 2024/1/30 9:48 */ public class PGAlterTest extends TestCase { - public void testPgAlterTableChangeOwner() { String sql = "alter table alter_table_test\n" + " owner to test_alter"; SQLStatementParser parser = new PGSQLStatementParser(sql); @@ -37,5 +31,4 @@ public class PGAlterTest extends TestCase { assert stmt.getItems().get(0) instanceof SQLAlterTableChangeOwner; assert (((SQLAlterTableChangeOwner) stmt.getItems().get(0)).getOwner().getSimpleName()).equals("test_alter"); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java index 3bd224a2c..32dd2c10d 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/PGIntervalSQLTest.java @@ -14,7 +14,6 @@ import java.util.List; * 类说明： */ 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'"; @@ -29,12 +28,10 @@ public class PGIntervalSQLTest extends TestCase { equal(sql3, sql3Result); } - private void equal(String targetSql, String resultSql) { PGSQLStatementParser parser = new PGSQLStatementParser(targetSql); PGSelectStatement statement = parser.parseSelect(); assertEquals(statement.toString(), resultSql); - } public void testIntervalSQL_OracleToPg() { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java index 94140e508..a9fa61900 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/PerfTest.java @@ -15,20 +15,19 @@ */ package com.alibaba.druid.sql.parser; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; -import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.Utils; +import junit.framework.TestCase; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.List; public class PerfTest extends TestCase { public void test_perf() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/SQLCommentTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/SQLCommentTest.java index 72c108340..7044d6e6d 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/SQLCommentTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/SQLCommentTest.java @@ -8,9 +8,9 @@ import junit.framework.TestCase; /** * test */ -public class SQLCommentTest extends TestCase { +public class SQLCommentTest extends TestCase { // issues 5708 - public void test1(){ + public void test1() { String sqlStr = "SELECT \n" + "test1, -- test1的注释\n" + "test2 -- test2的注释\n" + @@ -20,12 +20,12 @@ public class SQLCommentTest extends TestCase { System.out.println(sqlStatement1); } // issues 5709 - public void test2(){ + public void test2() { String sqlStr = "INSERT INTO S371_BSD_O_IDCS(\n" + "AAAA -- AAAA\n" + - ",BBBB -- BBBB\n" + - ",CCCC -- CCCC\n" + - ",DDDD -- DDDD\n" + + ", BBBB -- BBBB\n" + + ", CCCC -- CCCC\n" + + ", DDDD -- DDDD\n" + ")\n" + "\n" + "\t(SELECT \n" + diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java b/core/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java index a167c5a91..1808085fe 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/SQLLexerTest2.java @@ -15,13 +15,10 @@ */ package com.alibaba.druid.sql.parser; -import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import junit.framework.TestCase; import org.junit.Assert; -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"; @@ -97,5 +94,4 @@ public class SQLLexerTest2 extends TestCase { Assert.assertEquals(posLine, 2); Assert.assertEquals(column, 7); } - } diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java index 0260767d4..dbfca88fa 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/SQLMergeTest.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.sql.parser; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLInListExpr; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; @@ -26,6 +22,9 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; +import junit.framework.TestCase; + +import java.util.List; public class SQLMergeTest extends TestCase { protected String sql; @@ -39,7 +38,6 @@ public class SQLMergeTest extends TestCase { public void test_merge_1() throws Exception { String result = merge(); System.out.println(result); - } public void test_merge_2() throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverAlterTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverAlterTest.java index a0febf9b5..bd8f22e09 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverAlterTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverAlterTest.java @@ -18,7 +18,7 @@ public class SqlserverAlterTest extends TestCase { public void testAlter1() { String sql = "alter table alert_config_detail\n" + " add age14 int"; SQLStatementParser parser = new SQLServerStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); - SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); // + SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); try { stmt.toString(); } catch (ClassCastException e) { @@ -37,7 +37,7 @@ public class SqlserverAlterTest extends TestCase { public void testAlter2() { String sql = "ALTER TABLE \"console\".\"dbo\".\"alert_config_detail\"\n" + "\tADD \"age14\" int"; SQLStatementParser parser = new SQLServerStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); - SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); // + SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); try { stmt.toString(); } catch (ClassCastException e) { @@ -56,7 +56,7 @@ public class SqlserverAlterTest extends TestCase { public void testAlter3() { String sql = "ALTER TABLE [console].[dbo].[alert_config_detail]\n" + "\tADD [age14] int"; SQLStatementParser parser = new SQLServerStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); - SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); // + SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); try { stmt.toString(); } catch (ClassCastException e) { @@ -75,7 +75,7 @@ public class SqlserverAlterTest extends TestCase { public void testAlter4() { String sql = "ALTER TABLE [dbo].[alert_config_detail] DROP COLUMN [a2], COLUMN [a3], COLUMN [a4]"; SQLStatementParser parser = new SQLServerStatementParser(sql, SQLParserFeature.IgnoreNameQuotes); - SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); // + SQLAlterTableStatement stmt = (SQLAlterTableStatement) parser.parseStatement(); try { stmt.toString(); } catch (ClassCastException e) { diff --git a/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java b/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java index bcece580e..209208de0 100644 --- a/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java +++ b/core/src/test/java/com/alibaba/druid/sql/parser/SqlserverGroupByTest.java @@ -12,13 +12,12 @@ 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(); // + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatement(); try { stmt.toString(); } catch (ClassCastException e) { Assert.fail(e.getMessage()); } - } } diff --git a/core/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java b/core/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java index 576ec8568..dcbc19270 100644 --- a/core/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java +++ b/core/src/test/java/com/alibaba/druid/sql/performance/TestSelectPerformance.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.sql.performance; -import java.text.NumberFormat; -import java.util.List; - -import junit.framework.TestCase; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; + +import java.text.NumberFormat; +import java.util.List; public class TestSelectPerformance extends TestCase { private final int COUNT = 1000 * 1000; diff --git a/core/src/test/java/com/alibaba/druid/sql/test/TestUtils.java b/core/src/test/java/com/alibaba/druid/sql/test/TestUtils.java index 2dfeff196..82929b27f 100644 --- a/core/src/test/java/com/alibaba/druid/sql/test/TestUtils.java +++ b/core/src/test/java/com/alibaba/druid/sql/test/TestUtils.java @@ -15,19 +15,19 @@ */ package com.alibaba.druid.sql.test; -import java.lang.management.ManagementFactory; -import java.util.Arrays; -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import java.lang.management.ManagementFactory; +import java.util.Arrays; +import java.util.List; + public class TestUtils { public static String outputOracle(List stmtList) { StringBuilder out = new StringBuilder(); @@ -39,7 +39,7 @@ public class TestUtils { return out.toString(); } - + public static String outputPg(List stmtList) { StringBuilder out = new StringBuilder(); PGOutputVisitor visitor = new PGOutputVisitor(out); diff --git a/core/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java b/core/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java index c15041853..2b65e90c8 100644 --- a/core/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/AtomicMemoryTest.java @@ -1,11 +1,11 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.TestCase; - public class AtomicMemoryTest extends TestCase { public void test_0() throws Exception { AtomicLong item = new AtomicLong(); diff --git a/core/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java b/core/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java index 3b0b0e220..9e6b207fe 100644 --- a/core/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/HashMapMemoryTest.java @@ -1,12 +1,12 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; - public class HashMapMemoryTest extends TestCase { public void test_0() throws Exception { HashMap item = new HashMap(); diff --git a/core/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java b/core/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java index ea998b37a..406f96edd 100644 --- a/core/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/HistogramMemoryTest.java @@ -1,10 +1,10 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - public class HistogramMemoryTest extends TestCase { public void test_0() throws Exception { long memoryStart = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed(); diff --git a/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest.java b/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest.java index 2dcfc2a6e..7739574ee 100644 --- a/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest.java @@ -1,10 +1,10 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - public class JdbcSqlStatTest extends TestCase { private JdbcSqlStat item; diff --git a/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java b/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java index d4bffa378..8275ed76b 100644 --- a/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java +++ b/core/src/test/java/com/alibaba/druid/stat/JdbcSqlStatTest1.java @@ -1,10 +1,10 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - public class JdbcSqlStatTest1 extends TestCase { private JdbcDataSourceStat dataSourceStat = new JdbcDataSourceStat("", ""); diff --git a/core/src/test/java/com/alibaba/druid/stat/MemoryTest.java b/core/src/test/java/com/alibaba/druid/stat/MemoryTest.java index bc8542ab9..c8216c14a 100644 --- a/core/src/test/java/com/alibaba/druid/stat/MemoryTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/MemoryTest.java @@ -1,10 +1,10 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - public class MemoryTest extends TestCase { public void test_0() throws Exception { A item = new A(); diff --git a/core/src/test/java/com/alibaba/druid/stat/PerfTest.java b/core/src/test/java/com/alibaba/druid/stat/PerfTest.java index c680ad359..970d528ae 100644 --- a/core/src/test/java/com/alibaba/druid/stat/PerfTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/PerfTest.java @@ -1,10 +1,10 @@ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import junit.framework.TestCase; - public class PerfTest extends TestCase { public void test_0() throws Exception { for (int i = 0; i < 3; ++i) { diff --git a/core/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java b/core/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java index 52bfc0869..928c9dfad 100644 --- a/core/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/StatAnnotationTest.java @@ -1,10 +1,8 @@ package com.alibaba.druid.stat; -import java.util.List; -import java.util.Map; - +import com.alibaba.druid.stat.spring.UserService; +import com.alibaba.druid.support.spring.stat.SpringStatManager; import junit.framework.TestCase; - import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -12,11 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.alibaba.druid.stat.spring.UserService; -import com.alibaba.druid.support.spring.stat.SpringStatManager; +import java.util.List; +import java.util.Map; @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 { @Autowired private UserService userService; @@ -35,5 +33,4 @@ public class StatAnnotationTest extends TestCase { Assert.assertEquals("save()", statItem.get("Method")); Assert.assertEquals(1L, statItem.get("ExecuteCount")); } - } diff --git a/core/src/test/java/com/alibaba/druid/stat/TestBeidou.java b/core/src/test/java/com/alibaba/druid/stat/TestBeidou.java index 783925208..5f771018a 100644 --- a/core/src/test/java/com/alibaba/druid/stat/TestBeidou.java +++ b/core/src/test/java/com/alibaba/druid/stat/TestBeidou.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; -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"; diff --git a/core/src/test/java/com/alibaba/druid/stat/TestOracle.java b/core/src/test/java/com/alibaba/druid/stat/TestOracle.java index 804909ece..f3a38c8c0 100644 --- a/core/src/test/java/com/alibaba/druid/stat/TestOracle.java +++ b/core/src/test/java/com/alibaba/druid/stat/TestOracle.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.stat; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; -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"; diff --git a/core/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java b/core/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java index 5cb25fe24..7cf4749b6 100644 --- a/core/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/WebSessionStatTest.java @@ -1,12 +1,11 @@ package com.alibaba.druid.stat; +import com.alibaba.druid.support.http.stat.WebSessionStat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - -import com.alibaba.druid.support.http.stat.WebSessionStat; - public class WebSessionStatTest extends TestCase { public void test_0() throws Exception { WebSessionStat item = new WebSessionStat("1b959a6db8489c4c7ef7bf0bd743ab52"); @@ -34,33 +33,30 @@ public class WebSessionStatTest extends TestCase { public void test_addRemoteAddress() throws Exception { WebSessionStat item = new WebSessionStat("1b959a6db8489c4c7ef7bf0bd743ab52"); item.addRemoteAddress("127.0.0.32"); - assertEquals("127.0.0.32",item.getRemoteAddress()); + assertEquals("127.0.0.32", item.getRemoteAddress()); item.addRemoteAddress(null); - assertEquals("127.0.0.32",item.getRemoteAddress()); + assertEquals("127.0.0.32", item.getRemoteAddress()); item.addRemoteAddress(""); - assertEquals("127.0.0.32",item.getRemoteAddress()); + assertEquals("127.0.0.32", item.getRemoteAddress()); item.addRemoteAddress("123"); - assertEquals("127.0.0.32",item.getRemoteAddress()); - item.addRemoteAddress("127.0.0.32");//ip在第一个的场景 - assertEquals("127.0.0.32",item.getRemoteAddress()); + assertEquals("127.0.0.32", item.getRemoteAddress()); + item.addRemoteAddress("127.0.0.32"); //ip在第一个的场景 + assertEquals("127.0.0.32", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.23"); - assertEquals("127.0.0.32;127.0.0.23",item.getRemoteAddress()); - item.addRemoteAddress("127.0.0.23");//ip在最后一个的 - assertEquals("127.0.0.32;127.0.0.23",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23", item.getRemoteAddress()); + item.addRemoteAddress("127.0.0.23"); //ip在最后一个的 + assertEquals("127.0.0.32;127.0.0.23", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.235"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.3"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.3"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.32"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.235"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3",item.getRemoteAddress()); + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3", item.getRemoteAddress()); item.addRemoteAddress("127.0.0.2"); - assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3;127.0.0.2",item.getRemoteAddress()); - - - + assertEquals("127.0.0.32;127.0.0.23;127.0.0.235;127.0.0.3;127.0.0.2", item.getRemoteAddress()); } } diff --git a/core/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java b/core/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java index 5022eae4b..f0e3c9c47 100644 --- a/core/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java +++ b/core/src/test/java/com/alibaba/druid/stat/WebURIStatMemoryTest.java @@ -1,12 +1,11 @@ package com.alibaba.druid.stat; +import com.alibaba.druid.support.http.stat.WebURIStat; +import junit.framework.TestCase; + import java.lang.management.ManagementFactory; import java.text.NumberFormat; -import junit.framework.TestCase; - -import com.alibaba.druid.support.http.stat.WebURIStat; - public class WebURIStatMemoryTest extends TestCase { public void test_0() throws Exception { WebURIStat item = new WebURIStat(""); diff --git a/core/src/test/java/com/alibaba/druid/support/http/ResourceServletSsoTestCase.java b/core/src/test/java/com/alibaba/druid/support/http/ResourceServletSsoTestCase.java index 7a5eb2271..22b0dc545 100644 --- a/core/src/test/java/com/alibaba/druid/support/http/ResourceServletSsoTestCase.java +++ b/core/src/test/java/com/alibaba/druid/support/http/ResourceServletSsoTestCase.java @@ -8,12 +8,11 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletConfig; import javax.servlet.http.HttpServletRequest; + import java.io.File; import java.lang.reflect.Field; public class ResourceServletSsoTestCase extends TestCase { - - public void testSso() throws Exception { final File file = new File("target/test-classes/META-INF/services/com.alibaba.druid.support.http.DruidWebSecurityProvider"); FileUtils.write(file, DruidWebSecurityProviderMockSsoOk.class.getName()); diff --git a/core/src/test/java/com/alibaba/druid/support/http/ResourceServletTestCase.java b/core/src/test/java/com/alibaba/druid/support/http/ResourceServletTestCase.java index ff0926c27..ab3b7b4bd 100644 --- a/core/src/test/java/com/alibaba/druid/support/http/ResourceServletTestCase.java +++ b/core/src/test/java/com/alibaba/druid/support/http/ResourceServletTestCase.java @@ -10,7 +10,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; public class ResourceServletTestCase extends TestCase { - public void testNotLogin() throws Exception { final Field securitySpiFld = getToNotFinal(); securitySpiFld.set(null, null); diff --git a/core/src/test/java/com/alibaba/druid/test/AlibDriverTest.java b/core/src/test/java/com/alibaba/druid/test/AlibDriverTest.java index b20a50a12..38e2e04cf 100644 --- a/core/src/test/java/com/alibaba/druid/test/AlibDriverTest.java +++ b/core/src/test/java/com/alibaba/druid/test/AlibDriverTest.java @@ -1,6 +1,5 @@ package com.alibaba.druid.test; -import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; import java.sql.Connection; diff --git a/core/src/test/java/com/alibaba/druid/test/AlibTest.java b/core/src/test/java/com/alibaba/druid/test/AlibTest.java index 52781f63f..f78d07966 100644 --- a/core/src/test/java/com/alibaba/druid/test/AlibTest.java +++ b/core/src/test/java/com/alibaba/druid/test/AlibTest.java @@ -13,7 +13,6 @@ public class AlibTest extends TestCase { dataSource.setUrl("jdbc:mysql://127.0.0.1:8507"); dataSource.setUsername("root"); dataSource.setPassword("root"); - } protected void tearDown() throws Exception { @@ -24,6 +23,4 @@ public class AlibTest extends TestCase { Connection conn = dataSource.getConnection(); conn.close(); } - - } diff --git a/core/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java b/core/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java index 24a46147f..be1784e6b 100644 --- a/core/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java +++ b/core/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java @@ -1,17 +1,15 @@ package com.alibaba.druid.test; -import javax.sql.DataSource; - -import org.junit.Assert; +import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; - +import org.junit.Assert; import org.nutz.dao.Chain; import org.nutz.dao.Dao; import org.nutz.dao.impl.NutDao; import org.nutz.trans.Atom; import org.nutz.trans.Trans; -import com.alibaba.druid.pool.DruidDataSource; +import javax.sql.DataSource; public class NutzTransactionTest extends TestCase { private DataSource dataSource; @@ -68,5 +66,4 @@ public class NutzTransactionTest extends TestCase { } Assert.assertEquals(0, dao.count("[test]")); } - } diff --git a/core/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java b/core/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java index 019eb7e13..72bf5670f 100644 --- a/core/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java +++ b/core/src/test/java/com/alibaba/druid/test/OdpsSelectTest6.java @@ -15,25 +15,22 @@ */ package com.alibaba.druid.test; -import java.io.File; -import java.util.List; - -import org.apache.commons.io.FileUtils; -import org.junit.Assert; - import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; import com.alibaba.druid.sql.parser.SQLStatementParser; - import junit.framework.TestCase; +import org.apache.commons.io.FileUtils; +import org.junit.Assert; + +import java.io.File; +import java.util.List; 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); @@ -48,5 +45,4 @@ public class OdpsSelectTest6 extends TestCase { // + "\nWHERE ds = '20160303'" // + "\n\tAND hour IN ('18')", SQLUtils.formatOdps(sql)); } - } diff --git a/core/src/test/java/com/alibaba/druid/test/QuartzTest.java b/core/src/test/java/com/alibaba/druid/test/QuartzTest.java index a194f2f84..62764182c 100644 --- a/core/src/test/java/com/alibaba/druid/test/QuartzTest.java +++ b/core/src/test/java/com/alibaba/druid/test/QuartzTest.java @@ -1,14 +1,11 @@ package com.alibaba.druid.test; -import java.util.Properties; - import com.alibaba.druid.PoolTestCase; -import junit.framework.TestCase; - -import org.quartz.Scheduler; import org.quartz.impl.StdScheduler; import org.quartz.impl.StdSchedulerFactory; +import java.util.Properties; + public class QuartzTest extends PoolTestCase { StdSchedulerFactory factory; StdScheduler scheduler; @@ -29,7 +26,6 @@ public class QuartzTest extends PoolTestCase { protected void tearDown() throws Exception { scheduler.shutdown(); - Thread.sleep(1000 * 1000); super.tearDown(); } @@ -37,5 +33,4 @@ public class QuartzTest extends PoolTestCase { public void testQuartz() throws Exception { scheduler.start(); } - } diff --git a/core/src/test/java/com/alibaba/druid/test/RaspberryPiMySqlTest.java b/core/src/test/java/com/alibaba/druid/test/RaspberryPiMySqlTest.java index 01bde3084..f97555852 100644 --- a/core/src/test/java/com/alibaba/druid/test/RaspberryPiMySqlTest.java +++ b/core/src/test/java/com/alibaba/druid/test/RaspberryPiMySqlTest.java @@ -2,13 +2,7 @@ package com.alibaba.druid.test; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; -import org.junit.Assert; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; /** * Created by wenshao on 10/12/2016. diff --git a/core/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java b/core/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java index 12a648f07..42659113e 100644 --- a/core/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java +++ b/core/src/test/java/com/alibaba/druid/test/ThreadLocalCache.java @@ -7,12 +7,11 @@ public class ThreadLocalCache { 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"; for (int i = 0; i < 5; ++i) { - f(str); // + f(str); // f2(str); // 2333 } } - public static void f(String str) throws Exception { long start = System.currentTimeMillis(); for (int i = 0; i < 1000 * 1000; ++i) { diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java index 6c20ff272..9d235b52b 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnection.java @@ -15,24 +15,14 @@ */ package com.alibaba.druid.test.util; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Array; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.Date; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.sql.Time; -import java.sql.Timestamp; -import java.time.ZoneId; -import java.util.Calendar; -import java.util.EnumSet; -import java.util.Properties; -import java.util.TimeZone; -import java.util.concurrent.Executor; - -import oracle.jdbc.*; +import com.alibaba.druid.mock.MockConnection; +import com.alibaba.druid.mock.MockConnectionClosedException; +import com.alibaba.druid.mock.MockDriver; +import oracle.jdbc.LogicalTransactionId; +import oracle.jdbc.LogicalTransactionIdEventListener; +import oracle.jdbc.OracleOCIFailover; +import oracle.jdbc.OracleSavepoint; +import oracle.jdbc.OracleShardingKey; import oracle.jdbc.aq.AQDequeueOptions; import oracle.jdbc.aq.AQEnqueueOptions; import oracle.jdbc.aq.AQMessage; @@ -40,21 +30,17 @@ import oracle.jdbc.aq.AQNotificationRegistration; import oracle.jdbc.dcn.DatabaseChangeRegistration; import oracle.jdbc.internal.OracleConnection; import oracle.jdbc.pool.OracleConnectionCacheCallback; -import oracle.sql.ARRAY; -import oracle.sql.BINARY_DOUBLE; -import oracle.sql.BINARY_FLOAT; -import oracle.sql.DATE; -import oracle.sql.INTERVALDS; -import oracle.sql.INTERVALYM; -import oracle.sql.NUMBER; -import oracle.sql.TIMESTAMP; -import oracle.sql.TIMESTAMPLTZ; -import oracle.sql.TIMESTAMPTZ; -import oracle.sql.TypeDescriptor; +import oracle.sql.*; -import com.alibaba.druid.mock.MockConnection; -import com.alibaba.druid.mock.MockConnectionClosedException; -import com.alibaba.druid.mock.MockDriver; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.sql.*; +import java.time.ZoneId; +import java.util.Calendar; +import java.util.EnumSet; +import java.util.Properties; +import java.util.TimeZone; +import java.util.concurrent.Executor; public class OracleMockConnection extends MockConnection implements oracle.jdbc.OracleConnection { private int defaultRowPrefetch = 10; diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java index 4ad6037f2..44b9e2637 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockConnectionJdbc3.java @@ -1,10 +1,9 @@ package com.alibaba.druid.test.util; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.mock.MockDriver; +import java.sql.SQLException; +import java.util.Properties; public class OracleMockConnectionJdbc3 extends OracleMockConnection { public OracleMockConnectionJdbc3(MockDriver driver, String url, Properties connectProperties) { diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java index dbe004972..79d66a6d7 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriver.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.test.util; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.mock.MockStatementBase; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; public class OracleMockDriver extends MockDriver { public Connection connect(String url, Properties info) throws SQLException { diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverConnectFailed.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverConnectFailed.java index 39b0684b0..611522619 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverConnectFailed.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverConnectFailed.java @@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; public class OracleMockDriverConnectFailed extends OracleMockDriver { - public static CyclicBarrier CONNECT_BARIER = new CyclicBarrier(2); @Override diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java index 1ceed913c..fbc3f153b 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockDriverJdbc3.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.test.util; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.mock.MockStatementBase; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; public class OracleMockDriverJdbc3 extends MockDriver { public Connection connect(String url, Properties info) throws SQLException { diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java index 25d17cc99..7ef57ebde 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatement.java @@ -15,52 +15,18 @@ */ package com.alibaba.druid.test.util; +import com.alibaba.druid.mock.MockPreparedStatement; +import oracle.jdbc.OracleParameterMetaData; +import oracle.jdbc.dcn.DatabaseChangeRegistration; +import oracle.sql.*; + 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.RowId; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; +import java.sql.*; import java.util.Calendar; -import oracle.jdbc.OracleParameterMetaData; -import oracle.jdbc.dcn.DatabaseChangeRegistration; -import oracle.sql.ARRAY; -import oracle.sql.BFILE; -import oracle.sql.BINARY_DOUBLE; -import oracle.sql.BINARY_FLOAT; -import oracle.sql.BLOB; -import oracle.sql.CHAR; -import oracle.sql.CLOB; -import oracle.sql.CustomDatum; -import oracle.sql.DATE; -import oracle.sql.Datum; -import oracle.sql.INTERVALDS; -import oracle.sql.INTERVALYM; -import oracle.sql.NUMBER; -import oracle.sql.OPAQUE; -import oracle.sql.ORAData; -import oracle.sql.RAW; -import oracle.sql.REF; -import oracle.sql.ROWID; -import oracle.sql.STRUCT; -import oracle.sql.StructDescriptor; -import oracle.sql.TIMESTAMP; -import oracle.sql.TIMESTAMPLTZ; -import oracle.sql.TIMESTAMPTZ; - -import com.alibaba.druid.mock.MockPreparedStatement; - public class OracleMockPreparedStatement extends MockPreparedStatement implements oracle.jdbc.internal.OraclePreparedStatement { private int executeBatch = 50; diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java index fa7c245fd..8d05ec935 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockPreparedStatementJdbc3.java @@ -2,7 +2,6 @@ package com.alibaba.druid.test.util; import java.sql.SQLException; - public class OracleMockPreparedStatementJdbc3 extends OracleMockPreparedStatement { public OracleMockPreparedStatementJdbc3(OracleMockConnection conn, String sql) { super(conn, sql); diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java index c284cebfe..e453a06c7 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSet.java @@ -1,37 +1,14 @@ package com.alibaba.druid.test.util; +import com.alibaba.druid.mock.MockResultSet; +import oracle.jdbc.OracleDataFactory; +import oracle.jdbc.OracleResultSet; +import oracle.sql.*; + import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import oracle.jdbc.OracleDataFactory; -import oracle.jdbc.OracleResultSet; -import oracle.sql.ARRAY; -import oracle.sql.BFILE; -import oracle.sql.BLOB; -import oracle.sql.CHAR; -import oracle.sql.CLOB; -import oracle.sql.CustomDatum; -import oracle.sql.CustomDatumFactory; -import oracle.sql.DATE; -import oracle.sql.Datum; -import oracle.sql.INTERVALDS; -import oracle.sql.INTERVALYM; -import oracle.sql.NUMBER; -import oracle.sql.OPAQUE; -import oracle.sql.ORAData; -import oracle.sql.ORADataFactory; -import oracle.sql.RAW; -import oracle.sql.REF; -import oracle.sql.ROWID; -import oracle.sql.STRUCT; -import oracle.sql.TIMESTAMP; -import oracle.sql.TIMESTAMPLTZ; -import oracle.sql.TIMESTAMPTZ; - -import com.alibaba.druid.mock.MockResultSet; - - public class OracleMockResultSet extends MockResultSet implements OracleResultSet { public OracleMockResultSet(Statement statement) { super(statement); @@ -577,5 +554,4 @@ public class OracleMockResultSet extends MockResultSet implements OracleResultSe // TODO Auto-generated method stub } - } diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java b/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java index ca8fc251e..a324d8e55 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleMockResultSetJdbc3.java @@ -3,7 +3,6 @@ package com.alibaba.druid.test.util; import java.sql.SQLException; import java.sql.Statement; - public class OracleMockResultSetJdbc3 extends OracleMockResultSet { public OracleMockResultSetJdbc3(Statement statement) { super(statement); diff --git a/core/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java b/core/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java index ddf124b4f..5f399f82a 100644 --- a/core/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/test/util/OracleUtilsTest.java @@ -15,17 +15,15 @@ */ package com.alibaba.druid.test.util; +import com.alibaba.druid.util.OracleUtils; +import junit.framework.TestCase; +import oracle.jdbc.OracleConnection; +import org.junit.Assert; + import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import junit.framework.TestCase; -import oracle.jdbc.OracleConnection; - -import org.junit.Assert; - -import com.alibaba.druid.util.OracleUtils; - public class OracleUtilsTest extends TestCase { public void test_oracle() throws Exception { InvocationHandler handler = new InvocationHandler() { diff --git a/core/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java b/core/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java index 046d9027c..c9f6155cf 100644 --- a/core/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java +++ b/core/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java @@ -15,23 +15,17 @@ */ package com.alibaba.druid.test.wall; -import java.io.File; -import java.io.FileInputStream; - -import junit.framework.TestCase; - -import com.alibaba.druid.util.Utils; import com.alibaba.druid.wall.Violation; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; public class MySqlResourceWallTest extends TestCase { private String[] items; - public void test_false() throws Exception { WallProvider provider = new MySqlWallProvider(); @@ -69,7 +63,6 @@ public class MySqlResourceWallTest extends TestCase { // Assert.assertFalse(provider.checkValid(sql)); } - @Test public void test_lock_table() throws Exception { WallProvider provider = new MySqlWallProvider(); @@ -83,7 +76,6 @@ public class MySqlResourceWallTest extends TestCase { } Assert.assertTrue(provider.checkValid(sql)); - sql = "lock tables etstsun LOW_PRIORITY write"; result = provider.check(sql); if (result.getViolations().size() > 0) { @@ -92,7 +84,6 @@ public class MySqlResourceWallTest extends TestCase { } Assert.assertTrue(provider.checkValid(sql)); - sql = "UNLOCK TABLES"; result = provider.check(sql); if (result.getViolations().size() > 0) { @@ -101,7 +92,6 @@ public class MySqlResourceWallTest extends TestCase { } Assert.assertTrue(provider.checkValid(sql)); - sql = "lock table dsdfsdf read"; result = provider.check(sql); if (result.getViolations().size() > 0) { @@ -110,7 +100,6 @@ public class MySqlResourceWallTest extends TestCase { } Assert.assertTrue(provider.checkValid(sql)); - sql = "lock table dsdfsdf read local"; result = provider.check(sql); if (result.getViolations().size() > 0) { @@ -118,8 +107,5 @@ public class MySqlResourceWallTest extends TestCase { System.out.println("error () : " + violation.getMessage()); } Assert.assertTrue(provider.checkValid(sql)); - - } - } diff --git a/core/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java b/core/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java index 080521ad6..3d27adf4c 100644 --- a/core/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java +++ b/core/src/test/java/com/alibaba/druid/test/wall/ResourceTest.java @@ -1,15 +1,14 @@ package com.alibaba.druid.test.wall; -import java.io.File; -import java.io.FileInputStream; - -import junit.framework.TestCase; - import com.alibaba.druid.util.Utils; import com.alibaba.druid.wall.Violation; import com.alibaba.druid.wall.WallCheckResult; import com.alibaba.druid.wall.WallProvider; import com.alibaba.druid.wall.spi.MySqlWallProvider; +import junit.framework.TestCase; + +import java.io.File; +import java.io.FileInputStream; public class ResourceTest extends TestCase { private String[] items; @@ -41,5 +40,4 @@ public class ResourceTest extends TestCase { System.out.println("violaionCount : " + provider.getViolationCount()); } - } diff --git a/core/src/test/java/com/alibaba/druid/util/ConcurrentLruCacheTest.java b/core/src/test/java/com/alibaba/druid/util/ConcurrentLruCacheTest.java index 7008ab64e..bd4500614 100644 --- a/core/src/test/java/com/alibaba/druid/util/ConcurrentLruCacheTest.java +++ b/core/src/test/java/com/alibaba/druid/util/ConcurrentLruCacheTest.java @@ -17,14 +17,11 @@ import java.util.stream.Collectors; * @author shenjianeng [ishenjianeng@qq.com] */ public class ConcurrentLruCacheTest extends TestCase { - - public void testConcurrentLruCache() { ConcurrentLruCache cache = new ConcurrentLruCache<>(2); Assert.assertEquals(0, cache.size()); Assert.assertEquals("k1value", cache.computeIfAbsent("k1", key -> key + "value")); - Assert.assertEquals(1, cache.size()); Assert.assertTrue(cache.contains("k1")); @@ -36,7 +33,6 @@ public class ConcurrentLruCacheTest extends TestCase { Assert.assertEquals("k1value", cache.get("k1")); Assert.assertEquals("k2value", cache.get("k2")); - Assert.assertEquals("k3value", cache.computeIfAbsent("k3", key -> key + "value")); Assert.assertEquals(2, cache.size()); @@ -46,10 +42,8 @@ public class ConcurrentLruCacheTest extends TestCase { Assert.assertTrue(cache.contains("k2")); Assert.assertTrue(cache.contains("k3")); - cache.clear(); Assert.assertEquals(0, cache.size()); - } public void testComputeIfAbsent() { diff --git a/core/src/test/java/com/alibaba/druid/util/DruidDataSourceUtilsTest.java b/core/src/test/java/com/alibaba/druid/util/DruidDataSourceUtilsTest.java index bb3c49932..7df53c1c5 100644 --- a/core/src/test/java/com/alibaba/druid/util/DruidDataSourceUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/util/DruidDataSourceUtilsTest.java @@ -1,20 +1,17 @@ package com.alibaba.druid.util; +import com.alibaba.druid.pool.DruidAbstractDataSource; +import com.alibaba.druid.pool.DruidDataSource; +import junit.framework.TestCase; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Properties; -import com.alibaba.druid.pool.DruidAbstractDataSource; -import com.alibaba.druid.pool.DruidDataSource; - -import junit.framework.TestCase; - /** * @author lizongbo - */ public class DruidDataSourceUtilsTest extends TestCase { - public void testConfigFromProperties() { Properties properties = new Properties(); //DruidAbstractDataSource fields @@ -495,6 +492,5 @@ public class DruidDataSourceUtilsTest extends TestCase { properties.put("druid.name", druidName); DruidDataSource dataSource = new DruidDataSource(); dataSource.configFromPropeties(properties); - } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/util/MapComparatorTest.java b/core/src/test/java/com/alibaba/druid/util/MapComparatorTest.java index 8c83409d3..c99618806 100644 --- a/core/src/test/java/com/alibaba/druid/util/MapComparatorTest.java +++ b/core/src/test/java/com/alibaba/druid/util/MapComparatorTest.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.util; +import junit.framework.TestCase; +import org.junit.Assert; + import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.junit.Assert; -import junit.framework.TestCase; - public class MapComparatorTest extends TestCase { private String orderByKey = "orderby"; @@ -73,7 +73,6 @@ public class MapComparatorTest extends TestCase { map1.put(orderByKey, null); map2.put(orderByKey, null); Assert.assertEquals(true, comparator.compare(map1, map2) == 0); - } private void test_comparator_date_0(boolean desc) throws Exception { @@ -103,7 +102,6 @@ public class MapComparatorTest extends TestCase { map1.put(orderByKey, null); map2.put(orderByKey, null); Assert.assertEquals(true, comparator.compare(map1, map2) == 0); - } private void test_comparator_string_0(boolean desc) throws Exception { diff --git a/core/src/test/java/com/alibaba/druid/util/MySqlUtilsTest.java b/core/src/test/java/com/alibaba/druid/util/MySqlUtilsTest.java index 5944f4a49..5b13bbc38 100644 --- a/core/src/test/java/com/alibaba/druid/util/MySqlUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/util/MySqlUtilsTest.java @@ -27,7 +27,6 @@ import java.util.TimeZone; * @date: 2024-01-22 */ public class MySqlUtilsTest extends TestCase { - public void testParseMillis() { Assert.assertThrows(IllegalArgumentException.class, () -> MySqlUtils.parseMillis(null, TimeZone.getTimeZone("GMT+8"))); @@ -37,4 +36,4 @@ public class MySqlUtilsTest extends TestCase { Assert.assertThrows(IllegalArgumentException.class, () -> MySqlUtils.parseDateTime(null, 0, 0, ZoneId.systemDefault())); } -} \ No newline at end of file +} diff --git a/core/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java b/core/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java index 1fae238a2..f0f8d04e4 100644 --- a/core/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java +++ b/core/src/test/java/com/alibaba/druid/util/ServletPathMathcherTest.java @@ -15,11 +15,10 @@ */ package com.alibaba.druid.util; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; - import org.junit.Test; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; public class ServletPathMathcherTest { /** diff --git a/core/src/test/java/com/alibaba/druid/util/StringUtilsTest.java b/core/src/test/java/com/alibaba/druid/util/StringUtilsTest.java index c2f5d8fe4..09f445218 100644 --- a/core/src/test/java/com/alibaba/druid/util/StringUtilsTest.java +++ b/core/src/test/java/com/alibaba/druid/util/StringUtilsTest.java @@ -20,7 +20,6 @@ import org.junit.Assert; import org.junit.Test; public class StringUtilsTest { - @Test public void testSubStringToInteger() { Assert.assertNull(StringUtils.subStringToInteger("foobar", "1", "3")); diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/InitConfigurer.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/InitConfigurer.java index b45ba39dd..ffaefb28e 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/InitConfigurer.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/InitConfigurer.java @@ -2,20 +2,19 @@ package com.alibaba.druid.spring.boot3.demo.configurer; import com.alibaba.druid.spring.boot3.demo.dao.UserDao; import com.alibaba.druid.spring.boot3.demo.model.User; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; -import jakarta.annotation.PostConstruct; - @Configuration @Profile("default") -public class InitConfigurer{ +public class InitConfigurer { @Autowired private UserDao userDao; @PostConstruct - public void init(){ + public void init() { for (int i = 1; i <= 100; i++) { userDao.save(new User("TEST-NAME-" + i)); } diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/MultiDataSourceConfigurer.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/MultiDataSourceConfigurer.java index ad1a1de82..9e8d5ea3a 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/MultiDataSourceConfigurer.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/configurer/MultiDataSourceConfigurer.java @@ -15,13 +15,13 @@ public class MultiDataSourceConfigurer { @Primary @Bean(initMethod = "init") @ConfigurationProperties("spring.datasource.druid.one") - public DataSource dataSourceOne(){ + public DataSource dataSourceOne() { return DruidDataSourceBuilder.create().build(); } @Bean(initMethod = "init") @ConfigurationProperties("spring.datasource.druid.two") - public DataSource dataSourceTwo(){ + public DataSource dataSourceTwo() { return DruidDataSourceBuilder.create().build(); } } diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/dao/UserDao.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/dao/UserDao.java index 666a614ad..bc3f457c3 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/dao/UserDao.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/dao/UserDao.java @@ -1,8 +1,7 @@ package com.alibaba.druid.spring.boot3.demo.dao; - import com.alibaba.druid.spring.boot3.demo.model.User; import org.springframework.data.repository.CrudRepository; -public interface UserDao extends CrudRepository {} - +public interface UserDao extends CrudRepository { +} diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/service/UserService.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/service/UserService.java index a6fecf7e9..52bd4b02e 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/service/UserService.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/service/UserService.java @@ -1,6 +1,5 @@ package com.alibaba.druid.spring.boot3.demo.service; - import com.alibaba.druid.spring.boot3.demo.model.User; public interface UserService { diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/DruidStatController.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/DruidStatController.java index 6b8a07862..fade2ca68 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/DruidStatController.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/DruidStatController.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class DruidStatController { @GetMapping("/durid/stat") - public Object druidStat(){ + public Object druidStat() { // DruidStatManagerFacade#getDataSourceStatDataList 该方法可以获取所有数据源的监控数据，除此之外 DruidStatManagerFacade 还提供了一些其他方法，你可以按需选择使用。 return DruidStatManagerFacade.getInstance().getDataSourceStatDataList(); } diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/UserController.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/UserController.java index faacb5b78..6cdefe4e5 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/UserController.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/demo/web/UserController.java @@ -1,6 +1,5 @@ package com.alibaba.druid.spring.boot3.demo.web; - import com.alibaba.druid.spring.boot3.demo.model.User; import com.alibaba.druid.spring.boot3.demo.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -public class UserController { +public class UserController { @Autowired private UserService userService; diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidFilterTestCase.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidFilterTestCase.java index 684a4c3c3..210cf5ae5 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidFilterTestCase.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidFilterTestCase.java @@ -41,7 +41,7 @@ public class DruidFilterTestCase { */ @Configuration @ComponentScan - public static class Config{ + public static class Config { /** * @author dk */ @@ -50,12 +50,12 @@ public class DruidFilterTestCase { private static Logger logger = LoggerFactory.getLogger(SomeCustomFilter.class); @Override - public void init(DataSourceProxy dataSourceProxy){ + public void init(DataSourceProxy dataSourceProxy) { if (!(dataSourceProxy instanceof DruidDataSource)) { logger.error("ConfigLoader only support DruidDataSource"); } DruidDataSource dataSource = (DruidDataSource) dataSourceProxy; - logger.info("db configuration: url="+ dataSource.getUrl()); + logger.info("db configuration: url=" + dataSource.getUrl()); } } } diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidMultiDataSourceTestCase.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidMultiDataSourceTestCase.java index 05791f909..21c3a2e12 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidMultiDataSourceTestCase.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/DruidMultiDataSourceTestCase.java @@ -21,6 +21,7 @@ import jakarta.annotation.Resource; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; + import java.sql.SQLException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/Issue1796TestCase.java b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/Issue1796TestCase.java index be08cf425..32f7efc59 100644 --- a/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/Issue1796TestCase.java +++ b/druid-spring-boot-3-starter/src/test/java/com/alibaba/druid/spring/boot3/testcase/Issue1796TestCase.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; - import static org.assertj.core.api.Assertions.assertThat; /** diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/InitConfigurer.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/InitConfigurer.java index 98fccb13b..1ac3310a4 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/InitConfigurer.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/InitConfigurer.java @@ -15,7 +15,7 @@ public class InitConfigurer{ private UserDao userDao; @PostConstruct - public void init(){ + public void init() { for (int i = 1; i <= 100; i++) { userDao.save(new User("TEST-NAME-" + i)); } diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/MultiDataSourceConfigurer.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/MultiDataSourceConfigurer.java index 0b61ca5ff..bea9ec990 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/MultiDataSourceConfigurer.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/MultiDataSourceConfigurer.java @@ -15,13 +15,13 @@ public class MultiDataSourceConfigurer { @Primary @Bean(initMethod = "init") @ConfigurationProperties("spring.datasource.druid.one") - public DataSource dataSourceOne(){ + public DataSource dataSourceOne() { return DruidDataSourceBuilder.create().build(); } @Bean(initMethod = "init") @ConfigurationProperties("spring.datasource.druid.two") - public DataSource dataSourceTwo(){ + public DataSource dataSourceTwo() { return DruidDataSourceBuilder.create().build(); } } diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/dao/UserDao.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/dao/UserDao.java index 6037cdbfa..f9ee979af 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/dao/UserDao.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/dao/UserDao.java @@ -1,8 +1,6 @@ package com.alibaba.druid.spring.boot.demo.dao; - import com.alibaba.druid.spring.boot.demo.model.User; import org.springframework.data.repository.CrudRepository; public interface UserDao extends CrudRepository {} - diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserService.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserService.java index b9e5075a9..d1410010d 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserService.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserService.java @@ -1,6 +1,5 @@ package com.alibaba.druid.spring.boot.demo.service; - import com.alibaba.druid.spring.boot.demo.model.User; public interface UserService { diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java index 8fb4eb182..7063889ed 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/service/UserServiceImpl.java @@ -2,12 +2,11 @@ package com.alibaba.druid.spring.boot.demo.service; import com.alibaba.druid.spring.boot.demo.dao.UserDao; import com.alibaba.druid.spring.boot.demo.model.User; - -import java.util.Optional; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Optional; + @Service public class UserServiceImpl implements UserService { @Autowired diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/DruidStatController.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/DruidStatController.java index 6040439bb..34a430682 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/DruidStatController.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/DruidStatController.java @@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class DruidStatController { @GetMapping("/durid/stat") - public Object druidStat(){ + public Object druidStat() { // DruidStatManagerFacade#getDataSourceStatDataList 该方法可以获取所有数据源的监控数据，除此之外 DruidStatManagerFacade 还提供了一些其他方法，你可以按需选择使用。 return DruidStatManagerFacade.getInstance().getDataSourceStatDataList(); } diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/UserController.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/UserController.java index 7ad2b5d68..c05e1258c 100644 --- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/UserController.java +++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/web/UserController.java @@ -1,6 +1,5 @@ package com.alibaba.druid.spring.boot.demo.web; - import com.alibaba.druid.spring.boot.demo.model.User; import com.alibaba.druid.spring.boot.demo.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -9,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -public class UserController { +public class UserController { @Autowired private UserService userService; 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 114d3d98e..1ccd037ae 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 @@ -15,6 +15,7 @@ import org.springframework.stereotype.Component; import org.springframework.test.context.ActiveProfiles; import javax.annotation.Resource; + import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -50,12 +51,12 @@ public class DruidFilterTestCase { private static Logger logger = LoggerFactory.getLogger(SomeCustomFilter.class); @Override - public void init(DataSourceProxy dataSourceProxy){ + public void init(DataSourceProxy dataSourceProxy) { if (!(dataSourceProxy instanceof DruidDataSource)) { logger.error("ConfigLoader only support DruidDataSource"); } DruidDataSource dataSource = (DruidDataSource) dataSourceProxy; - logger.info("db configuration: url="+ dataSource.getUrl()); + logger.info("db configuration: url=" + dataSource.getUrl()); } } } 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 546110f2b..cdbebfa70 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 @@ -22,6 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import javax.annotation.Resource; + import java.sql.SQLException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/pom.xml b/pom.xml index 7cbc66ab0..6c434e100 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,7 @@ false true - false + true src/checkstyle/druid-checks.xml