0000021: SQLite

JumpMind · Dec 7, 2012 · f73a929 · f73a929
1 parent a429495
commit f73a929
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlBuilder.java
@@ -30,9 +30,9 @@ public SqliteDdlBuilder() {
         databaseInfo.addNativeTypeMapping(Types.STRUCT, "BINARY", Types.BINARY);
         databaseInfo.addNativeTypeMapping(Types.DATALINK, "BINARY", Types.BINARY);
 
-        databaseInfo.addNativeTypeMapping(Types.TIMESTAMP, "VARCHAR", Types.VARCHAR);
-        databaseInfo.addNativeTypeMapping(Types.TIME, "VARCHAR", Types.VARCHAR);
-        databaseInfo.addNativeTypeMapping(Types.DATE, "VARCHAR", Types.VARCHAR);
+        databaseInfo.addNativeTypeMapping(Types.TIMESTAMP, "TIMESTAMP",Types.TIMESTAMP);
+        databaseInfo.addNativeTypeMapping(Types.TIME, "TIME", Types.TIME);
+        databaseInfo.addNativeTypeMapping(Types.DATE, "DATE", Types.DATE);
 
         databaseInfo.addNativeTypeMapping(Types.BIT, "INTEGER", Types.INTEGER);
         databaseInfo.addNativeTypeMapping(Types.TINYINT, "INTEGER", Types.INTEGER);

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlReader.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/sqlite/SqliteDdlReader.java
@@ -129,6 +129,14 @@ public String toJdbcType(String colType) {
                 colType = TypeMap.FLOAT;
             } else if (colType.startsWith("DOUBLE")) {
                 colType = TypeMap.DOUBLE;
+           } else if (colType.startsWith("DECIMAL")) {
+                colType = TypeMap.DECIMAL; 
+            } else if (colType.startsWith("DATE")) {
+                colType = TypeMap.DATE; 
+            } else if (colType.startsWith("TIMESTAMP")) {
+                colType = TypeMap.TIMESTAMP; 
+            } else if (colType.startsWith("TIME")) {
+                colType = TypeMap.TIME; 
             } else {
                 colType = TypeMap.VARCHAR;
             }

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlite/SqliteJdbcSqlTemplate.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sqlite/SqliteJdbcSqlTemplate.java
@@ -1,16 +1,19 @@
 package org.jumpmind.db.platform.sqlite;
 
+import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.lang.time.DateUtils;
 import org.jumpmind.db.platform.DatabaseInfo;
 import org.jumpmind.db.sql.JdbcSqlTemplate;
 import org.jumpmind.db.sql.SqlTemplateSettings;
@@ -22,7 +25,7 @@
 
 public class SqliteJdbcSqlTemplate extends JdbcSqlTemplate {
 
-    private DateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+    private DateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
 
     public SqliteJdbcSqlTemplate(DataSource dataSource, SqlTemplateSettings settings, SymmetricLobHandler lobHandler,
             DatabaseInfo databaseInfo) {
@@ -75,11 +78,20 @@ public void setValues(PreparedStatement ps, Object[] args, int[] argTypes,
                 lobHandler.getLobCreator().setBlobAsBytes(ps, i, arg.toString().getBytes());
             } else if (argType == Types.CLOB && lobHandler != null) {
                 lobHandler.getLobCreator().setClobAsString(ps, i, (String) arg);
+            } else if (arg!=null && argType == Types.DATE && arg instanceof Date) {
+                Date clone = (Date) (((Date) arg).clone());
+                arg = dateTimeFormat.format(DateUtils.truncate(clone,Calendar.DATE));
+                args[i-1] = arg;
+                StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), arg);
             } else if (arg!=null && (arg instanceof Date || arg instanceof Timestamp)) {
                   arg =  dateTimeFormat.format(arg);
                   args[i-1] = arg;
                   StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), arg);
             } else {
+                if (arg instanceof BigDecimal) {
+                    arg =  ((BigDecimal) arg).doubleValue();
+                    args[i-1] = arg;
+                }
                 StatementCreatorUtils.setParameterValue(ps, i, verifyArgType(arg, argType), arg);
             }
         }

diff --git a/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java b/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java
@@ -39,7 +39,7 @@
 public final class FormatUtils {
 
     public static final String[] TIMESTAMP_PATTERNS = { "yyyy-MM-dd HH:mm:ss.S",
-            "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd" };
+            "yyyy-MM-dd HH:mm:ss",  "yyyy-MM-dd HH:mm:ss.SSS", "yyyy-MM-dd HH:mm", "yyyy-MM-dd" };
 
     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" };