replaced database name from tests to take tmp one

chernser · chernser · commit 7f3e0871645e · 2024-12-19T18:06:58.000-08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -201,7 +201,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: result ${{ github.job }}
+          name: result ${{ github.job }}_${{ matrix.clickhouse }}
           path: |
             **/target/failsafe-reports
             **/target/surefire-reports
diff --git a/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java b/client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java
@@ -105,7 +105,7 @@ public void insertSimplePOJOs() throws Exception {
 
         initTable(tableName, createSQL);
 
-        client.register(SamplePOJO.class, client.getTableSchema(tableName, "default"));
+        client.register(SamplePOJO.class, client.getTableSchema(tableName));
         List<Object> simplePOJOs = new ArrayList<>();
 
         for (int i = 0; i < 1000; i++) {
@@ -338,7 +338,7 @@ public void testLogComment(String logComment) throws Exception {
 
         initTable(tableName, createSQL);
 
-        client.register(SamplePOJO.class, client.getTableSchema(tableName, "default"));
+        client.register(SamplePOJO.class, client.getTableSchema(tableName));
 
         try (InsertResponse response = client.insert(tableName, Collections.singletonList(pojo), settings).get(30, TimeUnit.SECONDS)) {
             Assert.assertEquals(response.getWrittenRows(), 1);
diff --git a/client-v2/src/test/java/com/clickhouse/client/insert/SamplePOJO.java b/client-v2/src/test/java/com/clickhouse/client/insert/SamplePOJO.java
@@ -684,6 +684,6 @@ public static String generateTableCreateSQL(String tableName) {
                 "innerNullableInt Nullable(Int32)), " +
                 "groupBitmapUint32 AggregateFunction(groupBitmap, UInt32), " +
                 "groupBitmapUint64 AggregateFunction(groupBitmap, UInt64) " +
-                ") ENGINE = Memory";
+                ") ENGINE = MergeTree ORDER BY ()";
     }
 }
diff --git a/client-v2/src/test/java/com/clickhouse/client/query/QuerySamplePOJO.java b/client-v2/src/test/java/com/clickhouse/client/query/QuerySamplePOJO.java
@@ -575,6 +575,6 @@ public static String generateTableCreateSQL(String tableName) {
                 "tupleArray Tuple(Int32, Float64, String, String), " +
                 "map Map(String, Int32), " +
                 "nested Nested (innerInt Int32, innerString String)" +
-                ") ENGINE = Memory";
+                ") ENGINE = MergeTree ORDER BY ()";
     }
 }
diff --git a/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java b/client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java
@@ -1766,7 +1766,7 @@ public void testOperationCustomRoles(String[] roles) throws Exception {
             return;
         }
 
-        String password = "^" + RandomStringUtils.random(12, true, true) + "$";
+        String password = "^1A" + RandomStringUtils.random(12, true, true) + "3B$";
         final String rolesList = "\"" + Strings.join("\",\"", roles) + "\"";
         try (CommandResponse resp = client.execute("DROP ROLE IF EXISTS " + rolesList).get()) {
         }
@@ -1804,7 +1804,7 @@ public void testClientCustomRoles(String[] roles) throws Exception {
             return;
         }
 
-        String password = "^" + RandomStringUtils.random(12, true, true) + "$";
+        String password = "^1A" + RandomStringUtils.random(12, true, true) + "3B$";
         final String rolesList = "\"" + Strings.join("\",\"", roles) + "\"";
         try (CommandResponse resp = client.execute("DROP ROLE IF EXISTS " + rolesList).get()) {
         }
@@ -1879,6 +1879,9 @@ public void testReadingBitmap() throws Exception {
 
     @Test(groups = {"integration"})
     public void testReadingJSONValues() throws Exception {
+        if (isCloud()) {
+            return; // TODO: add support on cloud
+        }
         List<GenericRecord> serverVersion = client.queryAll("SELECT version()");
         if (ClickHouseVersion.of(serverVersion.get(0).getString(1)).check("(,24.8]")) {
             System.out.println("Test is skipped: feature is supported since 24.8");
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
@@ -1,12 +1,10 @@
 package com.clickhouse.jdbc;
 
-import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.query.GenericRecord;
+import com.clickhouse.data.ClickHouseVersion;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.testng.Assert;
 import org.testng.annotations.Test;
-import org.testng.util.Strings;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -20,9 +18,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
-import static org.testng.Assert.*;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
@@ -143,7 +139,7 @@ public void testExecuteQueryDates() throws Exception {
     public void testExecuteUpdateSimpleNumbers() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".simpleNumbers (num UInt8) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".simpleNumbers (num UInt8) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".simpleNumbers VALUES (1), (2), (3)"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT num FROM " + getDatabase() + ".simpleNumbers ORDER BY num")) {
                     assertTrue(rs.next());
@@ -162,7 +158,7 @@ public void testExecuteUpdateSimpleNumbers() throws Exception {
     public void testExecuteUpdateSimpleFloats() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".simpleFloats (num Float32) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".simpleFloats (num Float32) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".simpleFloats VALUES (1.1), (2.2), (3.3)"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT num FROM " + getDatabase() + ".simpleFloats ORDER BY num")) {
                     assertTrue(rs.next());
@@ -181,7 +177,7 @@ public void testExecuteUpdateSimpleFloats() throws Exception {
     public void testExecuteUpdateBooleans() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".booleans (id UInt8, flag Boolean) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".booleans (id UInt8, flag Boolean) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".booleans VALUES (0, true), (1, false), (2, true)"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT flag FROM " + getDatabase() + ".booleans ORDER BY id")) {
                     assertTrue(rs.next());
@@ -200,7 +196,7 @@ public void testExecuteUpdateBooleans() throws Exception {
     public void testExecuteUpdateStrings() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".strings (id UInt8, words String) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".strings (id UInt8, words String) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".strings VALUES (0, 'Hello'), (1, 'World'), (2, 'ClickHouse')"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT words FROM " + getDatabase() + ".strings ORDER BY id")) {
                     assertTrue(rs.next());
@@ -219,7 +215,7 @@ public void testExecuteUpdateStrings() throws Exception {
     public void testExecuteUpdateNulls() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".nulls (id UInt8, nothing Nullable(String)) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".nulls (id UInt8, nothing Nullable(String)) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".nulls VALUES (0, 'Hello'), (1, NULL), (2, 'ClickHouse')"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT nothing FROM " + getDatabase() + ".nulls ORDER BY id")) {
                     assertTrue(rs.next());
@@ -238,7 +234,7 @@ public void testExecuteUpdateNulls() throws Exception {
     public void testExecuteUpdateDates() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".dates (id UInt8, date Nullable(Date), datetime Nullable(DateTime)) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".dates (id UInt8, date Nullable(Date), datetime Nullable(DateTime)) ENGINE = MergeTree ORDER BY ()"), 0);
                 assertEquals(stmt.executeUpdate("INSERT INTO " + getDatabase() + ".dates VALUES (0, '2020-01-01', '2020-01-01 10:11:12'), (1, NULL, '2020-01-01 12:10:07'), (2, '2020-01-01', NULL)"), 3);
                 try (ResultSet rs = stmt.executeQuery("SELECT date, datetime FROM " + getDatabase() + ".dates ORDER BY id")) {
                     assertTrue(rs.next());
@@ -261,7 +257,7 @@ public void testExecuteUpdateDates() throws Exception {
     public void testExecuteUpdateBatch() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
-                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".batch (id UInt8, num UInt8) ENGINE = Memory"), 0);
+                assertEquals(stmt.executeUpdate("CREATE TABLE IF NOT EXISTS " + getDatabase() + ".batch (id UInt8, num UInt8) ENGINE = MergeTree ORDER BY ()"), 0);
                 stmt.addBatch("INSERT INTO " + getDatabase() + ".batch VALUES (0, 1)");
                 stmt.addBatch("INSERT INTO " + getDatabase() + ".batch VALUES (1, 2)");
                 stmt.addBatch("INSERT INTO " + getDatabase() + ".batch VALUES (2, 3), (3, 4)");
@@ -287,6 +283,9 @@ public void testExecuteUpdateBatch() throws Exception {
 
     @Test(groups = { "integration" })
     public void testJdbcEscapeSyntax() throws Exception {
+        if (ClickHouseVersion.of(getServerVersion()).check("(,23.8]")) {
+            return; // there is no `timestamp` function TODO: fix in JDBC
+        }
         try (Connection conn = getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
                 try (ResultSet rs = stmt.executeQuery("SELECT {d '2021-11-01'} AS D, {ts '2021-08-01 12:34:56'} AS TS, " +
@@ -349,7 +348,7 @@ private void testSettingRole() throws SQLException {
 
         List<String> roles = Arrays.asList("role1", "role2");
 
-        String userPass = "^" + RandomStringUtils.random(12, true, true) + "$";
+        String userPass = "^1A" + RandomStringUtils.random(12, true, true) + "3B$";
         try (ConnectionImpl conn = (ConnectionImpl) getJdbcConnection()) {
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("DROP ROLE IF EXISTS " + String.join(", ", roles));

Original file line number	Diff line number	Diff line change
`@@ -684,6 +684,6 @@ public static String generateTableCreateSQL(String tableName) {`
`684`	`684`	`"innerNullableInt Nullable(Int32)), " +`
`685`	`685`	`"groupBitmapUint32 AggregateFunction(groupBitmap, UInt32), " +`
`686`	`686`	`"groupBitmapUint64 AggregateFunction(groupBitmap, UInt64) " +`
`687`		`- ") ENGINE = Memory";`
	`687`	`+ ") ENGINE = MergeTree ORDER BY ()";`
`688`	`688`	`}`
`689`	`689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,6 @@ public static String generateTableCreateSQL(String tableName) {`
`575`	`575`	`"tupleArray Tuple(Int32, Float64, String, String), " +`
`576`	`576`	`"map Map(String, Int32), " +`
`577`	`577`	`"nested Nested (innerInt Int32, innerString String)" +`
`578`		`- ") ENGINE = Memory";`
	`578`	`+ ") ENGINE = MergeTree ORDER BY ()";`
`579`	`579`	`}`
`580`	`580`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1766,7 +1766,7 @@ public void testOperationCustomRoles(String[] roles) throws Exception {`
`1766`	`1766`	`return;`
`1767`	`1767`	`}`
`1768`	`1768`
`1769`		`- String password = "^" + RandomStringUtils.random(12, true, true) + "$";`
	`1769`	`+ String password = "^1A" + RandomStringUtils.random(12, true, true) + "3B$";`
`1770`	`1770`	`final String rolesList = "\"" + Strings.join("\",\"", roles) + "\"";`
`1771`	`1771`	`try (CommandResponse resp = client.execute("DROP ROLE IF EXISTS " + rolesList).get()) {`
`1772`	`1772`	`}`
`@@ -1804,7 +1804,7 @@ public void testClientCustomRoles(String[] roles) throws Exception {`
`1804`	`1804`	`return;`
`1805`	`1805`	`}`
`1806`	`1806`
`1807`		`- String password = "^" + RandomStringUtils.random(12, true, true) + "$";`
	`1807`	`+ String password = "^1A" + RandomStringUtils.random(12, true, true) + "3B$";`
`1808`	`1808`	`final String rolesList = "\"" + Strings.join("\",\"", roles) + "\"";`
`1809`	`1809`	`try (CommandResponse resp = client.execute("DROP ROLE IF EXISTS " + rolesList).get()) {`
`1810`	`1810`	`}`
`@@ -1879,6 +1879,9 @@ public void testReadingBitmap() throws Exception {`
`1879`	`1879`
`1880`	`1880`	`@Test(groups = {"integration"})`
`1881`	`1881`	`public void testReadingJSONValues() throws Exception {`
	`1882`	`+ if (isCloud()) {`
	`1883`	`+ return; // TODO: add support on cloud`
	`1884`	`+ }`
`1882`	`1885`	`List<GenericRecord> serverVersion = client.queryAll("SELECT version()");`
`1883`	`1886`	`if (ClickHouseVersion.of(serverVersion.get(0).getString(1)).check("(,24.8]")) {`
`1884`	`1887`	`System.out.println("Test is skipped: feature is supported since 24.8");`