0004065: Allow zero date on MySQL or convert to null otherwise (3.10)

JumpMind · Aug 8, 2019 · ffa2568 · ffa2568
1 parent e74334b
commit ffa2568
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
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
@@ -84,6 +84,7 @@ public abstract class AbstractDatabasePlatform implements IDatabasePlatform {
 
     public static final String REQUIRED_FIELD_NULL_SUBSTITUTE = " ";
 
+    public static final String ZERO_DATE_STRING = "0000-00-00 00:00:00";
     /*
      * The default name for models read from the database, if no name as given.
      */
@@ -926,6 +927,9 @@ public java.util.Date parseTimestamp(int type, String value) {
         try {
             return Timestamp.valueOf(value);
         } catch (IllegalArgumentException ex) {
+        	if (!getDatabaseInfo().isZeroDateAllowed() && value != null && value.startsWith(ZERO_DATE_STRING)) {
+        		return null;
+        	}
             try {
                 return new Timestamp(FormatUtils.parseDate(value, FormatUtils.TIMESTAMP_PATTERNS).getTime());
             } catch (Exception e) {

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabaseInfo.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabaseInfo.java
@@ -275,6 +275,8 @@ public class DatabaseInfo {
 
     private boolean notNullColumnsSupported = true;
 
+    private boolean zeroDateAllowed;
+
 	/**
      * Creates a new platform info object.
      */
@@ -1357,5 +1359,12 @@ public void setNotNullColumnsSupported(boolean notNullColumnsSupported) {
 		this.notNullColumnsSupported = notNullColumnsSupported;
 	}
 
-
+	public boolean isZeroDateAllowed() {
+		return zeroDateAllowed;
+	}
+
+	public void setZeroDateAllowed(boolean zeroDateAllowed) {
+		this.zeroDateAllowed = zeroDateAllowed;
+	}
+
 }
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlBuilder.java
@@ -65,6 +65,7 @@ public MySqlDdlBuilder() {
         // Double quotes are only allowed for delimiting identifiers if the
         // server SQL mode includes ANSI_QUOTES
         databaseInfo.setDelimiterToken("`");
+        databaseInfo.setZeroDateAllowed(true);
 
         databaseInfo.addNativeTypeMapping(Types.ARRAY, "LONGBLOB", Types.LONGVARBINARY);
         databaseInfo.addNativeTypeMapping(Types.BIT, "BIT");