Merge pull request #326 from databendlabs/fix/null-value

fix: null value and add tests

Author: hantmac

.github/workflows/test_cluster.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: ./.github/actions/setup_databend_cluster
         timeout-minutes: 15
         with:
-          version: '1.2.710-nightly'
+          version: '1.2.754-nightly'
           target: 'x86_64-unknown-linux-gnu'
 
       - name: Test with conn to node 1

databend-jdbc/src/main/java/com/databend/jdbc/AbstractDatabendResultSet.java

@@ -363,7 +363,7 @@ private Object column(int index)
         }
         Object value = null;
         value = row.get().get(index - 1);
-        if (value == null || "NULL".equals(value.toString())) {
+        if (value == null) {
             wasNull.set(true);
             return null;
         } else {

databend-jdbc/src/test/java/com/databend/jdbc/TestBasicDriver.java

@@ -35,8 +35,8 @@ public void setUp()
         c.createStatement().execute("create table test_basic_driver.table1(i int)");
         c.createStatement().execute("insert into test_basic_driver.table1 values(1)");
         c.createStatement().execute("create database test_basic_driver_2");
-        c.createStatement().execute("create table test_basic_driver.table_with_null(a int,b varchar default null)");
-        c.createStatement().execute("insert into test_basic_driver.table_with_null(a) values(1)");
+        c.createStatement().execute("create table test_basic_driver.table_with_null(a int,b varchar default null, c varchar, d varchar)");
+        c.createStatement().execute("insert into test_basic_driver.table_with_null(a,b,c,d) values(1,null,'null','NULL')");
 
         // json data
     }
@@ -201,11 +201,13 @@ public void testWriteDouble() throws SQLException {
     public void testDefaultSelectNullValue() throws SQLException {
         try (Connection connection = Utils.createConnection()) {
             DatabendStatement statement = (DatabendStatement) connection.createStatement();
-            statement.executeQuery("SELECT a,b from test_basic_driver.table_with_null");
+            statement.executeQuery("SELECT a,b,c,d from test_basic_driver.table_with_null");
             ResultSet r = statement.getResultSet();
             r.next();
             Assert.assertEquals(r.getInt(1), 1);
             Assert.assertEquals(r.getObject(2), null);
+            Assert.assertEquals(r.getObject(3), "null");
+            Assert.assertEquals(r.getObject(4), "NULL");
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }

databend-jdbc/src/test/java/com/databend/jdbc/TestPrepareStatement.java

@@ -79,17 +79,14 @@ public void TestBatchInsertWithNULL() throws SQLException {
 
         PreparedStatement ps = c.prepareStatement("insert into test_prepare_statement_null values");
         ps.setInt(1, 1);
-        ps.setString(2, "");
-        ps.addBatch();
-        ps.setInt(1, 2);
         ps.setNull(2, Types.NULL);
         ps.addBatch();
-        ps.setInt(1, 3);
+        ps.setInt(1, 2);
         ps.setObject(2, null, Types.NULL);
         ps.addBatch();
         System.out.println("execute batch insert");
         int[] ans = ps.executeBatch();
-        Assert.assertEquals(ans.length, 3);
+        Assert.assertEquals(ans.length, 2);
         Assert.assertEquals(ans[0], 1);
         Assert.assertEquals(ans[1], 1);
         Statement statement = c.createStatement();