Bug 1127763 - Some database might be missing the favicons guid index. r=mak

toolkit/components/places/Database.cpp

@@ -751,6 +751,13 @@ Database::InitSchema(bool* aDatabaseMigrated)
 
       // Firefox 39 uses schema version 28.
 
+      if (currentSchemaVersion < 29) {
+        rv = MigrateV29Up();
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+
+      // Firefox 41 uses schema version 29.
+
       // Schema Upgrades must add migration code here.
 
       rv = UpdateBookmarkRootTitles();
@@ -823,6 +830,8 @@ Database::InitSchema(bool* aDatabaseMigrated)
     // moz_favicons.
     rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_FAVICONS);
     NS_ENSURE_SUCCESS(rv, rv);
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_FAVICONS_GUID);
+    NS_ENSURE_SUCCESS(rv, rv);
 
     // moz_anno_attributes.
     rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_ANNO_ATTRIBUTES);
@@ -1604,6 +1613,16 @@ Database::MigrateV28Up() {
   return NS_OK;
 }
 
+nsresult
+Database::MigrateV29Up() {
+  MOZ_ASSERT(NS_IsMainThread());
+
+  nsresult rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_FAVICONS_GUID);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
 void
 Database::Shutdown()
 {
@@ -1638,7 +1657,7 @@ Database::Observe(nsISupports *aSubject,
                   const char16_t *aData)
 {
   MOZ_ASSERT(NS_IsMainThread());
- 
+
   if (strcmp(aTopic, TOPIC_PROFILE_CHANGE_TEARDOWN) == 0) {
     // Tests simulating shutdown may cause multiple notifications.
     if (mShuttingDown) {

toolkit/components/places/Database.h

@@ -16,7 +16,7 @@
 
 // This is the schema version. Update it at any schema change and add a
 // corresponding migrateVxx method below.
-#define DATABASE_SCHEMA_VERSION 28
+#define DATABASE_SCHEMA_VERSION 29
 
 // Fired after Places inited.
 #define TOPIC_PLACES_INIT_COMPLETE "places-init-complete"
@@ -253,7 +253,7 @@ protected:
 
   /**
    * Initializes triggers defined in nsPlacesTriggers.h
-   */  
+   */
   nsresult InitTempTriggers();
 
   /**
@@ -275,6 +275,7 @@ protected:
   nsresult MigrateV26Up();
   nsresult MigrateV27Up();
   nsresult MigrateV28Up();
+  nsresult MigrateV29Up();
 
   nsresult UpdateBookmarkRootTitles();
 

toolkit/components/places/tests/head_common.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const CURRENT_SCHEMA_VERSION = 28;
+const CURRENT_SCHEMA_VERSION = 29;
 const FIRST_UPGRADABLE_SCHEMA_VERSION = 11;
 
 const NS_APP_USER_PROFILE_50_DIR = "ProfD";

toolkit/components/places/tests/migration/xpcshell.ini

@@ -17,6 +17,7 @@ support-files =
   places_v26.sqlite
   places_v27.sqlite
   places_v28.sqlite
+  places_v29.sqlite
 
 [test_current_from_downgraded.js]
 [test_current_from_v6.js]