CassandraResultSet.getString returns null value instead of string "null"

DataGrip · Sep 9, 2019 · 79f6ae2 · 79f6ae2
1 parent 37f15e8
commit 79f6ae2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
 }
 
-version '1.3.1'
+version '1.3.2'
 
 sourceCompatibility = 1.8
 

diff --git a/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java b/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java
@@ -116,7 +116,7 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
     }
 
     String getVersion() {
-        return "1.3.1";
+        return "1.3.2";
     }
 
     @Override

diff --git a/driver/src/main/java/com/dbschema/CassandraResultSet.java b/driver/src/main/java/com/dbschema/CassandraResultSet.java
@@ -71,7 +71,8 @@ public boolean wasNull() {
     public String getString(int columnIndex) throws SQLException {
         checkClosed();
         if (currentRow != null) {
-            return String.valueOf(currentRow.getObject(columnIndex - 1));
+            Object object = currentRow.getObject(columnIndex - 1);
+            return object == null ? null : String.valueOf(object);
         }
         throw new SQLException("Exhausted ResultSet.");
     }