reset update count

chernser · chernser · commit 9e532cfadb6c · 2026-03-16T15:53:56.000-07:00
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/PreparedStatementImpl.java
@@ -293,6 +293,7 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
     @Override
     public boolean execute() throws SQLException {
         ensureOpen();
+        currentUpdateCount = -1;
         if (parsedPreparedStatement.isHasResultSet()) {
             currentResultSet = super.executeQueryImpl(buildSQL(), localSettings);
             return currentResultSet != null;
diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java
@@ -364,7 +364,6 @@ public boolean execute(String sql) throws SQLException {
         ensureOpen();
         parsedStatement = connection.getSqlParser().parsedStatement(sql);
         currentUpdateCount = -1;
-        currentResultSet = null;
         if (parsedStatement.isHasResultSet()) {
             currentResultSet = executeQueryImpl(sql, localSettings);
             return currentResultSet != null;
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java
@@ -1787,7 +1787,7 @@ void testDateWithAndWithoutCalendar() throws Exception {
     }
 
     @Test(groups = {"integration"})
-    public void testUnknownStatementTest() throws Exception {
+    public void testUnknownStatement() throws Exception {
         try (Connection conn = getJdbcConnection()) {
             try (PreparedStatement stmt = conn.prepareStatement("SELECT number, FROM system.numbers LIMIT 3")) {
                 Assert.assertTrue(stmt.execute());
@@ -1815,7 +1815,7 @@ public void testUnknownStatementTest() throws Exception {
             String tmpTable = "tmp_no_result_" + RandomStringUtils.randomAlphanumeric(8);
             // PreparedStatement: execute() should return false, executeQuery() should throw
             try (PreparedStatement stmt = conn.prepareStatement(
-                    "CREATE TEMPORARY TABLE " + tmpTable + " (x Int32)")) {
+                    "CREATE TABLE " + tmpTable + " (x Int32) Engine MergeTree ORDER BY()")) {
                 Assert.assertFalse(stmt.execute(), "DDL should not produce a ResultSet");
                 Assert.assertNull(stmt.getResultSet(), "ResultSet should be null for DDL");
                 assertThrows(SQLException.class, stmt::executeQuery);
@@ -1824,11 +1824,11 @@ public void testUnknownStatementTest() throws Exception {
             String tmpTable2 = "tmp_no_result_" + RandomStringUtils.randomAlphanumeric(8);
             try (Statement stmt = conn.createStatement()) {
                 Assert.assertFalse(
-                        stmt.execute("CREATE TEMPORARY TABLE " + tmpTable2 + " (x Int32)"),
+                        stmt.execute("CREATE TABLE " + tmpTable2 + " (x Int32) Engine MergeTree ORDER BY()"),
                         "DDL should not produce a ResultSet");
                 Assert.assertNull(stmt.getResultSet(), "ResultSet should be null for DDL");
                 assertThrows(SQLException.class,
-                        () -> stmt.executeQuery("CREATE TEMPORARY TABLE " + tmpTable2 + " (x Int32)"));
+                        () -> stmt.executeQuery("CREATE TABLE " + tmpTable2 + " (x Int32) Engine MergeTree ORDER BY()"));
             }
         }
     }
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java
@@ -1323,7 +1323,7 @@ public void testDescribeStatement() throws Exception {
     }
 
     @Test(groups = {"integration"}, dataProvider = "testUnknownStatementTest_DP")
-    public void testUnknownStatementTest(String parserName) throws Exception {
+    public void testUnknownStatement(String parserName) throws Exception {
         Properties properties = new Properties();
         properties.setProperty(DriverProperties.SQL_PARSER.getKey(), parserName);
         try (Connection conn = getJdbcConnection(properties)) {

Original file line number	Diff line number	Diff line change
`@@ -1323,7 +1323,7 @@ public void testDescribeStatement() throws Exception {`
`1323`	`1323`	`}`
`1324`	`1324`
`1325`	`1325`	`@Test(groups = {"integration"}, dataProvider = "testUnknownStatementTest_DP")`
`1326`		`- public void testUnknownStatementTest(String parserName) throws Exception {`
	`1326`	`+ public void testUnknownStatement(String parserName) throws Exception {`
`1327`	`1327`	`Properties properties = new Properties();`
`1328`	`1328`	`properties.setProperty(DriverProperties.SQL_PARSER.getKey(), parserName);`
`1329`	`1329`	`try (Connection conn = getJdbcConnection(properties)) {`