0003199: Support 'NaN' Datatype for Numeric Columns in Postgres

JumpMind · Jul 18, 2017 · 4cfc50b · 4cfc50b
1 parent 061dac2
commit 4cfc50b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java
@@ -456,11 +456,17 @@ protected Object parseFloat(String value) {
     }
 
     protected Object parseBigDecimal(String value) {
+        value = cleanNumber(value);
+        /*
+         * In the case of a 'NaN' value, return a String
+         */
+        if (value != null && value.equals("NaN")) {
+            return value;
+        }
         /*
          * The number will have either one period or one comma for the decimal
          * point, but we need a period
          */
-        value = cleanNumber(value);
         return new BigDecimal(value.replace(',', '.'));
     }    
 

diff --git a/...ric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlJdbcSqlTemplate.java b/...ric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlJdbcSqlTemplate.java
@@ -20,12 +20,17 @@
  */
 package org.jumpmind.db.platform.postgresql;
 
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Types;
+
 import javax.sql.DataSource;
 
 import org.jumpmind.db.platform.DatabaseInfo;
 import org.jumpmind.db.sql.JdbcSqlTemplate;
 import org.jumpmind.db.sql.SqlTemplateSettings;
 import org.jumpmind.db.sql.SymmetricLobHandler;
+import org.springframework.jdbc.core.StatementCreatorUtils;
 
 public class PostgreSqlJdbcSqlTemplate extends JdbcSqlTemplate {
 
@@ -54,4 +59,9 @@ public String getSelectLastInsertIdSql(String sequenceName) {
     protected boolean allowsNullForIdentityColumn() {
         return false;
     }
+
+    @Override
+    protected void setNanOrNull(PreparedStatement ps, int i, Object arg, int argType) throws SQLException {
+        StatementCreatorUtils.setParameterValue(ps, i, Types.FLOAT, Float.NaN);
+    }
 }
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/JdbcSqlTemplate.java
@@ -1024,7 +1024,15 @@ protected void setTinyIntValue(PreparedStatement ps, int i, Object arg, int argT
     }
 
     protected void setDecimalValue(PreparedStatement ps, int i, Object arg, int argType) throws SQLException {
-        StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), arg);
+        if ((argType == Types.DECIMAL || argType == Types.NUMERIC) && arg != null && arg.equals("NaN")) {
+            setNanOrNull(ps, i, arg, argType);
+        } else {
+            StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), arg);
+        }
+    }
+
+    protected void setNanOrNull(PreparedStatement ps, int i, Object arg, int argType) throws SQLException {
+        StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), null);
     }
 
     protected int verifyArgType(Object arg, int argType) {