Merge pull request #109 from raymondchen-byte/main

support decimal type and support delete varchar field
databendlabs · Dec 7, 2023 · 0d2ab46 · 0d2ab46
2 parents 4d54f4f + b1d09df
commit 0d2ab46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/databend-jdbc/src/main/java/com/databend/jdbc/DatabendColumnInfo.java b/databend-jdbc/src/main/java/com/databend/jdbc/DatabendColumnInfo.java
@@ -202,6 +202,8 @@ private static int getType(DatabendRawType type) {
                 return java.sql.Types.TIMESTAMP;
             case DatabendTypes.ARRAY:
                 return java.sql.Types.ARRAY;
+            case DatabendTypes.DECIMAL:
+                return java.sql.Types.DECIMAL;
             default:
                 return Types.JAVA_OBJECT;
         }

diff --git a/databend-jdbc/src/main/java/com/databend/jdbc/DatabendPreparedStatement.java b/databend-jdbc/src/main/java/com/databend/jdbc/DatabendPreparedStatement.java
@@ -455,7 +455,11 @@ public void setBigDecimal(int i, BigDecimal bigDecimal)
     public void setString(int i, String s)
             throws SQLException {
         checkOpen();
-        batchInsertUtils.ifPresent(insertUtils -> insertUtils.setPlaceHolderValue(i, s));
+        if (originalSql.toLowerCase().contains("delete from")) {
+            batchInsertUtils.ifPresent(insertUtils -> insertUtils.setPlaceHolderValue(i, String.format("%s%s%s", "'", s, "'")));
+        } else {
+            batchInsertUtils.ifPresent(insertUtils -> insertUtils.setPlaceHolderValue(i, s));
+        }
     }
 
     @Override

diff --git a/databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java b/databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java
@@ -342,6 +342,14 @@ public void testAllPreparedStatement() throws SQLException {
             int result = statement.executeUpdate();
             System.out.println(result);
         }
+
+        String deleteSQLVarchar = "delete from test_prepare_statement where b = ?";
+        try (PreparedStatement statement = conn.prepareStatement(deleteSQLVarchar)) {
+            statement.setString(1, "1");
+            int result = statement.executeUpdate();
+            System.out.println(result);
+        }
+
         ResultSet r3 = conn.createStatement().executeQuery("select * from test_prepare_statement");
         Assert.assertEquals(0, r3.getRow());
         while (r3.next()) {