Merge pull request #1785 from ClickHouse/fix_1776

Revert check for updateResult()

Author: chernser

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java

@@ -452,7 +452,7 @@ protected ClickHouseResultSet newEmptyResultSet() throws SQLException {
     }
 
     protected ResultSet updateResult(ClickHouseSqlStatement stmt, ClickHouseResponse response) throws SQLException {
-        if (stmt.isQuery()) {
+        if (stmt.isQuery() || (!stmt.isRecognized() && !response.getColumns().isEmpty())) {
             currentUpdateCount = -1L;
             currentResult = new ClickHouseResultSet(stmt.getDatabaseOrDefault(getConnection().getCurrentDatabase()),
                     stmt.getTable(), this, response);

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseStatementTest.java

@@ -28,6 +28,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Struct;
@@ -1477,4 +1478,19 @@ public void testUseOffsetDateTime() {
             Assert.fail("Failed to create connection", e);
         }
     }
+
+
+    @Test(groups = "integration")
+    public void testDescMetadata() {
+        try (ClickHouseConnection conn = newConnection();
+            ClickHouseStatement stmt = conn.createStatement()) {
+            ResultSet rs = stmt.executeQuery("DESC (select timezone(), number FROM system.numbers)");
+            rs.next();
+            ResultSetMetaData metaData = rs.getMetaData();
+            Assert.assertEquals(metaData.getColumnCount(), 7);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Assert.fail("Failed to create connection", e);
+        }
+    }
 }