Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Clarify the relation between SQLiteContentProviderImpl and ExtendedSQLiteOpenHelper #67

Closed
wants to merge 2 commits into from
Closed

Clarify the relation between SQLiteContentProviderImpl and ExtendedSQLiteOpenHelper #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
111cf1b
fixes #57
friedger Dec 1, 2016
0f955ae
Merge branch 'master' into master
frapontillo Dec 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions core/src/main/java/novoda/lib/sqliteprovider/provider/SQLiteContentProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public SQLiteContentProviderImpl() {
@Override
public boolean onCreate() {
super.onCreate();
helper = new InsertHelper((ExtendedSQLiteOpenHelper) getDatabaseHelper());
helper = new InsertHelper(getDatabaseHelper());
return true;
}

Expand All @@ -52,7 +52,7 @@ protected SQLiteDatabase getReadableDatabase() {
}

@Override
protected SQLiteOpenHelper getDatabaseHelper(Context context) {
protected ExtendedSQLiteOpenHelper getDatabaseHelper(Context context) {
try {
return new ExtendedSQLiteOpenHelper(context, getCursorFactory());
} catch (IOException e) {
Expand All @@ -61,6 +61,11 @@ protected SQLiteOpenHelper getDatabaseHelper(Context context) {
}
}

@Override
protected ExtendedSQLiteOpenHelper getDatabaseHelper() {
return (ExtendedSQLiteOpenHelper) super.getDatabaseHelper();
}

@Override
protected Uri insertInTransaction(Uri uri, ContentValues values) {
Uri insertUri = insertSilently(uri, values);
Expand Down Expand Up @@ -148,7 +153,7 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel

if (expands.size() > 0) {
builder.addInnerJoin(expands.toArray(new String[]{}));
ExtendedSQLiteOpenHelper extendedHelper = (ExtendedSQLiteOpenHelper) getDatabaseHelper();
ExtendedSQLiteOpenHelper extendedHelper = getDatabaseHelper();
autoproj = extendedHelper.getProjectionMap(tableName.toString(), expands.toArray(new String[]{}));
builder.setProjectionMap(autoproj);
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/novoda/lib/sqliteprovider/provider/SQLiteProviderLocalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ protected ExtendedSQLiteQueryBuilder getSQLiteQueryBuilder() {
}

@Override
protected SQLiteOpenHelper getDatabaseHelper(Context context) {
protected ExtendedSQLiteOpenHelper getDatabaseHelper(Context context) {
try {
return new ExtendedSQLiteOpenHelper(getContext()) {
@Override
Expand Down