pass sql args into type serializers making it possible to query on th…

…ings like dates
emilsjolander · Feb 22, 2014 · a625743 · a625743
1 parent 2fc660e
commit a625743
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 34 deletions.
diff --git a/library/src/main/java/se/emilsjolander/sprinkles/Utils.java b/library/src/main/java/se/emilsjolander/sprinkles/Utils.java
@@ -2,7 +2,6 @@
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.database.DatabaseUtils;
 import android.net.Uri;
 
 import java.lang.reflect.Array;
@@ -12,6 +11,7 @@
 
 import se.emilsjolander.sprinkles.annotations.Table;
 import se.emilsjolander.sprinkles.exceptions.NoTableAnnotationException;
+import se.emilsjolander.sprinkles.typeserializers.TypeSerializer;
 
 class Utils {
 
@@ -98,12 +98,9 @@ static String insertSqlArgs(String sql, Object[] args) {
             return sql;
         }
         for (Object o : args) {
-            if (o instanceof Number) {
-                sql = sql.replaceFirst("\\?", o.toString());
-            } else {
-                String escapedString = DatabaseUtils.sqlEscapeString(o.toString());
-                sql = sql.replaceFirst("\\?", escapedString);
-            }
+            TypeSerializer typeSerializer = Sprinkles.sInstance.getTypeSerializer(o.getClass());
+            String sqlObject = typeSerializer.toSql(o);
+            sql = sql.replaceFirst("\\?", sqlObject);
         }
         return sql;
     }

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/BooleanSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/BooleanSerializer.java
@@ -3,9 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class BooleanSerializer implements TypeSerializer<Boolean> {
 
     @Override
@@ -18,6 +15,11 @@ public void pack(Boolean object, ContentValues cv, String name) {
         cv.put(name, object ? 1 : 0);
     }
 
+    @Override
+    public String toSql(Boolean object) {
+        return object ? "1" : "0";
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.INTEGER;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/DateSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/DateSerializer.java
@@ -5,9 +5,6 @@
 
 import java.util.Date;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class DateSerializer implements TypeSerializer<Date> {
 
     @Override
@@ -20,6 +17,11 @@ public void pack(Date object, ContentValues cv, String name) {
         cv.put(name, object.getTime());
     }
 
+    @Override
+    public String toSql(Date object) {
+        return ""+object.getTime();
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.INTEGER;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/DoubleSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/DoubleSerializer.java
@@ -3,9 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class DoubleSerializer implements TypeSerializer<Double> {
 
     @Override
@@ -18,6 +15,11 @@ public void pack(Double object, ContentValues cv, String name) {
         cv.put(name, object);
     }
 
+    @Override
+    public String toSql(Double object) {
+        return ""+object;
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.REAL;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/FloatSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/FloatSerializer.java
@@ -3,9 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class FloatSerializer implements TypeSerializer<Float> {
 
     @Override
@@ -18,6 +15,11 @@ public void pack(Float object, ContentValues cv, String name) {
         cv.put(name, object);
     }
 
+    @Override
+    public String toSql(Float object) {
+        return ""+object;
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.REAL;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/IntSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/IntSerializer.java
@@ -3,9 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class IntSerializer implements TypeSerializer<Integer> {
 
     @Override
@@ -18,6 +15,11 @@ public void pack(Integer object, ContentValues cv, String name) {
         cv.put(name, object);
     }
 
+    @Override
+    public String toSql(Integer object) {
+        return ""+object;
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.INTEGER;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/LongSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/LongSerializer.java
@@ -3,9 +3,6 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class LongSerializer implements TypeSerializer<Long> {
 
     @Override
@@ -18,6 +15,11 @@ public void pack(Long object, ContentValues cv, String name) {
         cv.put(name, object);
     }
 
+    @Override
+    public String toSql(Long object) {
+        return ""+object;
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.INTEGER;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/SqlType.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/SqlType.java
@@ -1,8 +1,5 @@
 package se.emilsjolander.sprinkles.typeserializers;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public enum SqlType {
     INTEGER,
     REAL,

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/StringSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/StringSerializer.java
@@ -2,10 +2,8 @@
 
 import android.content.ContentValues;
 import android.database.Cursor;
+import android.database.DatabaseUtils;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public class StringSerializer implements TypeSerializer<String> {
 
     @Override
@@ -18,6 +16,11 @@ public void pack(String object, ContentValues cv, String name) {
         cv.put(name, object);
     }
 
+    @Override
+    public String toSql(String object) {
+        return  DatabaseUtils.sqlEscapeString(object);
+    }
+
     @Override
     public SqlType getSqlType() {
         return SqlType.TEXT;

diff --git a/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/TypeSerializer.java b/library/src/main/java/se/emilsjolander/sprinkles/typeserializers/TypeSerializer.java
@@ -3,15 +3,14 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 
-/**
- * Created by emilsjolander on 27/12/13.
- */
 public interface TypeSerializer<T> {
 
     T unpack(Cursor c, String name);
 
     void pack(T object, ContentValues cv, String name);
 
+    String toSql(T object);
+
     SqlType getSqlType();
 
 }
diff --git a/library/src/test/java/se/emilsjolander/sprinkles/SprinklesTest.java b/library/src/test/java/se/emilsjolander/sprinkles/SprinklesTest.java
@@ -33,6 +33,11 @@ public void pack(MyObject object, ContentValues cv, String name) {
 
         }
 
+        @Override
+        public String toSql(MyObject object) {
+            return null;
+        }
+
         @Override
         public SqlType getSqlType() {
             return null;

diff --git a/library/src/test/java/se/emilsjolander/sprinkles/UtilsTest.java b/library/src/test/java/se/emilsjolander/sprinkles/UtilsTest.java
@@ -12,6 +12,7 @@
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
+import java.util.Date;
 
 import se.emilsjolander.sprinkles.annotations.AutoIncrementPrimaryKey;
 import se.emilsjolander.sprinkles.annotations.Column;
@@ -111,6 +112,13 @@ public void insertSqlArgs() {
         assertEquals(result, "1 'hej'");
     }
 
+    @Test
+    public void insertTypeSerializedSqlArgs() {
+        Date date = new Date();
+        String result = Utils.insertSqlArgs("?", new Object[]{date});
+        assertEquals(result, ""+date.getTime());
+    }
+
     @Test
     public void getAllDeclaredFields() {
         Field[] fields = Utils.getAllDeclaredFields(TestModel.class, Model.class);