Bug 1941655 - relax places DB constraints to what they were before bu…

…g 1935797
mozilla · Jan 21, 2025 · f3d54ca · f3d54ca
1 parent cb41b0a
commit f3d54ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/components/places/sql/create_shared_triggers.sql b/components/places/sql/create_shared_triggers.sql
@@ -63,8 +63,10 @@ BEGIN
 
     SELECT throw('update: item without parent')
     WHERE NEW.guid <> 'root________'
-      AND NOT EXISTS(
-          SELECT 1 FROM moz_bookmarks WHERE id = NEW.parent);
+      AND NEW.parent IS NULL;
+-- bug 1941655, this seemingly more correct check causes obscure problems.
+--      AND NOT EXISTS(
+--          SELECT 1 FROM moz_bookmarks WHERE id = NEW.parent);
 
     SELECT throw(format('update: old type=%d; new=%d', OLD.type, NEW.type))
     WHERE OLD.type <> NEW.type;

diff --git a/components/places/src/db/schema.rs b/components/places/src/db/schema.rs
@@ -560,11 +560,13 @@ mod tests {
                 e,
             );
 
+            // Bug 1941655 - we only guard against NULL parents, not missing ones.
+            /*
             let e = conn
                 .execute(
                     "UPDATE moz_bookmarks SET
                         parent = -1
-                     WHERE guid = 'folder_guid_'",
+                    WHERE guid = 'folder_guid_'",
                     [],
                 )
                 .expect_err("should fail to update folder with nonexistent parent");
@@ -573,6 +575,7 @@ mod tests {
                 "Expected error, got: {:?}",
                 e,
             );
+            */
         }
 
         // Invalid length guid