Fix #866

spicywebau · Mar 21, 2024 · 77faa5b · 77faa5b
1 parent 7b514e8
commit 77faa5b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+- Fixed an error that could occur during Craft garbage collection if the `neoblockstructures` table contained more than 65535 rows
+
 ## 2.13.20 - 2024-02-23
 
 ### Added

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -199,25 +199,23 @@ private function _registerGarbageCollection()
             // Delete anything in the structures table that's a Neo block structure, but doesn't exist in the
             // neoblockstructures table
             $stdout('    > deleting orphaned Neo block structure data ... ');
-            Db::delete(Table::STRUCTURES, [
-                'and',
-                [
-                    'id' => (new Query())
-                        ->select(['structureId'])
-                        ->from(['se' => Table::STRUCTUREELEMENTS])
-                        ->innerJoin(['nb' => '{{%neoblocks}}'], '[[se.elementId]] = [[nb.id]]')
-                        ->column(),
-                ],
-                [
-                    'not',
-                    [
-                        'id' => (new Query())
-                            ->select(['structureId'])
-                            ->from('{{%neoblockstructures}}')
-                            ->column(),
-                    ]
-                ],
-            ]);
+            $neoStructureIds = (new Query())
+                ->select(['structureId'])
+                ->from(['se' => Table::STRUCTUREELEMENTS])
+                ->innerJoin(['nb' => '{{%neoblocks}}'], '[[se.elementId]] = [[nb.id]]')
+                ->column();
+            $neoStructureIdsNotToDelete = (new Query())
+                ->select(['structureId'])
+                ->from('{{%neoblockstructures}}')
+                ->column();
+            $neoStructureIdsToDelete = array_diff($neoStructureIds, $neoStructureIdsNotToDelete);
+
+            foreach (array_chunk($neoStructureIdsToDelete, 1000) as $neoStructureIdChunk) {
+                Db::delete(Table::STRUCTURES, [
+                    'id' => $neoStructureIdChunk,
+                ]);
+            }
+
             $stdout("done\n", Console::FG_GREEN);
         });
     }