Bug 1347248 - Change "nonexistent" for null and query to use CASE WHEN r=mak

MozReview-Commit-ID: I41bOputlIq

--HG--
extra : rebase_source : ddf42e571c34313aa4dca8838dacf801fbfbfe93

toolkit/components/places/Bookmarks.jsm

@@ -1223,10 +1223,10 @@ function insertBookmark(item, parent) {
         `INSERT INTO moz_bookmarks (fk, type, parent, position, title,
                                     dateAdded, lastModified, guid,
                                     syncChangeCounter, syncStatus)
-         VALUES ((SELECT id FROM moz_places WHERE url_hash = hash(:url) AND url = :url), :type, :parent,
+         VALUES (CASE WHEN :url ISNULL THEN NULL ELSE (SELECT id FROM moz_places WHERE url_hash = hash(:url) AND url = :url) END,
-                 :index, :title, :date_added, :last_modified, :guid,
+                 :type, :parent, :index, :title, :date_added, :last_modified,
-                 :syncChangeCounter, :syncStatus)
+                 :guid, :syncChangeCounter, :syncStatus)
-        `, { url: item.hasOwnProperty("url") ? item.url.href : "nonexistent",
+        `, { url: item.hasOwnProperty("url") ? item.url.href : null,
              type: item.type, parent: parent._id, index: item.index,
              title: item.title, date_added: PlacesUtils.toPRTime(item.dateAdded),
              last_modified: PlacesUtils.toPRTime(item.lastModified), guid: item.guid,