removed hardcoded settings. Updated changelog

Author: chernser

CHANGELOG.md

@@ -1,8 +1,14 @@
 ## 0.9.9
 
+### Breaking Changes
 
-### Bug Fixes
-- **[jdbc-v2]** Fixed issues with hardcoded `async_insert` settings in `ConnectionImpl`. Now it let override them. (https://github.com/ClickHouse/clickhouse-java/issues/2652, https://github.com/ClickHouse/clickhouse-java/issues/2825)
+- **[jdbc-v2]** Hardcoded server setting `async_insert=0` is removed as well as others. This is done to 
+fix issue with overriding these settings and using client with read-only profiles. The change, first of all, makes 
+driver behavior to follow default what is set on server side (note: starting ClickHouse 26.3 `async_insert` is on by default).
+In second, this fix changes what number of affected rows returned by method like `java.sql.Statement.executeUpdate(java.lang.String)`. 
+Previously they return more accurate values because insert was synchronous, but in case of asynchronous insert it is not 
+guaranteed anymore (see also https://github.com/ClickHouse/ClickHouse/issues/57768). Read more about asynchronous insert https://clickhouse.com/docs/optimize/asynchronous-inserts.
+(https://github.com/ClickHouse/clickhouse-java/issues/2652, https://github.com/ClickHouse/clickhouse-java/issues/2825)
 
 ## 0.9.8
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java

@@ -3,7 +3,6 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
-import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.jdbc.Driver;
 import com.clickhouse.jdbc.DriverProperties;
@@ -75,7 +74,7 @@ public boolean isIgnoreUnsupportedRequests() {
 
     /**
      * Parses URL to get property and target host.
-     * Properties that are passed in the {@code info} parameter will override that are set in the {@code url}.
+     * Properties that are passed in the {@code url} will override the {@code info} ones.
      * @param url - JDBC url
      * @param info - Driver and Client properties.
      */
@@ -267,22 +266,6 @@ private Map<String, String> parseUrl(String url) throws SQLException {
         return properties;
     }
 
-    /**
-     * Creates initial properties with defaults.
-     * @return mutable HashMap with default values.
-     */
-    Map<String, String> createProperties() {
-        Map<String, String> props = new HashMap<>();
-
-        // Requires to wait result on insert
-        props.put(DriverProperties.serverSetting(ServerSettings.ASYNC_INSERT), ServerSettings.OFF);
-
-        // Requires to wait result of query (manly insert)
-        props.put(DriverProperties.serverSetting(ServerSettings.WAIT_END_OF_QUERY), ServerSettings.ON);
-
-        return props;
-    }
-
     /**
      * Combines url properties and provided ones via {@link java.sql.Driver#connect(String, Properties)}
      * @param urlProperties - properties parsed from URL
@@ -291,7 +274,7 @@ Map<String, String> createProperties() {
     private void buildFinalProperties(Map<String, String> urlProperties, Properties providedProperties) {
 
         // Copy provided properties
-        Map<String, String> props = createProperties();
+        Map<String, String> props = new HashMap<>();
         // Set driver properties defaults (client will do the same)
         for (DriverProperties prop : DriverProperties.values()) {
             if (prop.getDefaultValue() != null) {

jdbc-v2/src/test/java/com/clickhouse/jdbc/JdbcIntegrationTest.java

@@ -4,6 +4,7 @@
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseServerForTest;
 import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.data.ClickHouseVersion;
 import com.clickhouse.logging.Logger;
@@ -13,11 +14,16 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 public abstract class JdbcIntegrationTest extends BaseIntegrationTest {
     private static final Logger LOGGER = LoggerFactory.getLogger(JdbcIntegrationTest.class);
 
+    public static final String WAIT_ASYNC_SETTING_KEY = DriverProperties.serverSetting(ServerSettings.WAIT_ASYNC_INSERT);
+    public static final String WAIT_QUERY_SETTING_KEY = DriverProperties.serverSetting(ServerSettings.WAIT_END_OF_QUERY);
+    public static final String ASYNC_INSERT_SETTING_KEY = DriverProperties.serverSetting(ServerSettings.ASYNC_INSERT);
+
     public String getEndpointString() {
         return getEndpointString(isCloud());
     }
@@ -28,7 +34,13 @@ public String getEndpointString(boolean includeDbName) {
     }
 
     public Connection getJdbcConnection() throws SQLException {
-        return getJdbcConnection(null);
+        return getJdbcConnection((Properties) null);
+    }
+
+    public Connection getJdbcConnection(Map<String, Object> propertiesMap) throws SQLException {
+        Properties config = new Properties();
+        config.putAll(propertiesMap);
+        return getJdbcConnection(config);
     }
 
     public Connection getJdbcConnection(Properties properties) throws SQLException {

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

@@ -1,6 +1,7 @@
 package com.clickhouse.jdbc;
 
 import com.clickhouse.client.api.DataTypeUtils;
+import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.ClickHouseVersion;
@@ -956,7 +957,7 @@ void testBatchInsertTextStatement(String sql) throws Exception {
         String table = "test_batch_text";
         long seed = System.currentTimeMillis();
         Random rnd = new Random(seed);
-        try (Connection conn = getJdbcConnection()) {
+        try (Connection conn = getJdbcConnection(Map.of(ASYNC_INSERT_SETTING_KEY, ServerSettings.OFF))) {
 
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("CREATE TABLE IF NOT EXISTS " + table +
@@ -1007,7 +1008,7 @@ void testBatchInsertNoValuesReuse() throws Exception {
         String sql = "INSERT INTO %s (v1, v2) VALUES (?, ?)";
         long seed = System.currentTimeMillis();
         Random rnd = new Random(seed);
-        try (Connection conn = getJdbcConnection()) {
+        try (Connection conn = getJdbcConnection(Map.of(ASYNC_INSERT_SETTING_KEY, ServerSettings.OFF))) {
 
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("CREATE TABLE IF NOT EXISTS " + table +
@@ -1062,7 +1063,7 @@ void testBatchInsertValuesReuse() throws Exception {
         String sql = "INSERT INTO %s (v1, v2) VALUES (1, ?)";
         long seed = System.currentTimeMillis();
         Random rnd = new Random(seed);
-        try (Connection conn = getJdbcConnection()) {
+        try (Connection conn = getJdbcConnection(Map.of(ASYNC_INSERT_SETTING_KEY, ServerSettings.OFF))) {
 
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("CREATE TABLE IF NOT EXISTS " + table +
@@ -1266,7 +1267,7 @@ public void testJdbcEscapeSyntax() throws Exception {
 
     @Test(groups = {"integration "})
     public void testStatementsWithDatabaseInTableIdentifier() throws Exception {
-        try (Connection conn = getJdbcConnection()) {
+        try (Connection conn = getJdbcConnection(Map.of(ASYNC_INSERT_SETTING_KEY, ServerSettings.OFF))) {
             final String db1Name = conn.getSchema() + "_db1";
             final String table1Name = "table1";
             try (Statement stmt = conn.createStatement()) {
@@ -1296,7 +1297,7 @@ public void testStatementsWithDatabaseInTableIdentifier() throws Exception {
 
     @Test(groups = {"integration "})
     public void testNullValues() throws Exception {
-        try (Connection conn = getJdbcConnection()) {
+        try (Connection conn = getJdbcConnection(Map.of(ASYNC_INSERT_SETTING_KEY, ServerSettings.OFF))) {
             final String table = "test_null_values";
             try (Statement stmt = conn.createStatement()) {
                 stmt.execute("DROP TABLE IF EXISTS " + table);