Can't get a prepared timestamp object to work w/ purgeservice sql for…

… H2. Try formatting as a jdbc timestamp.
JumpMind · Sep 29, 2009 · ebcc6aa · ebcc6aa
1 parent e700df4
commit ebcc6aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -55,6 +55,7 @@
 import org.apache.commons.collections.map.ListOrderedMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang.time.FastDateFormat;
 import org.apache.ddlutils.Platform;
 import org.apache.ddlutils.io.DatabaseIO;
 import org.apache.ddlutils.model.Column;
@@ -101,6 +102,8 @@ abstract public class AbstractDbDialect implements IDbDialect {
 
     public static final String[] TIME_PATTERNS = { "HH:mm:ss.S", "HH:mm:ss", "yyyy-MM-dd HH:mm:ss.S",
             "yyyy-MM-dd HH:mm:ss" };
+
+    public static final FastDateFormat JDBC_TIMESTAMP_FORMATTER = FastDateFormat.getInstance("yyyy-MM-dd hh:mm:ss.SSS");
 
     protected final ILog log = LogFactory.getLog(getClass());
 
@@ -158,6 +161,13 @@ protected AbstractDbDialect() {
         _defaultSizes.put(new Integer(3), "15,15");
         _defaultSizes.put(new Integer(2), "15,15");
     }
+
+    public String toFormattedTimestamp(java.util.Date time) {
+        StringBuilder ts = new StringBuilder("{ts '");
+        ts.append(JDBC_TIMESTAMP_FORMATTER.format(time));
+        ts.append("'}");
+        return ts.toString();
+    }
 
     public IColumnFilter getDatabaseColumnFilter() {
         return null;

diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
@@ -20,6 +20,7 @@
 
 package org.jumpmind.symmetric.db;
 
+import java.util.Date;
 import java.util.Set;
 
 import org.apache.ddlutils.Platform;
@@ -244,4 +245,6 @@ public String getTriggerName(DataEventType dml, String triggerPrefix, int maxTri
     public String getInitialLoadTableAlias();
 
     public String preProcessTriggerSqlClause(String sqlClause);
+
+    public String toFormattedTimestamp(Date time);
 }
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
@@ -28,7 +28,6 @@
 import java.util.List;
 
 import org.apache.commons.lang.time.DateUtils;
-import org.hsqldb.Types;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.model.NodeStatus;
 import org.jumpmind.symmetric.service.IClusterService;
@@ -134,10 +133,7 @@ private void purgeByMinMax(long[] minMax, String deleteSql, Date retentionTime,
         log.info("DataPurgeTableStarting", tableName);
 
         MapSqlParameterSource parameterSource = new MapSqlParameterSource();
-        parameterSource.registerSqlType("CUTOFF_TIME", Types.TIMESTAMP);
-        parameterSource.registerSqlType("MIN", Types.INTEGER);
-        parameterSource.registerSqlType("MAX", Types.INTEGER);
-        parameterSource.addValue("CUTOFF_TIME", retentionTime);
+        parameterSource.addValue("CUTOFF_TIME", dbDialect.toFormattedTimestamp(retentionTime));
 
         while (minId <= purgeUpToId) {
             long maxId = minId + maxNumtoPurgeinTx;