diff options
| author | Danny Baumann <dannybaumann@web.de> | 2016-11-03 08:53:43 +0100 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@cyanogenmod.org> | 2016-11-04 13:16:31 -0700 |
| commit | 1aea5a8703221a29f2c38bd8621e28d1aa3b4aa2 (patch) | |
| tree | a44cf991a98f466681b129f53ba54d2a90977a9f | |
| parent | 740efc638e209bfe268bcd60f52b23a36372e92e (diff) | |
| download | android_packages_apps_CMFileManager-1aea5a8703221a29f2c38bd8621e28d1aa3b4aa2.tar.gz android_packages_apps_CMFileManager-1aea5a8703221a29f2c38bd8621e28d1aa3b4aa2.tar.bz2 android_packages_apps_CMFileManager-1aea5a8703221a29f2c38bd8621e28d1aa3b4aa2.zip | |
Properly upgrade DB.
Commit Ie59a4848de118841d2f3c5ec4805f2add0a1d701 introduced a new table,
but missed the DB upgrade.
Change-Id: I1387bfa64deec4ede702c674d1e152d5f65ba971
| -rw-r--r-- | src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java b/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java index d0d5061b..77cb964d 100644 --- a/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java +++ b/src/com/cyanogenmod/filemanager/preferences/BookmarksDatabaseHelper.java @@ -32,7 +32,7 @@ public class BookmarksDatabaseHelper extends SQLiteOpenHelper { private static boolean DEBUG = false; private static final String DATABASE_NAME = "bookmarks.db"; //$NON-NLS-1$ - private static final int DATABASE_VERSION = 1; + private static final int DATABASE_VERSION = 2; /** * Constructor of <code>BookmarksDatabaseHelper</code> @@ -51,11 +51,7 @@ public class BookmarksDatabaseHelper extends SQLiteOpenHelper { db.execSQL("CREATE TABLE bookmarks (" + //$NON-NLS-1$ "_id INTEGER PRIMARY KEY," + //$NON-NLS-1$ "path TEXT);"); //$NON-NLS-1$ - - db.execSQL("CREATE TABLE history (" + //$NON-NLS-1$ - "_id INTEGER PRIMARY KEY," + //$NON-NLS-1$ - "title TEXT," + //$NON-NLS-1$ - "description TEXT);"); //$NON-NLS-1$ + createHistoryTable(db); } /** @@ -65,10 +61,17 @@ public class BookmarksDatabaseHelper extends SQLiteOpenHelper { public void onUpgrade(SQLiteDatabase db, int oldVersion, int currentVersion) { if (DEBUG) { Log.v(TAG, "Upgrading bookmarks database from version " + //$NON-NLS-1$ - oldVersion + " to " + currentVersion + //$NON-NLS-1$ - ", which will destroy all old data"); //$NON-NLS-1$ + oldVersion + " to " + currentVersion); //$NON-NLS-1$ + } + if (oldVersion < 2) { + createHistoryTable(db); } - db.execSQL("DROP TABLE IF EXISTS bookmarks"); //$NON-NLS-1$ - onCreate(db); } -}
\ No newline at end of file + + private void createHistoryTable(SQLiteDatabase db) { + db.execSQL("CREATE TABLE history (" + //$NON-NLS-1$ + "_id INTEGER PRIMARY KEY," + //$NON-NLS-1$ + "title TEXT," + //$NON-NLS-1$ + "description TEXT);"); //$NON-NLS-1$ + } +} |