Bug 847021 - Correctly drop bookmarks_type_deleted_index during migration. r=mfinkle, a=bajaj
authorRichard Newman <rnewman@mozilla.com>
Mon, 13 Jan 2014 19:36:35 -0800
changeset 175846 9268a4e612a4ffed2e5ece3f9b176a55932a1b03
parent 175845 9b91c7e0aa11117a3b6aa4d8dcb6e58f084fa942
child 175847 d4f1634861e908d6e64251582be9c8f87416f87c
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, bajaj
bugs847021
milestone28.0a2
Bug 847021 - Correctly drop bookmarks_type_deleted_index during migration. r=mfinkle, a=bajaj
mobile/android/base/db/BrowserProvider.java
--- a/mobile/android/base/db/BrowserProvider.java
+++ b/mobile/android/base/db/BrowserProvider.java
@@ -1434,16 +1434,17 @@ public class BrowserProvider extends Con
             debug("Renaming bookmarks table to " + TABLE_BOOKMARKS_TMP);
             db.execSQL("ALTER TABLE " + TABLE_BOOKMARKS +
                        " RENAME TO " + TABLE_BOOKMARKS_TMP);
 
             debug("Dropping views and indexes related to " + TABLE_BOOKMARKS);
             db.execSQL("DROP VIEW IF EXISTS " + Obsolete.VIEW_BOOKMARKS_WITH_IMAGES);
 
             db.execSQL("DROP INDEX IF EXISTS bookmarks_url_index");
+            db.execSQL("DROP INDEX IF EXISTS bookmarks_type_deleted_index");
             db.execSQL("DROP INDEX IF EXISTS bookmarks_guid_index");
             db.execSQL("DROP INDEX IF EXISTS bookmarks_modified_index");
 
             createBookmarksTable(db);
             createBookmarksWithImagesView(db);
 
             createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID,
                 R.string.bookmarks_folder_places, 0);