Fix test failures on 22.7

zhicwu · zhicwu · commit de97ada97466 · 2022-07-24T21:07:26.000+08:00
diff --git a/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/BatchInsertsTest.java b/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/BatchInsertsTest.java
@@ -82,7 +82,7 @@ public void testBatchInsert2() throws Exception {
                         "string String," +
                         "int32 Int32," +
                         "float64 Float64" +
-                        ") ENGINE = MergeTree(date, (date), 8192)"
+                        ") ENGINE = MergeTree order by date"
         );
 
         Date date = new Date(dateFormat.parse("1989-01-30").getTime());
@@ -194,7 +194,7 @@ public void testSimpleInsert() throws Exception {
                         "string String," +
                         "int32 Int32," +
                         "float64 Float64" +
-                        ") ENGINE = MergeTree(date, (date), 8192)"
+                        ") ENGINE = MergeTree order by date"
         );
 
         Date date = new Date(dateFormat.parse("1989-01-30").getTime());
@@ -237,7 +237,7 @@ public void batchInsertNulls() throws Exception {
                         "string Nullable(String)," +
                         "int32 Nullable(Int32)," +
                         "float64 Nullable(Float64)" +
-                        ") ENGINE = MergeTree(date, (date), 8192)"
+                        ") ENGINE = MergeTree order by date"
         );
 
         ClickHousePreparedStatement statement = (ClickHousePreparedStatement) connection.prepareStatement(
diff --git a/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseDatabaseMetadataTest.java b/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseDatabaseMetadataTest.java
@@ -173,7 +173,7 @@ private Object[][] getTableEngines() {
             new String[] {"TinyLog"},
             new String[] {"Log"},
             new String[] {"Memory"},
-            new String[] {"MergeTree(foo, (foo), 8192)"}
+            new String[] {"MergeTree order by foo"}
         };
         // unfortunately this is hard to test
         // new String[] {"Dictionary(myDict)"},
diff --git a/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/RowBinaryStreamTest.java b/clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/RowBinaryStreamTest.java
@@ -548,7 +548,7 @@ public void testTimeZone() throws Exception {
         final ClickHouseStatement statement = connection.createStatement();
         connection.createStatement().execute("DROP TABLE IF EXISTS binary_tz");
         connection.createStatement().execute(
-                "CREATE TABLE binary_tz (date Date, dateTime DateTime) ENGINE = MergeTree(date, (date), 8192)");
+                "CREATE TABLE binary_tz (date Date, dateTime DateTime) ENGINE = MergeTree order by date");
 
         //
         final Date date1 = new Date(1497474018000L);
