added verification for custom_http_header

Author: chernser

client-v2/src/test/java/com/clickhouse/client/SettingsTests.java

@@ -177,6 +177,8 @@ public void testInsertSettingsSpecific() throws Exception {
             final InsertSettings settings = new InsertSettings();
             settings.setDatabase("test_db1");
             Assert.assertEquals(settings.getDatabase(), "test_db1");
+            settings.resetOption(ClientConfigProperties.DATABASE.getKey());
+            Assert.assertNull(settings.getDatabase());
         }
 
         {

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

@@ -755,44 +755,52 @@ public void testCancelQueryWithSession() throws Exception {
             throw new SkipException("Cloud + HTTP doesn't work well. Enough to test locally");
         }
 
-        // Regression test for #2690: cancelling a query that runs inside a session must not fail with
-        // "Session is locked by a concurrent client" (SESSION_IS_LOCKED). The KILL QUERY request issued by
-        // cancel() must not carry the session id of the query being cancelled.
         String sessionId = "test-session-" + UUID.randomUUID();
         Properties properties = new Properties();
         Session session = new Session();
         session.setSessionId(sessionId);
         session.applyTo(properties);
         try (Connection conn = getJdbcConnection(properties)) {
-            try (StatementImpl stmt = (StatementImpl) conn.createStatement()) {
-                stmt.getLocalSettings().setSessionId(sessionId);
-                stmt.setQueryTimeout(30); // safety net so a failed cancel cannot hang the test
+            testCancelQueryWithSessionValidation(conn, sessionId);
+        }
 
-                final AtomicReference<Throwable> threadError = new AtomicReference<>();
-                final CountDownLatch started = new CountDownLatch(1);
-                Thread worker = new Thread(() -> {
-                    started.countDown();
-                    // Long-running query that only completes when killed.
-                    try (ResultSet rs = stmt.executeQuery("SELECT count() FROM system.numbers_mt")) {
-                        rs.next();
-                    } catch (Throwable t) {
-                        System.out.println("Error: " + t.getMessage());
-                        threadError.set(t);
-                    }
-                });
-                worker.start();
-                started.await();
+        // Test case when session id is in custom_http_header
+        properties = new Properties();
+        properties.put(DriverProperties.CUSTOM_HTTP_PARAMS.getKey(), "session_id=" + sessionId);
+        try (Connection conn = getJdbcConnection(properties)) {
+            testCancelQueryWithSessionValidation(conn, sessionId);
+        }
+    }
 
-                String queryId = waitForQueryId(stmt, 15);
-                assertNotNull(queryId, "Query id was not assigned in time");
-                assertTrue(waitForQueryToStart(queryId, 15), "Query did not start on the server in time");
+    private void testCancelQueryWithSessionValidation(Connection conn, String sessionId) throws Exception {
+        try (StatementImpl stmt = (StatementImpl) conn.createStatement()) {
+            stmt.getLocalSettings().setSessionId(sessionId);
+            stmt.setQueryTimeout(30); // safety net so a failed cancel cannot hang the test
+
+            final AtomicReference<Throwable> threadError = new AtomicReference<>();
+            final CountDownLatch started = new CountDownLatch(1);
+            Thread worker = new Thread(() -> {
+                started.countDown();
+                // Long-running query that only completes when killed.
+                try (ResultSet rs = stmt.executeQuery("SELECT count() FROM system.numbers_mt")) {
+                    rs.next();
+                } catch (Throwable t) {
+                    System.out.println("Error: " + t.getMessage());
+                    threadError.set(t);
+                }
+            });
+            worker.start();
+            started.await();
 
-                // Cancel from the main thread - must not throw SESSION_IS_LOCKED.
-                stmt.cancel();
+            String queryId = waitForQueryId(stmt, 15);
+            assertNotNull(queryId, "Query id was not assigned in time");
+            assertTrue(waitForQueryToStart(queryId, 15), "Query did not start on the server in time");
 
-                worker.join(TimeUnit.SECONDS.toMillis(20));
-                assertFalse(worker.isAlive(), "Query was not cancelled and is still running");
-            }
+            // Cancel from the main thread - must not throw SESSION_IS_LOCKED.
+            stmt.cancel();
+
+            worker.join(TimeUnit.SECONDS.toMillis(20));
+            assertFalse(worker.isAlive(), "Query was not cancelled and is still running");
         }
     }