added more tests

Author: chernser

jdbc-v2/src/main/java/com/clickhouse/jdbc/DriverProperties.java

@@ -13,8 +13,18 @@
  */
 public enum DriverProperties {
 
-    IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", ""),
-    SCHEMA_TERM("jdbc_schema_term", ""),
+    /**
+     * Indicates if driver should ignore unsupported values and methods.
+     * JDBC allows throwing SQLException for unsupported values and methods.
+     * But driver can ignore them and continue execution. Driver will do no operation in such case.
+     */
+    IGNORE_UNSUPPORTED_VALUES("jdbc_ignore_unsupported_values", "false"),
+
+    /**
+     * Schema term to be used in the connection URL. Only `schema` is supported right now.
+     */
+    SCHEMA_TERM("jdbc_schema_term", "schema"),
+
     /**
      * Indicates if driver should create a secure connection over SSL/TLS
      */

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -326,6 +326,7 @@ public void clearWarnings() throws SQLException {
 
     @Override
     public void setCursorName(String name) throws SQLException {
+        featureManager.unsupportedFeatureThrow("setCursorName(String)", true);
         ensureOpen();
     }
 
@@ -623,16 +624,19 @@ public long executeLargeUpdate(String sql) throws SQLException {
 
     @Override
     public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
+        featureManager.unsupportedFeatureThrow("executeLargeUpdate(String, int)", autoGeneratedKeys != Statement.NO_GENERATED_KEYS);
         return executeLargeUpdate(sql);
     }
 
     @Override
     public long executeLargeUpdate(String sql, int[] columnIndexes) throws SQLException {
+        featureManager.unsupportedFeatureThrow("executeLargeUpdate(String, int[])");
         return executeLargeUpdate(sql);
     }
 
     @Override
     public long executeLargeUpdate(String sql, String[] columnNames) throws SQLException {
+        featureManager.unsupportedFeatureThrow("executeLargeUpdate(String, String[])");
         return executeLargeUpdate(sql);
     }
 

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

@@ -1109,7 +1109,7 @@ public void testExecute() throws Exception {
     }
 
     @Test(groups = {"integration"})
-    public void setConnectionSchema() throws Exception {
+    public void testSetConnectionSchema() throws Exception {
         String db1 = getDatabase() + "_schema1";
         String db2 = getDatabase() + "_schema2";
         try (Connection conn = getJdbcConnection(); Statement stmt = conn.createStatement()) {
@@ -1129,6 +1129,70 @@ public void setConnectionSchema() throws Exception {
         }
     }
 
+    @Test(groups = {"integration"}, dataProvider = "testUnsupportedOperationsDP")
+    public void testUnsupportedOperations(Properties props, boolean shouldThrow) throws Exception {
+        try (Connection conn = getJdbcConnection(props); Statement stmt = conn.createStatement()) {
+            List<Assert.ThrowingRunnable> unsupportedOperations = Arrays.asList(
+                    () -> stmt.execute("SELECT 1", Statement.RETURN_GENERATED_KEYS),
+                    () -> stmt.execute("SELECT 1", new int[] {1}),
+                    () -> stmt.execute("SELECT 1", new String[] {"1"}),
+                    () -> stmt.executeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_01 (id Int32) Engine MergeTree ORDER BY ()", Statement.RETURN_GENERATED_KEYS),
+                    () -> stmt.executeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_02 (id Int32) Engine MergeTree ORDER BY ()", new int[] {1}),
+                    () -> stmt.executeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_03 (id Int32) Engine MergeTree ORDER BY ()", new String[] {"1"}),
+                    () -> stmt.executeLargeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_01 (id Int32) Engine MergeTree ORDER BY ()", Statement.RETURN_GENERATED_KEYS),
+                    () -> stmt.executeLargeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_02 (id Int32) Engine MergeTree ORDER BY ()", new int[] {1}),
+                    () -> stmt.executeLargeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_03 (id Int32) Engine MergeTree ORDER BY ()", new String[] {"1"}),
+                    () -> stmt.setCursorName("CURSOR_NAME_IGNORED")
+            );
+
+            stmt.execute("SELECT 1", Statement.NO_GENERATED_KEYS); // supported
+            stmt.executeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_04 (id Int32) Engine MergeTree ORDER BY ()", Statement.NO_GENERATED_KEYS); // supported
+            stmt.executeLargeUpdate("CREATE TABLE IF NOT EXISTS test_unsupported_04 (id Int32) Engine MergeTree ORDER BY ()", Statement.NO_GENERATED_KEYS); // supported
+
+            assertNull(stmt.getGeneratedKeys());
+
+
+            for (Assert.ThrowingRunnable op : unsupportedOperations) {
+                if (shouldThrow) {
+                    assertThrows(SQLException.class, op);
+                } else {
+                    try {
+                        op.run();
+                    } catch (Throwable e) {
+                        fail(e.getMessage(), e);
+                    }
+                }
+            }
+        }
+    }
+
+    @DataProvider(name = "testUnsupportedOperationsDP")
+    public static Object[][] testUnsupportedOperationsDP() {
+        Properties props1 = new Properties();
+        Properties props2 = new Properties();
+        props2.put(DriverProperties.IGNORE_UNSUPPORTED_VALUES.getKey(), "true");
+        Properties props3 = new Properties();
+        props3.put(DriverProperties.IGNORE_UNSUPPORTED_VALUES.getKey(), "false");
+        return new Object[][] {
+                {props1, true},
+                {props2, false},
+                {props3, true}
+        };
+    }
+
+    @Test(groups = {"integration"})
+    public void testSetFetchSize() throws Exception {
+        try (Connection conn = getJdbcConnection()) {
+            try (Statement stmt = conn.createStatement()) {
+                stmt.setFetchSize(10000);
+                Assert.assertEquals(stmt.getFetchSize(), 10000);
+                stmt.setFetchSize(0);
+                Assert.assertEquals(stmt.getFetchSize(), 0);
+                Assert.assertThrows(SQLException.class, () -> stmt.setFetchSize(-1));
+            }
+        }
+    }
+
     private static String getDBName(Statement stmt) throws SQLException {
         try (ResultSet rs = stmt.executeQuery("SELECT database()")) {
             rs.next();