update ColumnConverter

wyouflf · wyouflf · commit 11847e9f4421 · 2014-02-20T00:30:39.000+08:00
diff --git a/library/src/com/lidroid/xutils/db/converter/BooleanColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/BooleanColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -27,7 +28,7 @@ public Object fieldValue2ColumnValue(Boolean fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/ByteArrayColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/ByteArrayColumnConverter.java
@@ -1,6 +1,7 @@
 package com.lidroid.xutils.db.converter;
 
 import android.database.Cursor;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -24,7 +25,7 @@ public Object fieldValue2ColumnValue(byte[] fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "BLOB";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.BLOB;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/ByteColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/ByteColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Byte fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/CharColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/CharColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -27,7 +28,7 @@ public Object fieldValue2ColumnValue(Character fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/ColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/ColumnConverter.java
@@ -1,6 +1,7 @@
 package com.lidroid.xutils.db.converter;
 
 import android.database.Cursor;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -15,5 +16,5 @@ public interface ColumnConverter<T> {
 
     Object fieldValue2ColumnValue(T fieldValue);
 
-    String getColumnDbType();
+    ColumnDbType getColumnDbType();
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/ColumnConverterFactory.java b/library/src/com/lidroid/xutils/db/converter/ColumnConverterFactory.java
@@ -1,5 +1,7 @@
 package com.lidroid.xutils.db.converter;
 
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
+
 import java.util.Date;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -29,12 +31,12 @@ public static ColumnConverter getColumnConverter(Class columnType) {
         return null;
     }
 
-    public static String getDbColumnType(Class columnType) {
+    public static ColumnDbType getDbColumnType(Class columnType) {
         ColumnConverter converter = getColumnConverter(columnType);
         if (converter != null) {
             return converter.getColumnDbType();
         }
-        return "TEXT";
+        return ColumnDbType.TEXT;
     }
 
     public static void registerColumnConverter(Class columnType, ColumnConverter columnConverter) {
diff --git a/library/src/com/lidroid/xutils/db/converter/DateColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/DateColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 import java.util.Date;
 
@@ -29,7 +30,7 @@ public Object fieldValue2ColumnValue(Date fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/DoubleColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/DoubleColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Double fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "REAL";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.REAL;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/FloatColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/FloatColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Float fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "REAL";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.REAL;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/IntegerColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/IntegerColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Integer fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/LongColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/LongColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Long fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/ShortColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/ShortColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -26,7 +27,7 @@ public Object fieldValue2ColumnValue(Short fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/SqlDateColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/SqlDateColumnConverter.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import android.text.TextUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -27,7 +28,7 @@ public Object fieldValue2ColumnValue(java.sql.Date fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "INTEGER";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.INTEGER;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/converter/StringColumnConverter.java b/library/src/com/lidroid/xutils/db/converter/StringColumnConverter.java
@@ -1,6 +1,7 @@
 package com.lidroid.xutils.db.converter;
 
 import android.database.Cursor;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 
 /**
  * Author: wyouflf
@@ -24,7 +25,7 @@ public Object fieldValue2ColumnValue(String fieldValue) {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "TEXT";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.TEXT;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/sqlite/ColumnDbType.java b/library/src/com/lidroid/xutils/db/sqlite/ColumnDbType.java
@@ -0,0 +1,20 @@
+package com.lidroid.xutils.db.sqlite;
+
+/**
+ * Created by wyouflf on 14-2-20.
+ */
+public enum ColumnDbType {
+
+    INTEGER("INTEGER"), REAL("REAL"), TEXT("TEXT"), BLOB("BLOB");
+
+    private String value;
+
+    ColumnDbType(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+}
diff --git a/library/src/com/lidroid/xutils/db/table/Column.java b/library/src/com/lidroid/xutils/db/table/Column.java
@@ -18,6 +18,7 @@
 import android.database.Cursor;
 import com.lidroid.xutils.db.converter.ColumnConverter;
 import com.lidroid.xutils.db.converter.ColumnConverterFactory;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 import com.lidroid.xutils.util.LogUtils;
 
 import java.lang.reflect.Field;
@@ -108,7 +109,7 @@ public Field getColumnField() {
         return columnField;
     }
 
-    public String getColumnDbType() {
+    public ColumnDbType getColumnDbType() {
         return columnConverter.getColumnDbType();
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/table/Finder.java b/library/src/com/lidroid/xutils/db/table/Finder.java
@@ -2,6 +2,7 @@
 
 import android.database.Cursor;
 import com.lidroid.xutils.DbUtils;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 import com.lidroid.xutils.db.sqlite.FinderLazyLoader;
 import com.lidroid.xutils.exception.DbException;
 import com.lidroid.xutils.util.LogUtils;
@@ -86,7 +87,7 @@ public Object getDefaultValue() {
     }
 
     @Override
-    public String getColumnDbType() {
-        return "";
+    public ColumnDbType getColumnDbType() {
+        return ColumnDbType.TEXT;
     }
 }
diff --git a/library/src/com/lidroid/xutils/db/table/Foreign.java b/library/src/com/lidroid/xutils/db/table/Foreign.java
@@ -19,6 +19,7 @@
 import com.lidroid.xutils.DbUtils;
 import com.lidroid.xutils.db.converter.ColumnConverter;
 import com.lidroid.xutils.db.converter.ColumnConverterFactory;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 import com.lidroid.xutils.db.sqlite.ForeignLazyLoader;
 import com.lidroid.xutils.exception.DbException;
 import com.lidroid.xutils.util.LogUtils;
@@ -142,7 +143,7 @@ public Object getColumnValue(Object entity) {
     }
 
     @Override
-    public String getColumnDbType() {
+    public ColumnDbType getColumnDbType() {
         return foreignColumnConverter.getColumnDbType();
     }
 
diff --git a/sample/src/com/lidroid/xutils/sample/download/DownloadManager.java b/sample/src/com/lidroid/xutils/sample/download/DownloadManager.java
@@ -6,6 +6,7 @@
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.db.converter.ColumnConverter;
 import com.lidroid.xutils.db.converter.ColumnConverterFactory;
+import com.lidroid.xutils.db.sqlite.ColumnDbType;
 import com.lidroid.xutils.db.sqlite.Selector;
 import com.lidroid.xutils.exception.DbException;
 import com.lidroid.xutils.exception.HttpException;
@@ -281,8 +282,8 @@ public Object fieldValue2ColumnValue(HttpHandler.State fieldValue) {
         }
 
         @Override
-        public String getColumnDbType() {
-            return "INTEGER";
+        public ColumnDbType getColumnDbType() {
+            return ColumnDbType.INTEGER;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import android.database.Cursor;`
`4`	`4`	`import android.text.TextUtils;`
	`5`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`5`	`6`
`6`	`7`	`/**`
`7`	`8`	`* Author: wyouflf`
`@@ -27,7 +28,7 @@ public Object fieldValue2ColumnValue(Boolean fieldValue) {`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`@Override`
`30`		`- public String getColumnDbType() {`
`31`		`- return "INTEGER";`
	`31`	`+ public ColumnDbType getColumnDbType() {`
	`32`	`+ return ColumnDbType.INTEGER;`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.lidroid.xutils.db.converter;`
`2`	`2`
`3`	`3`	`import android.database.Cursor;`
	`4`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`4`	`5`
`5`	`6`	`/**`
`6`	`7`	`* Author: wyouflf`
`@@ -24,7 +25,7 @@ public Object fieldValue2ColumnValue(byte[] fieldValue) {`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`@Override`
`27`		`- public String getColumnDbType() {`
`28`		`- return "BLOB";`
	`28`	`+ public ColumnDbType getColumnDbType() {`
	`29`	`+ return ColumnDbType.BLOB;`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`package com.lidroid.xutils.db.converter;`
`2`	`2`
	`3`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
	`4`	`+`
`3`	`5`	`import java.util.Date;`
`4`	`6`	`import java.util.concurrent.ConcurrentHashMap;`
`5`	`7`
`@@ -29,12 +31,12 @@ public static ColumnConverter getColumnConverter(Class columnType) {`
`29`	`31`	`return null;`
`30`	`32`	`}`
`31`	`33`
`32`		`- public static String getDbColumnType(Class columnType) {`
	`34`	`+ public static ColumnDbType getDbColumnType(Class columnType) {`
`33`	`35`	`ColumnConverter converter = getColumnConverter(columnType);`
`34`	`36`	`if (converter != null) {`
`35`	`37`	`return converter.getColumnDbType();`
`36`	`38`	`}`
`37`		`- return "TEXT";`
	`39`	`+ return ColumnDbType.TEXT;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public static void registerColumnConverter(Class columnType, ColumnConverter columnConverter) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import android.database.Cursor;`
`19`	`19`	`import com.lidroid.xutils.db.converter.ColumnConverter;`
`20`	`20`	`import com.lidroid.xutils.db.converter.ColumnConverterFactory;`
	`21`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`21`	`22`	`import com.lidroid.xutils.util.LogUtils;`
`22`	`23`
`23`	`24`	`import java.lang.reflect.Field;`
`@@ -108,7 +109,7 @@ public Field getColumnField() {`
`108`	`109`	`return columnField;`
`109`	`110`	`}`
`110`	`111`
`111`		`- public String getColumnDbType() {`
	`112`	`+ public ColumnDbType getColumnDbType() {`
`112`	`113`	`return columnConverter.getColumnDbType();`
`113`	`114`	`}`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import android.database.Cursor;`
`4`	`4`	`import com.lidroid.xutils.DbUtils;`
	`5`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`5`	`6`	`import com.lidroid.xutils.db.sqlite.FinderLazyLoader;`
`6`	`7`	`import com.lidroid.xutils.exception.DbException;`
`7`	`8`	`import com.lidroid.xutils.util.LogUtils;`
`@@ -86,7 +87,7 @@ public Object getDefaultValue() {`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`@Override`
`89`		`- public String getColumnDbType() {`
`90`		`- return "";`
	`90`	`+ public ColumnDbType getColumnDbType() {`
	`91`	`+ return ColumnDbType.TEXT;`
`91`	`92`	`}`
`92`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`import com.lidroid.xutils.DbUtils;`
`20`	`20`	`import com.lidroid.xutils.db.converter.ColumnConverter;`
`21`	`21`	`import com.lidroid.xutils.db.converter.ColumnConverterFactory;`
	`22`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`22`	`23`	`import com.lidroid.xutils.db.sqlite.ForeignLazyLoader;`
`23`	`24`	`import com.lidroid.xutils.exception.DbException;`
`24`	`25`	`import com.lidroid.xutils.util.LogUtils;`
`@@ -142,7 +143,7 @@ public Object getColumnValue(Object entity) {`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`@Override`
`145`		`- public String getColumnDbType() {`
	`146`	`+ public ColumnDbType getColumnDbType() {`
`146`	`147`	`return foreignColumnConverter.getColumnDbType();`
`147`	`148`	`}`
`148`	`149`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import com.lidroid.xutils.HttpUtils;`
`7`	`7`	`import com.lidroid.xutils.db.converter.ColumnConverter;`
`8`	`8`	`import com.lidroid.xutils.db.converter.ColumnConverterFactory;`
	`9`	`+import com.lidroid.xutils.db.sqlite.ColumnDbType;`
`9`	`10`	`import com.lidroid.xutils.db.sqlite.Selector;`
`10`	`11`	`import com.lidroid.xutils.exception.DbException;`
`11`	`12`	`import com.lidroid.xutils.exception.HttpException;`
`@@ -281,8 +282,8 @@ public Object fieldValue2ColumnValue(HttpHandler.State fieldValue) {`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`@Override`
`284`		`- public String getColumnDbType() {`
`285`		`- return "INTEGER";`
	`285`	`+ public ColumnDbType getColumnDbType() {`
	`286`	`+ return ColumnDbType.INTEGER;`
`286`	`287`	`}`
`287`	`288`	`}`
`288`	`289`	`}`