Fixes support of empty string in CSVs

h2database · Jul 6, 2023 · 8fc369e · 8fc369e
1 parent 2a921a7
commit 8fc369e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/h2/src/main/org/h2/tools/Csv.java b/h2/src/main/org/h2/tools/Csv.java
@@ -537,6 +537,8 @@ public Object[] readRow() throws SQLException {
         if (input == null) {
             return null;
         }
+
+        boolean nullStringIsEmpty = nullString==null || nullString.isEmpty();
         String[] row = new String[columnNames.length];
         try {
             int i = 0;
@@ -558,7 +560,7 @@ public Object[] readRow() throws SQLException {
                     // Empty Strings should be NULL
                     // in order to prevent conversion of zero-length String
                     // to Number
-                    row[i++] = v!=null && v.length() > 0
+                    row[i++] = v!=null && (v.length()>0 || !nullStringIsEmpty)
                             ? v
                             : null;
                 }

diff --git a/h2/src/test/org/h2/test/db/TestCsv.java b/h2/src/test/org/h2/test/db/TestCsv.java
@@ -319,7 +319,7 @@ private void testNull() throws Exception {
         assertEquals("D", meta.getColumnLabel(4));
         assertTrue(rs.next());
         assertEquals(null, rs.getString(1));
-        assertEquals(null, rs.getString(2));
+        assertEquals("", rs.getString(2));
         // null is never quoted
         assertEquals("\\N", rs.getString(3));
         // an empty string is always parsed as null