Merge pull request #15705 from craftcms/bugfix/gc-hard-delete-structu…

…res-adjustment

tweak to hard delete structures not linked to revisions

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Updated Twig to 3.14. ([#15704](https://github.com/craftcms/cms/issues/15704))
+- Fixed a bug where soft-deleted structures weren’t getting hard-deleted via garbage collection. ([#15705](https://github.com/craftcms/cms/pull/15705))
 - Fixed an RCE vulnerability.
 
 ## 4.12.1 - 2024-09-06

src/services/Gc.php

@@ -609,6 +609,7 @@ private function _hardDeleteStructures(): void
             ->leftJoin(['r' => $revisionsTable], '[[r.canonicalId]] = coalesce([[e.canonicalId]],[[e.id]])')
             ->where([
                 'and',
+                ['not', ['se.elementId' => null]],
                 $this->_hardDeleteCondition('s'),
                 [
                     'r.canonicalId' => null,
@@ -624,7 +625,7 @@ private function _hardDeleteStructures(): void
             if ($this->db->getIsMysql()) {
                 $sql = <<<SQL
 DELETE [[s]].* FROM $structuresTable [[s]]
-WHERE [[s.id]] NOT IN ($ids)
+WHERE [[s.id]] IN ($ids)
 AND $conditionSql
 SQL;
             } else {
@@ -633,7 +634,7 @@ private function _hardDeleteStructures(): void
 USING $structuresTable [[s]]
 WHERE 
     $structuresTable.[[id]] = [[s.id]] AND 
-    [[s.id]] NOT IN ($ids) AND
+    [[s.id]] IN ($ids) AND
     $conditionSql
 SQL;
             }