Merge pull request #681 from daniel-skovenborg/fix-null-approx-numeric-postgres

Fixed crash on null approx. numerics in PostgreSQL

Author: luis100

dbptk-modules/dbptk-module-postgresql/src/main/java/com/databasepreservation/modules/postgresql/in/PostgreSQLJDBCImportModule.java

@@ -434,8 +434,11 @@ public Set<String> getIgnoredExportedSchemas() {
   @Override
   protected Cell rawToCellSimpleTypeNumericApproximate(String id, String columnName, Type cellType, ResultSet rawData)
     throws SQLException {
-    Cell cell = null;
-    if ("MONEY".equalsIgnoreCase(cellType.getOriginalTypeName())) {
+    Cell cell;
+    if (rawData.wasNull()) {
+      cell = new NullCell(id);
+
+    } else if ("MONEY".equalsIgnoreCase(cellType.getOriginalTypeName())) {
       String data = rawData.getString(columnName);
       if (data != null) {
         String parts[] = data.split(" ");
@@ -451,10 +454,10 @@ protected Cell rawToCellSimpleTypeNumericApproximate(String id, String columnNam
       String value;
       if ("float4".equalsIgnoreCase(cellType.getOriginalTypeName())) {
         Float f = rawData.getFloat(columnName);
-        value = rawData.wasNull() ? null : f.toString();
+        value = f.toString();
       } else {
         Double d = rawData.getDouble(columnName);
-        value = rawData.wasNull() ? null : d.toString();
+        value = d.toString();
       }
       cell = new SimpleCell(id, value);
     }