JdbcRowFactory now handles null quirk correctly.

joshmg · joshmg · commit adad70286c5e · 2019-07-31T15:13:48.000-04:00
diff --git a/src/main/java/com/softwareverde/database/connection/jdbc/JdbcDatabaseConnection.java b/src/main/java/com/softwareverde/database/connection/jdbc/JdbcDatabaseConnection.java
@@ -1,10 +1,10 @@
-package com.softwareverde.database.connection;
+package com.softwareverde.database.connection.jdbc;
 
 import com.softwareverde.database.DatabaseConnection;
 import com.softwareverde.database.DatabaseException;
 import com.softwareverde.database.query.Query;
 import com.softwareverde.database.query.parameter.TypedParameter;
-import com.softwareverde.database.row.JdbcRowFactory;
+import com.softwareverde.database.row.jdbc.JdbcRowFactory;
 import com.softwareverde.database.row.Row;
 import com.softwareverde.database.row.RowFactory;
 import com.softwareverde.util.Util;
diff --git a/src/main/java/com/softwareverde/database/row/jdbc/JdbcRow.java b/src/main/java/com/softwareverde/database/row/jdbc/JdbcRow.java
@@ -1,7 +1,8 @@
-package com.softwareverde.database.row;
+package com.softwareverde.database.row.jdbc;
 
 import com.softwareverde.database.query.parameter.ParameterType;
 import com.softwareverde.database.query.parameter.TypedParameter;
+import com.softwareverde.database.row.Row;
 import com.softwareverde.util.Util;
 
 import java.nio.charset.Charset;
diff --git a/src/main/java/com/softwareverde/database/row/jdbc/JdbcRowFactory.java b/src/main/java/com/softwareverde/database/row/jdbc/JdbcRowFactory.java
@@ -1,7 +1,8 @@
-package com.softwareverde.database.row;
+package com.softwareverde.database.row.jdbc;
 
 import com.softwareverde.database.DatabaseException;
 import com.softwareverde.database.query.parameter.TypedParameter;
+import com.softwareverde.database.row.RowFactory;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -62,20 +63,22 @@ public JdbcRow fromResultSet(final ResultSet resultSet) throws DatabaseException
                 final TypedParameter typedValue;
                 {
                     if (JdbcRowFactory.isWholeNumberType(sqlDataType)) {
-                        final Long longValue = resultSet.getLong(columnIndex);
-                        typedValue = new TypedParameter(longValue);
+                        final long longValue = resultSet.getLong(columnIndex); // NOTE: ResultSet::getLong returns 0L if null. Must use ResultSet::wasNull.
+                        final boolean wasNull = resultSet.wasNull();
+                        typedValue = (wasNull ? TypedParameter.NULL : new TypedParameter(longValue));
                     }
                     else if (JdbcRowFactory.isBinaryType(sqlDataType)) {
                         final byte[] bytes = resultSet.getBytes(columnIndex);
-                        typedValue = new TypedParameter(bytes);
+                        typedValue = ((bytes == null) ? TypedParameter.NULL : new TypedParameter(bytes));
                     }
                     else if (JdbcRowFactory.isFloatingPointNumberType(sqlDataType)) {
-                        final Double doubleValue = resultSet.getDouble(columnIndex);
-                        typedValue = new TypedParameter(doubleValue);
+                        final double doubleValue = resultSet.getDouble(columnIndex); // NOTE: ResultSet::getDouble returns 0D if null. Must use ResultSet::wasNull.
+                        final boolean wasNull = resultSet.wasNull();
+                        typedValue = (wasNull ? TypedParameter.NULL : new TypedParameter(doubleValue));
                     }
                     else {
                         final String stringValue = resultSet.getString(columnIndex);
-                        typedValue = new TypedParameter(stringValue);
+                        typedValue = ((stringValue == null) ? TypedParameter.NULL : new TypedParameter(stringValue));
                     }
                 }
 
diff --git a/src/main/java/com/softwareverde/database/transaction/DatabaseTransaction.java b/src/main/java/com/softwareverde/database/transaction/DatabaseTransaction.java
@@ -1,6 +1,8 @@
 package com.softwareverde.database.transaction;
 
 import com.softwareverde.database.DatabaseException;
+import com.softwareverde.database.transaction.jdbc.DatabaseCallable;
+import com.softwareverde.database.transaction.jdbc.DatabaseRunnable;
 
 public interface DatabaseTransaction<ConnectionType> {
     void execute(final DatabaseRunnable<ConnectionType> databaseRunnable) throws DatabaseException;
diff --git a/src/main/java/com/softwareverde/database/transaction/jdbc/DatabaseCallable.java b/src/main/java/com/softwareverde/database/transaction/jdbc/DatabaseCallable.java
@@ -1,4 +1,4 @@
-package com.softwareverde.database.transaction;
+package com.softwareverde.database.transaction.jdbc;
 
 import com.softwareverde.database.DatabaseConnection;
 import com.softwareverde.database.DatabaseException;
diff --git a/src/main/java/com/softwareverde/database/transaction/jdbc/DatabaseRunnable.java b/src/main/java/com/softwareverde/database/transaction/jdbc/DatabaseRunnable.java
@@ -1,4 +1,4 @@
-package com.softwareverde.database.transaction;
+package com.softwareverde.database.transaction.jdbc;
 
 import com.softwareverde.database.DatabaseConnection;
 import com.softwareverde.database.DatabaseException;
diff --git a/src/main/java/com/softwareverde/database/transaction/jdbc/JdbcDatabaseTransaction.java b/src/main/java/com/softwareverde/database/transaction/jdbc/JdbcDatabaseTransaction.java
@@ -1,8 +1,9 @@
-package com.softwareverde.database.transaction;
+package com.softwareverde.database.transaction.jdbc;
 
 import com.softwareverde.database.DatabaseConnection;
 import com.softwareverde.database.DatabaseConnectionFactory;
 import com.softwareverde.database.DatabaseException;
+import com.softwareverde.database.transaction.DatabaseTransaction;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/test/java/com/softwareverde/database/transaction/jdbc/JdbcDatabaseTransactionTests.java b/src/test/java/com/softwareverde/database/transaction/jdbc/JdbcDatabaseTransactionTests.java
@@ -1,11 +1,13 @@
-package com.softwareverde.database.transaction;
+package com.softwareverde.database.transaction.jdbc;
 
 import com.softwareverde.database.Database;
 import com.softwareverde.database.DatabaseConnection;
 import com.softwareverde.database.DatabaseException;
 import com.softwareverde.database.memory.mysql.MysqlMemoryDatabase;
 import com.softwareverde.database.query.Query;
 import com.softwareverde.database.row.Row;
+import com.softwareverde.database.transaction.DatabaseTransaction;
+import com.softwareverde.database.transaction.jdbc.DatabaseRunnable;
 import com.softwareverde.util.Container;
 import org.junit.After;
 import org.junit.Assert;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.softwareverde.database.transaction;`
	`1`	`+package com.softwareverde.database.transaction.jdbc;`
`2`	`2`
`3`	`3`	`import com.softwareverde.database.DatabaseConnection;`
`4`	`4`	`import com.softwareverde.database.DatabaseException;`