Skip to content

Newly created database is now identified by flag #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Newly created database is now identified by flag #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public class SQLiteAssetHelper extends SQLiteOpenHelper {

private SQLiteDatabase mDatabase = null;
private boolean mIsInitializing = false;
private boolean databaseNewlyCreated = false;

private String mDatabasePath;

Expand Down Expand Up @@ -178,7 +179,7 @@ public synchronized SQLiteDatabase getWritableDatabase() {
int version = db.getVersion();

// do force upgrade
if (version != 0 && version < mForcedUpgradeVersion) {
if (!databaseNewlyCreated && version < mForcedUpgradeVersion) {
db = createOrOpenDatabase(true);
db.setVersion(mNewVersion);
version = db.getVersion();
Expand All @@ -187,7 +188,7 @@ public synchronized SQLiteDatabase getWritableDatabase() {
if (version != mNewVersion) {
db.beginTransaction();
try {
if (version == 0) {
if (databaseNewlyCreated) {
onCreate(db);
} else {
if (version > mNewVersion) {
Expand Down Expand Up @@ -392,12 +393,14 @@ private SQLiteDatabase createOrOpenDatabase(boolean force) throws SQLiteAssetExc
if (force) {
Log.w(TAG, "forcing database upgrade!");
copyDatabaseFromAssets();
databaseNewlyCreated = true;
db = returnDatabase();
}
return db;
} else {
// database does not exist, copy it from assets and return it
copyDatabaseFromAssets();
databaseNewlyCreated = true;
db = returnDatabase();
return db;
}
Expand Down