0001808: '0000-00-00 00:00:00' fails when initial.load.concat.csv.in.…

…sql.enabled=false and db.treat.date.time.as.varchar.enabled=true
JumpMind · Jul 14, 2014 · c8e8648 · c8e8648
1 parent 7d72f2c
commit c8e8648
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
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
@@ -24,6 +24,7 @@
 
 import org.jumpmind.symmetric.db.AbstractTriggerTemplate;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
+import org.jumpmind.symmetric.util.SymmetricUtils;
 
 public class MySqlTriggerTemplate extends AbstractTriggerTemplate {
 
@@ -114,5 +115,10 @@ public MySqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
         sqlTemplates.put("initialLoadSqlTemplate" ,
 "select concat($(columns)) from $(schemaName)$(tableName) t where $(whereClause)                                                                                                                        " );
     }
+
+    @Override
+    protected String castDatetimeColumnToString(String columnName) {
+        return "cast(" + SymmetricUtils.quote(symmetricDialect, columnName) + " as char) as " + columnName;
+    }
 
 }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
@@ -127,6 +127,8 @@ public String createInitalLoadSql(Node node, TriggerRouter triggerRouter, Table
                     false, channel, triggerRouter.getTrigger()).columnString;
             sql = FormatUtils.replace("columns", columnsText, sql);
         } else {
+            boolean dateTimeAsString = symmetricDialect.getParameterService().is(
+                    ParameterConstants.DATA_LOADER_TREAT_DATETIME_AS_VARCHAR);
             sql = "select $(columns) from $(schemaName)$(tableName) t where $(whereClause)";
             StringBuilder columnList = new StringBuilder();
             for (int i = 0; i < columns.length; i++) {
@@ -136,7 +138,12 @@ public String createInitalLoadSql(Node node, TriggerRouter triggerRouter, Table
                     if (i > 0) {
                         columnList.append(",");
                     }
-                    columnList.append(SymmetricUtils.quote(symmetricDialect, column.getName()));
+
+                    if (dateTimeAsString && TypeMap.isDateTimeType(column.getMappedTypeCode())) {
+                        columnList.append(castDatetimeColumnToString(column.getName()));
+                    } else {
+                        columnList.append(SymmetricUtils.quote(symmetricDialect, column.getName()));
+                    }
                 }
             }
             sql = FormatUtils.replace("columns", columnList.toString(), sql);
@@ -173,6 +180,10 @@ public String createInitalLoadSql(Node node, TriggerRouter triggerRouter, Table
 
         return sql;
     }
+
+    protected String castDatetimeColumnToString(String columnName) {
+        return SymmetricUtils.quote(symmetricDialect, columnName);
+    }
 
     protected String getSourceTablePrefix(Table table) {
         String schemaPlus = (table.getSchema() != null ? table.getSchema()

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
@@ -482,14 +482,18 @@ public String[] getStringValues(BinaryEncoding encoding, Column[] metaData, Row
         return values;
     }
 
-    protected String getDateTimeStringValue(String name, int type, Row row,
-            boolean useVariableDates) {
-        Date date = row.getDateTime(name);
-        if (useVariableDates) {
-            long diff = date.getTime() - System.currentTimeMillis();
-            return "${curdate" + diff + "}";
+    protected String getDateTimeStringValue(String name, int type, Row row, boolean useVariableDates) {
+        Object dateObj = row.get(name);
+        if (dateObj instanceof String) {
+            return (String) dateObj;
         } else {
-            return FormatUtils.TIMESTAMP_FORMATTER.format(date);
+            Date date = row.getDateTime(name);
+            if (useVariableDates) {
+                long diff = date.getTime() - System.currentTimeMillis();
+                return "${curdate" + diff + "}";
+            } else {
+                return FormatUtils.TIMESTAMP_FORMATTER.format(date);
+            }
         }
     }