Merge pull request #36 from sgaland/CursorFactory

Cursor factory

Author: Xavi Rigau

core/src/main/java/novoda/lib/sqliteprovider/provider/SQLiteContentProvider.java

@@ -43,6 +43,8 @@ public boolean onCreate() {
 
     protected abstract SQLiteOpenHelper getDatabaseHelper(Context context);
 
+    protected abstract SQLiteDatabase.CursorFactory getCursorFactory();
+
     /**
      * The equivalent of the {@link #insert} method, but invoked within a
      * transaction.

core/src/main/java/novoda/lib/sqliteprovider/provider/SQLiteContentProviderImpl.java

@@ -1,21 +1,25 @@
 package novoda.lib.sqliteprovider.provider;
 
-import android.content.*;
-import android.database.*;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.DatabaseUtils;
+import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.net.Uri;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
 import novoda.lib.sqliteprovider.provider.action.InsertHelper;
 import novoda.lib.sqliteprovider.sqlite.ExtendedSQLiteOpenHelper;
 import novoda.lib.sqliteprovider.sqlite.ExtendedSQLiteQueryBuilder;
 import novoda.lib.sqliteprovider.util.Log;
 import novoda.lib.sqliteprovider.util.UriUtils;
 
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
 public class SQLiteContentProviderImpl extends SQLiteContentProvider {
 
     protected static final String ID = "_id";
@@ -50,7 +54,7 @@ protected SQLiteDatabase getReadableDatabase() {
     @Override
     protected SQLiteOpenHelper getDatabaseHelper(Context context) {
         try {
-            return new ExtendedSQLiteOpenHelper(context);
+            return new ExtendedSQLiteOpenHelper(context, getCursorFactory());
         } catch (IOException e) {
             Log.Provider.e(e);
             throw new IllegalStateException(e.getMessage());
@@ -151,4 +155,9 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
     protected ExtendedSQLiteQueryBuilder getSQLiteQueryBuilder() {
         return new ExtendedSQLiteQueryBuilder();
     }
+
+    @Override
+    protected SQLiteDatabase.CursorFactory getCursorFactory() {
+        return null;
+    }
 }

core/src/main/java/novoda/lib/sqliteprovider/sqlite/ExtendedSQLiteOpenHelper.java

@@ -3,16 +3,19 @@
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.database.sqlite.*;
+import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteDatabase.CursorFactory;
+import android.database.sqlite.SQLiteOpenHelper;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import novoda.lib.sqliteprovider.migration.Migrations;
 import novoda.lib.sqliteprovider.util.DBUtils;
 import novoda.lib.sqliteprovider.util.Log;
 
-import java.io.IOException;
-import java.util.*;
-
 // TODO caching?
 public class ExtendedSQLiteOpenHelper extends SQLiteOpenHelper implements IDatabaseMetaInfo {
 
@@ -26,7 +29,11 @@ public class ExtendedSQLiteOpenHelper extends SQLiteOpenHelper implements IDatab
     private final Map<String, List<String>> constrains = new HashMap<String, List<String>>();
 
     public ExtendedSQLiteOpenHelper(Context context) throws IOException {
-        this(context, context.getPackageName() + ".db", null, Migrations.getVersion(context.getAssets(), MIGRATIONS_PATH));
+        this(context, null);
+    }
+
+    public ExtendedSQLiteOpenHelper(Context context, CursorFactory factory) throws IOException {
+        this(context, context.getPackageName() + ".db", factory, Migrations.getVersion(context.getAssets(), MIGRATIONS_PATH));
     }
 
     public ExtendedSQLiteOpenHelper(Context context, String name, CursorFactory factory, int version) {

core/src/main/java/novoda/rest/database/ModularSQLiteOpenHelper.java

@@ -7,11 +7,14 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-import novoda.lib.sqliteprovider.util.DatabaseUtils;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
+import novoda.lib.sqliteprovider.util.DatabaseUtils;
+
 public class ModularSQLiteOpenHelper extends SQLiteOpenHelper {
 
     private static final String TAG = ModularSQLiteOpenHelper.class.getSimpleName();
@@ -24,7 +27,11 @@ public class ModularSQLiteOpenHelper extends SQLiteOpenHelper {
     private final Map<String, SQLiteTableCreator> createStatements;
 
     public ModularSQLiteOpenHelper(Context context) {
-        super(context, new StringBuilder(context.getApplicationInfo().packageName).append(".db").toString(), null, dbVersion);
+        this(context, null);
+    }
+
+    public ModularSQLiteOpenHelper(Context context, SQLiteDatabase.CursorFactory factory) {
+        super(context, new StringBuilder(context.getApplicationInfo().packageName).append(".db").toString(), factory, dbVersion);
         createdTable = new ArrayList<String>();
         createStatements = new HashMap<String, SQLiteTableCreator>();
         init();