Remove exception for returing of column names

Author: alex268

jdbc/src/main/java/tech/ydb/jdbc/impl/YdbConnectionImpl.java

@@ -216,32 +216,47 @@ public YdbStatement createStatement(int resultSetType, int resultSetConcurrency,
     public YdbPreparedStatement prepareStatement(String origSql, int resultSetType, int resultSetConcurrency,
             int resultSetHoldability) throws SQLException {
         checkStatementParams(resultSetType, resultSetConcurrency, resultSetHoldability);
-        return prepareStatement(origSql, resultSetType, YdbPrepareMode.AUTO);
+        return prepareStatement(origSql, resultSetType, null, YdbPrepareMode.AUTO);
     }
 
     @Override
     public YdbPreparedStatement prepareStatement(String sql, YdbPrepareMode mode) throws SQLException {
-        return prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, mode);
+        return prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, null, mode);
     }
 
     @Override
     public YdbPreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-        if (autoGeneratedKeys != Statement.NO_GENERATED_KEYS) {
-            throw new SQLFeatureNotSupportedException(YdbConst.AUTO_GENERATED_KEYS_UNSUPPORTED);
+        if (autoGeneratedKeys != Statement.RETURN_GENERATED_KEYS) {
+            return prepareStatement(sql);
         }
-        return prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
-                ResultSet.HOLD_CURSORS_OVER_COMMIT);
+        return prepareStatement(sql, new String[]{"*"});
+    }
+
+    @Override
+    public YdbPreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
+        if (columnIndexes != null && columnIndexes.length == 0) {
+            return prepareStatement(sql);
+        }
+        throw new SQLFeatureNotSupportedException(YdbConst.AUTO_GENERATED_KEYS_UNSUPPORTED);
+    }
+
+    @Override
+    public YdbPreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
+        if (columnNames == null || columnNames.length == 0) {
+            return prepareStatement(sql);
+        }
+        return prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, columnNames, YdbPrepareMode.AUTO);
     }
 
-    private YdbPreparedStatement prepareStatement(String sql, int resultSetType, YdbPrepareMode mode)
+    private YdbPreparedStatement prepareStatement(String sql, int type, String[] columnNames, YdbPrepareMode mode)
             throws SQLException {
 
         validator.clearWarnings();
         ctx.getTracer().trace("prepare statement");
         YdbQuery query = ctx.findOrParseYdbQuery(sql);
         YdbPreparedQuery params = ctx.findOrPrepareParams(query, mode);
         ctx.getTracer().trace("create prepared statement");
-        return new YdbPreparedStatementImpl(this, query, params, resultSetType);
+        return new YdbPreparedStatementImpl(this, query, params, type);
     }
 
     @Override
@@ -329,16 +344,6 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe
         throw new SQLFeatureNotSupportedException(YdbConst.PREPARED_CALLS_UNSUPPORTED);
     }
 
-    @Override
-    public YdbPreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-        throw new SQLFeatureNotSupportedException(YdbConst.AUTO_GENERATED_KEYS_UNSUPPORTED);
-    }
-
-    @Override
-    public YdbPreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-        throw new SQLFeatureNotSupportedException(YdbConst.AUTO_GENERATED_KEYS_UNSUPPORTED);
-    }
-
     @Override
     public Clob createClob() throws SQLException {
         throw new SQLFeatureNotSupportedException(YdbConst.CLOB_UNSUPPORTED);

jdbc/src/test/java/tech/ydb/jdbc/impl/YdbConnectionImplTest.java

@@ -165,20 +165,22 @@ public void prepareStatement() throws SQLException {
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
             TableAssert.assertSelectInt(2, statement.executeQuery());
         }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1", new int[0])) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+    }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1", new String[0])) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+        }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1",
+                Statement.RETURN_GENERATED_KEYS)) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+        }
     }
 
     @Test
     public void prepareStatementInvalid() throws SQLException {
         ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, new int[] {})
-        );
-
-        ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, new String[] {})
-        );
-
-        ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, Statement.RETURN_GENERATED_KEYS)
+                () -> jdbc.connection().prepareStatement(SELECT_2_2, new int[] {1, 2})
         );
 
         ExceptionAssert.sqlFeatureNotSupported(

jdbc/src/test/java/tech/ydb/jdbc/impl/YdbTableConnectionImplTest.java

@@ -166,20 +166,22 @@ public void prepareStatement() throws SQLException {
                 ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
             TableAssert.assertSelectInt(2, statement.executeQuery());
         }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1", new int[0])) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+        }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1", new String[0])) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+        }
+        try (PreparedStatement statement = jdbc.connection().prepareStatement("select 1 + 1",
+                Statement.RETURN_GENERATED_KEYS)) {
+            TableAssert.assertSelectInt(2, statement.executeQuery());
+        }
     }
 
     @Test
     public void prepareStatementInvalid() throws SQLException {
         ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, new int[] {})
-        );
-
-        ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, new String[] {})
-        );
-
-        ExceptionAssert.sqlFeatureNotSupported("Auto-generated keys are not supported",
-                () -> jdbc.connection().prepareStatement(SELECT_2_2, Statement.RETURN_GENERATED_KEYS)
+                () -> jdbc.connection().prepareStatement(SELECT_2_2, new int[] {1, 2})
         );
 
         ExceptionAssert.sqlFeatureNotSupported(