0004161: MySQL ignore zeroDateTimeBehavior=convertToNull if server is

set to NO_ZERO_DATE
JumpMind · Nov 24, 2019 · a02c469 · a02c469
1 parent 62de759
commit a02c469
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java
@@ -28,6 +28,7 @@
 import org.jumpmind.db.sql.ISqlTransaction;
 import org.jumpmind.db.sql.JdbcSqlTransaction;
 import org.jumpmind.db.sql.SqlException;
+import org.jumpmind.db.util.BasicDataSourcePropertyConstants;
 import org.jumpmind.db.util.BinaryEncoding;
 import org.jumpmind.symmetric.Version;
 import org.jumpmind.symmetric.common.ParameterConstants;
@@ -56,18 +57,30 @@ public class MySqlSymmetricDialect extends AbstractSymmetricDialect implements I
     static final String SQL_FUNCTION_INSTALLED = "select count(*) from information_schema.routines where routine_name='$(functionName)' and routine_schema in (select database())" ;
 
     private String functionTemplateKeySuffix = null;
+
+    private boolean isConvertZeroDateToNull;
 
     public MySqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) {
         super(parameterService, platform);
-        this.triggerTemplate = new MySqlTriggerTemplate(this);
         this.parameterService = parameterService;
-
+
+        if (parameterService.getString(BasicDataSourcePropertyConstants.DB_POOL_URL).contains("zeroDateTimeBehavior=convertToNull")) {
+            try {
+                String sqlMode = platform.getSqlTemplate().queryForString("select @@sql_mode");
+                isConvertZeroDateToNull = sqlMode == null || (!sqlMode.contains("NO_ZERO_DATE") && !sqlMode.contains("NO_ZERO_IN_DATE"));
+                if (isConvertZeroDateToNull) {
+                    log.info("Zero dates will be converted to null");
+                }
+            } catch (Exception e) {
+                log.warn("Cannot convert zero dates to null because unable to verify sql_mode: {}", e.getMessage());
+            }
+        }
+        this.triggerTemplate = new MySqlTriggerTemplate(this, isConvertZeroDateToNull);
+
         int[] versions = Version.parseVersion(getProductVersion());        
-        if (getMajorVersion() == 5
-                && (getMinorVersion() == 0 || (getMinorVersion() == 1 && versions[2] < 23))) {
+        if (getMajorVersion() == 5 && (getMinorVersion() == 0 || (getMinorVersion() == 1 && versions[2] < 23))) {
             this.functionTemplateKeySuffix = PRE_5_1_23;    
-        } else if (getMajorVersion() == 5
-                && (getMinorVersion() < 7 || (getMinorVersion() == 7 && versions[2] < 6))) {
+        } else if (getMajorVersion() == 5 && (getMinorVersion() < 7 || (getMinorVersion() == 7 && versions[2] < 6))) {
         	this.functionTemplateKeySuffix = PRE_5_7_6;
         } else {
             this.functionTemplateKeySuffix = POST_5_7_6;

diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlTriggerTemplate.java
@@ -22,20 +22,19 @@
 
 import java.util.HashMap;
 
-import org.jumpmind.db.util.BasicDataSourcePropertyConstants;
 import org.jumpmind.symmetric.db.AbstractTriggerTemplate;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
 import org.jumpmind.symmetric.util.SymmetricUtils;
 
 public class MySqlTriggerTemplate extends AbstractTriggerTemplate {
 
-    public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
+    public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect, boolean isConvertZeroDateToNull) {
         super(symmetricDialect);
         emptyColumnTemplate = "''" ;
         stringColumnTemplate = "cast(if($(tableAlias).`$(columnName)` is null,'',concat('\"',replace(replace($(tableAlias).`$(columnName)`,'\\\\','\\\\\\\\'),'\"','\\\\\"'),'\"')) as char)\n" ;                               
         geometryColumnTemplate = "if($(tableAlias).`$(columnName)` is null,'',concat('\"',replace(replace(astext($(tableAlias).`$(columnName)`),'\\\\','\\\\\\\\'),'\"','\\\\\"'),'\"'))\n" ;
         numberColumnTemplate = "if($(tableAlias).`$(columnName)` is null,'',concat('\"',cast($(tableAlias).`$(columnName)` as char),'\"'))\n" ;
-        datetimeColumnTemplate = "if($(tableAlias).`$(columnName)` is null" + getConvertZeroDateToNull() + ",'',concat('\"',cast($(tableAlias).`$(columnName)` as char),'\"'))\n" ;
+        datetimeColumnTemplate = "if($(tableAlias).`$(columnName)` is null" + (isConvertZeroDateToNull ? " or $(tableAlias).`$(columnName)` = '0000-00-00'" : "") + ",'',concat('\"',cast($(tableAlias).`$(columnName)` as char),'\"'))\n" ;
         clobColumnTemplate =    stringColumnTemplate;
         blobColumnTemplate = "if($(tableAlias).`$(columnName)` is null,'',concat('\"',hex($(tableAlias).`$(columnName)`),'\"'))\n" ;
         booleanColumnTemplate = "if($(tableAlias).`$(columnName)` is null,'',concat('\"',cast($(tableAlias).`$(columnName)` as unsigned),'\"'))\n" ;
@@ -163,13 +162,6 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
         sqlTemplates.put("initialLoadSqlTemplate" ,
 "select concat($(columns)) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                        " );
     }
-
-    protected String getConvertZeroDateToNull() {
-        if (symmetricDialect.getParameterService().getString(BasicDataSourcePropertyConstants.DB_POOL_URL).contains("zeroDateTimeBehavior=convertToNull")) {
-            return " or $(tableAlias).`$(columnName)` = '0000-00-00'";
-        }
-        return "";
-    }
 
     @Override
     protected String castDatetimeColumnToString(String columnName) {