author milindl <i.milind.luthra@gmail.com>

Fri, 02 Jun 2017 15:46:46 +0530

changeset 607279 cd5798c8ec86b93616e1a6fecf0f65e52661a722

parent 603312 a3b192dc8344679ce208af42b6246c3c0d42cab3

child 607280 d1dd7f2d3d2a56efd181b36675f0d273649f030c

child 607526 3d3057faa23339f5933da73d14aea84729a3c465

push id 67956

push user bmo:i.milind.luthra@gmail.com

push date Wed, 12 Jul 2017 06:34:20 +0000

reviewers mak

bugs 1039200

milestone 56.0a1

toolkit/components/places/Database.cpp file | annotate | diff | comparison | revisions

toolkit/components/places/Database.h file | annotate | diff | comparison | revisions

toolkit/components/places/nsPlacesTables.h file | annotate | diff | comparison | revisions

toolkit/components/places/tests/head_common.js file | annotate | diff | comparison | revisions

toolkit/components/places/tests/migration/places_v39.sqlite file | annotate | diff | comparison | revisions

toolkit/components/places/tests/migration/test_current_from_v39.js file | annotate | diff | comparison | revisions

toolkit/components/places/tests/migration/xpcshell.ini file | annotate | diff | comparison | revisions
--- a/toolkit/components/places/Database.cpp
+++ b/toolkit/components/places/Database.cpp
@@ -1100,17 +1100,23 @@ Database::InitSchema(bool* aDatabaseMigr
       }
 
       // Firefox 55 uses schema version 37.
 
       if (currentSchemaVersion < 38) {
         rv = MigrateV38Up();
         NS_ENSURE_SUCCESS(rv, rv);
       }
-      // Firefox 56 uses schema version 38.
+
+      if (currentSchemaVersion < 39) {
+        rv = MigrateV39Up();
+        NS_ENSURE_SUCCESS(rv, rv);
+      }
+
+      // Firefox 56 uses schema version 39.
 
       // Schema Upgrades must add migration code here.
 
       rv = UpdateBookmarkRootTitles();
       // We don't want a broken localization to cause us to think
       // the database is corrupt and needs to be replaced.
       MOZ_ASSERT(NS_SUCCEEDED(rv));
     }
@@ -1183,16 +1189,22 @@ Database::InitSchema(bool* aDatabaseMigr
     NS_ENSURE_SUCCESS(rv, rv);
 
     // moz_items_annos.
     rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_ITEMS_ANNOS);
     NS_ENSURE_SUCCESS(rv, rv);
     rv = mMainConn->ExecuteSimpleSQL(CREATE_IDX_MOZ_ITEMSANNOS_PLACEATTRIBUTE);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    // moz_tags and moz_tags_relation
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_TAGS);
+    NS_ENSURE_SUCCESS(rv, rv);
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_TAGS_RELATION);
+    NS_ENSURE_SUCCESS(rv, rv);
+
     // Initialize the bookmark roots in the new DB.
     rv = CreateBookmarkRoots();
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   // Set the schema version to the current one.
   rv = mMainConn->SetSchemaVersion(DATABASE_SCHEMA_VERSION);
   NS_ENSURE_SUCCESS(rv, rv);
@@ -2319,16 +2331,61 @@ Database::MigrateV38Up()
     ));
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   return NS_OK;
 }
 
 nsresult
+Database::MigrateV39Up()
+{
+  // Create moz_tags table if it does not exist
+  bool tableExists = false;
+  nsresult rv = mMainConn->TableExists(NS_LITERAL_CSTRING("moz_tags"),
+                                       &tableExists);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!tableExists) {
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_TAGS);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // Create moz_tags_relation table if it does not exist
+  tableExists = false;
+  rv = mMainConn->TableExists(NS_LITERAL_CSTRING("moz_tags_relation"),
+                              &tableExists);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (!tableExists) {
+    rv = mMainConn->ExecuteSimpleSQL(CREATE_MOZ_TAGS_RELATION);
+    NS_ENSURE_SUCCESS(rv, rv);
+  }
+
+  // Migrate old tags to new tags database
+  // DOUBT: is there a better way to do this? It was using moz_bookmarks_root, but
+  // we don't have it any more. Is using the tags folder guid directly OK?
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "INSERT OR IGNORE INTO moz_tags (tag) "
+      "SELECT c.title FROM moz_bookmarks c "
+      "JOIN moz_bookmarks p ON c.parent= p.id "
+      "WHERE p.guid = 'tags________'"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // Create the new relations for the tags
+  rv = mMainConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
+    "INSERT OR IGNORE INTO moz_tags_relation (tag_id, place_id) "
+      "SELECT (SELECT id FROM moz_tags WHERE tag = t.title), b.fk "
+      "FROM moz_bookmarks b "
+      "JOIN moz_bookmarks t ON t.id = b.parent "
+      "JOIN moz_bookmarks p ON p.id = t.parent AND p.guid = 'tags________'"));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_OK;
+}
+
+nsresult
 Database::GetItemsWithAnno(const nsACString& aAnnoName, int32_t aItemType,
                            nsTArray<int64_t>& aItemIds)
 {
   nsCOMPtr<mozIStorageStatement> stmt;
   nsresult rv = mMainConn->CreateStatement(NS_LITERAL_CSTRING(
     "SELECT b.id FROM moz_items_annos a "
     "JOIN moz_anno_attributes n ON n.id = a.anno_attribute_id "
     "JOIN moz_bookmarks b ON b.id = a.item_id "
--- a/toolkit/components/places/Database.h
+++ b/toolkit/components/places/Database.h
@@ -13,17 +13,17 @@
 #include "mozilla/storage.h"
 #include "mozilla/storage/StatementCache.h"
 #include "mozilla/Attributes.h"
 #include "nsIEventTarget.h"
 #include "Shutdown.h"
 
 // This is the schema version. Update it at any schema change and add a
 // corresponding migrateVxx method below.
-#define DATABASE_SCHEMA_VERSION 38
+#define DATABASE_SCHEMA_VERSION 39
 
 // Fired after Places inited.
 #define TOPIC_PLACES_INIT_COMPLETE "places-init-complete"
 // Fired when initialization fails due to a locked database.
 #define TOPIC_DATABASE_LOCKED "places-database-locked"
 // This topic is received when the profile is about to be lost.  Places does
 // initial shutdown work and notifies TOPIC_PLACES_SHUTDOWN to all listeners.
 // Any shutdown work that requires the Places APIs should happen here.
@@ -294,16 +294,17 @@ protected:
   nsresult MigrateV31Up();
   nsresult MigrateV32Up();
   nsresult MigrateV33Up();
   nsresult MigrateV34Up();
   nsresult MigrateV35Up();
   nsresult MigrateV36Up();
   nsresult MigrateV37Up();
   nsresult MigrateV38Up();
+  nsresult MigrateV39Up();
 
   nsresult UpdateBookmarkRootTitles();
 
   friend class ConnectionShutdownBlocker;
 
   int64_t CreateMobileRoot();
   nsresult GetItemsWithAnno(const nsACString& aAnnoName, int32_t aItemType,
                             nsTArray<int64_t>& aItemIds);
--- a/toolkit/components/places/nsPlacesTables.h
+++ b/toolkit/components/places/nsPlacesTables.h
@@ -208,9 +208,24 @@
     "page_id INTEGER NOT NULL, " \
     "icon_id INTEGER NOT NULL, " \
     "PRIMARY KEY (page_id, icon_id), " \
     "FOREIGN KEY (page_id) REFERENCES moz_pages_w_icons ON DELETE CASCADE, " \
     "FOREIGN KEY (icon_id) REFERENCES moz_icons ON DELETE CASCADE " \
   ") WITHOUT ROWID " \
 )
 
+#define CREATE_MOZ_TAGS NS_LITERAL_CSTRING( \
+  "CREATE TABLE moz_tags (" \
+  " id INTEGER PRIMARY KEY " \
+  ", tag TEXT NOT NULL UNIQUE" \
+  ")" \
+)
+
+#define CREATE_MOZ_TAGS_RELATION NS_LITERAL_CSTRING( \
+  "CREATE TABLE moz_tags_relation (" \
+  " tag_id INTEGER NOT NULL" \
+  ", place_id INTEGER NOT NULL" \
+  ", PRIMARY KEY (tag_id, place_id)" \
+  ") WITHOUT ROWID" \
+)
+
 #endif // __nsPlacesTables_h__
--- a/toolkit/components/places/tests/head_common.js
+++ b/toolkit/components/places/tests/head_common.js
@@ -1,17 +1,17 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 // It is expected that the test files importing this file define Cu etc.
 /* global Cu, Ci, Cc, Cr */
 
-const CURRENT_SCHEMA_VERSION = 38;
+const CURRENT_SCHEMA_VERSION = 39;
 const FIRST_UPGRADABLE_SCHEMA_VERSION = 11;
 
 const NS_APP_USER_PROFILE_50_DIR = "ProfD";
 const NS_APP_PROFILE_DIR_STARTUP = "ProfDS";
 
 // Shortcuts to transitions type.
 const TRANSITION_LINK = Ci.nsINavHistoryService.TRANSITION_LINK;
 const TRANSITION_TYPED = Ci.nsINavHistoryService.TRANSITION_TYPED;
new file mode 100644
--- /dev/null
+++ b/toolkit/components/places/tests/migration/test_current_from_v39.js
@@ -0,0 +1,58 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+add_task(async function setup() {
+  await setupPlacesDatabase("places_v39.sqlite");
+});
+
+add_task(async function initial_state() {
+  let path = OS.Path.join(OS.Constants.Path.profileDir, DB_FILENAME);
+  let db = await Sqlite.openConnection({ path });
+
+  // Make sure the tables don't exist here already.
+  Assert.ok(!(await db.tableExists("moz_tags")));
+  Assert.ok(!(await db.tableExists("moz_tags_relation")));
+
+  await db.close();
+});
+
+add_task(async function database_is_valid() {
+  Assert.equal(PlacesUtils.history.databaseStatus,
+               PlacesUtils.history.DATABASE_STATUS_UPGRADED);
+
+ let db = await PlacesUtils.promiseDBConnection();
+  Assert.equal((await db.getSchemaVersion()), CURRENT_SCHEMA_VERSION);
+});
+
+add_task(async function test_tables_added() {
+  let db = await PlacesUtils.promiseDBConnection();
+
+  // The attached DB has the Bookmarks added with certain tags, namely -
+  // Bookmark1 (fk: 22) - tag1.
+  // Bookmark2 (fk: 23) - tag1, tag2.
+
+  let tagIdToBookmarksFks = new Map();
+  tagIdToBookmarksFks.set(1, [22, 23]);
+  tagIdToBookmarksFks.set(2, [23]);
+
+  // Check if tags have been migrated to moz_tags
+  let rows = await db.execute("SELECT * FROM moz_tags");
+  Assert.equal(rows.length, 2);
+  Assert.equal(rows[0].getResultByName("tag"), "tag1");
+  Assert.equal(rows[1].getResultByName("tag"), "tag2");
+
+  // Check if the correct relations have been created in moz_tags_relation
+  rows = await db.execute("SELECT * FROM moz_tags_relation");
+  Assert.equal(rows.length, 3);
+  let i = 0;
+  for (let [tagId, bookmarkFks] of tagIdToBookmarksFks) {
+    for (let bookmarkFk of bookmarkFks) {
+      Assert.equal(rows[i].getResultByName("tag_id"), tagId);
+      Assert.equal(rows[i].getResultByName("place_id"), bookmarkFk);
+      i++;
+    }
+  }
+});
--- a/toolkit/components/places/tests/migration/xpcshell.ini
+++ b/toolkit/components/places/tests/migration/xpcshell.ini
@@ -19,23 +19,26 @@ support-files =
   places_v31.sqlite
   places_v32.sqlite
   places_v33.sqlite
   places_v34.sqlite
   places_v35.sqlite
   places_v36.sqlite
   places_v37.sqlite
   places_v38.sqlite
+  places_v39.sqlite
+
 
 [test_current_from_downgraded.js]
 [test_current_from_v6.js]
 [test_current_from_v11.js]
 [test_current_from_v19.js]
 [test_current_from_v24.js]
 [test_current_from_v25.js]
 [test_current_from_v26.js]
 [test_current_from_v27.js]
 [test_current_from_v31.js]
 [test_current_from_v34.js]
 [test_current_from_v34_no_roots.js]
 [test_current_from_v35.js]
 [test_current_from_v36.js]
 [test_current_from_v38.js]
+[test_current_from_v39.js]
author	milindl <i.milind.luthra@gmail.com>
	Fri, 02 Jun 2017 15:46:46 +0530
changeset 607279	cd5798c8ec86b93616e1a6fecf0f65e52661a722
parent 603312	a3b192dc8344679ce208af42b6246c3c0d42cab3
child 607280	d1dd7f2d3d2a56efd181b36675f0d273649f030c
child 607526	3d3057faa23339f5933da73d14aea84729a3c465
push id	67956
push user	bmo:i.milind.luthra@gmail.com
push date	Wed, 12 Jul 2017 06:34:20 +0000
reviewers	mak
bugs	1039200
milestone	56.0a1
toolkit/components/places/Database.cpp		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/Database.h		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/nsPlacesTables.h		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/head_common.js		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/migration/places_v39.sqlite		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/migration/test_current_from_v39.js		file \| annotate \| diff \| comparison \| revisions
toolkit/components/places/tests/migration/xpcshell.ini		file \| annotate \| diff \| comparison \| revisions