Set JDBC v2 as default driver (#2076)

mzitnik · web-flow · commit f01a30e642b0 · 2025-01-12T15:40:48.000+02:00
* Set the V2 as the default driver

* Add tests &amp; fix logic in edge case

* Set test to work with v1 explicitly

* Replace with beforemethod annotation

* replace with beforemethod in all test
diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java
@@ -48,32 +48,34 @@ public static boolean isV2() {
         return new ClickHouseDriver().isV2(null);
     }
     public boolean isV2(String url) {
-        log.debug("Checking if V2 driver is requested");
-        boolean v2Flag = Boolean.parseBoolean(System.getProperty("clickhouse.jdbc.v2", "false"));
-        if (v2Flag) {
-            log.info("V2 driver is requested through system property.");
-            return true;
+        log.debug("Checking if V1 driver is requested. V2 is the default driver.");
+        boolean v1Flag = Boolean.parseBoolean(System.getProperty("clickhouse.jdbc.v1", "false"));
+        if (v1Flag) {
+            log.info("V1 driver is requested through system property.");
+            return false;
         }
 
-        if (url != null && url.contains("clickhouse.jdbc.v2")) {
+        if (url != null && url.contains("clickhouse.jdbc.v")) {
             urlFlagSent = true;
 
-            if (url.contains("clickhouse.jdbc.v2=true")) {
-                log.info("V2 driver is requested through URL.");
-                return true;
-            } else {
+            if (url.contains("clickhouse.jdbc.v1=true")) {
+                log.info("V1 driver is requested through URL.");
+                return false;
+            } if (url.contains("clickhouse.jdbc.v2=false")) {
                 log.info("V1 driver is requested through URL.");
                 return false;
+            } else {
+                log.info("V2 driver is requested through URL.");
+                return true;
             }
         }
 
-        return false;
+        return true;
     }
 
 
     private java.sql.Driver getDriver(String url) {
         if (urlFlagSent && driver != null) {// if the URL flag was sent, we don't need to check the URL again
-
             return driver;
         }
 
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java
@@ -5,6 +5,8 @@
 import com.clickhouse.client.http.config.HttpConnectionProvider;
 import com.clickhouse.data.ClickHouseVersion;
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -16,7 +18,10 @@
 import java.util.Properties;
 
 public class AccessManagementTest extends JdbcIntegrationTest {
-
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @Test(groups = "integration", dataProvider = "setRolesArgsForTestSetRole")
     public void testSetRoleDifferentConnections(String[] roles, String setRoleExpr, String[] activeRoles,
                                                 String connectionProvider) throws SQLException {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseConnectionTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseConnectionTest.java
@@ -18,9 +18,15 @@
 
 import org.testng.Assert;
 import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class ClickHouseConnectionTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @Override
     public ClickHouseConnection newConnection(Properties properties) throws SQLException {
         return (ClickHouseConnection) newDataSource(properties).getConnection();
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDataSourceTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDataSourceTest.java
@@ -9,6 +9,8 @@
 import com.clickhouse.client.ClickHouseServerForTest;
 import junit.runner.Version;
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
@@ -19,6 +21,10 @@
 import com.clickhouse.client.config.ClickHouseDefaults;
 
 public class ClickHouseDataSourceTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @Test(groups = "integration")
     public void testHighAvailabilityConfig() throws SQLException {
         if (isCloud() || ClickHouseDriver.isV2()) return; //TODO: testHighAvailabilityConfig - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDatabaseMetaDataTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDatabaseMetaDataTest.java
@@ -16,10 +16,16 @@
 import com.clickhouse.logging.Logger;
 import com.clickhouse.logging.LoggerFactory;
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 public class ClickHouseDatabaseMetaDataTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
 
     private static final Logger log = LoggerFactory.getLogger(ClickHouseDatabaseMetaDataTest.class);
     @DataProvider(name = "selectedColumns")
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDriverTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseDriverTest.java
@@ -23,9 +23,23 @@ public void testAcceptUrl() throws SQLException {
     @Test(groups = "integration")
     public void testConnect() throws SQLException {
         if (isCloud()) return; //TODO: testConnect - Revisit, see: https://github.com/ClickHouse/clickhouse-java/issues/1747
+        System.setProperty("clickhouse.jdbc.v1","true");
         String address = getServerAddress(ClickHouseProtocol.HTTP, true);
         ClickHouseDriver driver = new ClickHouseDriver();
         Connection conn = driver.connect("jdbc:clickhouse://" + address, null);
         conn.close();
     }
+    @Test(groups = "integration")
+    public void testV2Driver() {
+        System.setProperty("clickhouse.jdbc.v1","false");
+        ClickHouseDriver driver = new ClickHouseDriver();
+        Boolean V1 = false;
+        Boolean V2 = true;
+        Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123"), V2);
+        Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v1=true"), V1);
+        Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v1=false"), V2);
+        Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v2=true"), V2);
+        Assert.assertEquals(driver.isV2("jdbc:clickhouse://localhost:8123?clickhouse.jdbc.v2=false"), V1);
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
 }
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java
@@ -60,11 +60,17 @@
 
 import org.testng.Assert;
 import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 public class ClickHousePreparedStatementTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @DataProvider(name = "columnsWithDefaultValue")
     private Object[][] getColumnsWithDefaultValue() {
         return new Object[][] {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java
@@ -34,10 +34,16 @@
 
 import org.testng.Assert;
 import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 public class ClickHouseResultSetTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @DataProvider(name = "nullableTypes")
     private Object[][] getNullableTypes() {
         return new Object[][] {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java
@@ -17,6 +17,8 @@
 import org.roaringbitmap.longlong.Roaring64NavigableMap;
 import org.testng.Assert;
 import org.testng.SkipException;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -59,6 +61,10 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 public class ClickHouseStatementTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @DataProvider(name = "timeZoneTestOptions")
     private Object[][] getTimeZoneTestOptions() {
         return new Object[][] {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/CombinedResultSetTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/CombinedResultSetTest.java
@@ -7,6 +7,8 @@
 import java.util.List;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -15,6 +17,10 @@
 import com.clickhouse.data.ClickHouseColumn;
 
 public class CombinedResultSetTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @DataProvider(name = "multipleResultSetsProvider")
     private Object[][] getMultipleResultSets() {
         ClickHouseConfig config = new ClickHouseConfig();
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/GenericJDBCTest.java
@@ -1,6 +1,7 @@
 package com.clickhouse.jdbc;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.sql.*;
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcIssuesTest.java
@@ -2,6 +2,8 @@
 
 import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.sql.Connection;
@@ -11,6 +13,10 @@
 import java.util.Properties;
 
 public class JdbcIssuesTest extends JdbcIntegrationTest {
+    @BeforeMethod(groups = "integration")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
     @Test(groups = "integration")
     public void test01Decompress() throws SQLException {
         String TABLE_NAME = "decompress_issue_01";
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcParameterizedQueryTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcParameterizedQueryTest.java
@@ -5,10 +5,16 @@
 import com.clickhouse.client.ClickHouseConfig;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class JdbcParameterizedQueryTest {
     private final ClickHouseConfig config = new ClickHouseConfig();
+    @BeforeMethod(groups = "unit")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
 
     @Test(groups = "unit")
     public void testParseBlankQueries() {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcParseHandlerTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/JdbcParseHandlerTest.java
@@ -9,9 +9,16 @@
 import com.clickhouse.jdbc.parser.StatementType;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 public class JdbcParseHandlerTest {
+    @BeforeMethod(groups = "unit")
+    public void setV1() {
+        System.setProperty("clickhouse.jdbc.v1","true");
+    }
+
     @Test(groups = "unit")
     public void testInsertFromInFileStatement() {
         JdbcParseHandler handler = JdbcParseHandler.getInstance(false, false, true);
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImplTest.java
@@ -11,6 +11,7 @@
 import com.clickhouse.jdbc.parser.ClickHouseSqlStatement;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class ClickHouseConnectionImplTest extends JdbcIntegrationTest {
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseJdbcUrlParserTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/ClickHouseJdbcUrlParserTest.java
@@ -13,6 +13,7 @@
 import com.clickhouse.jdbc.internal.ClickHouseJdbcUrlParser.ConnectionInfo;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/JdbcTransactionTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/internal/JdbcTransactionTest.java
@@ -5,6 +5,7 @@
 import java.util.Collections;
 
 import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class JdbcTransactionTest {
