Merge branch '4.1' into 4.2

tractorcow-farm · Nov 7, 2018 · b631f75 · b631f75
2 parents a0c3627 + 37f9094
commit b631f75
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/Extension/FluentExtension.php b/src/Extension/FluentExtension.php
@@ -449,7 +449,24 @@ public function updateDeleteTables(&$queriedTables)
 
             // If table isn't localised, simple delete
             if (!isset($localisedTables[$table])) {
-                $rootDelete->execute();
+                $baseTable = $this->getDeleteTableTarget($this->owner->baseTable());
+
+                // The base table isn't localised? Delete the record then.
+                if ($baseTable === $rootTable) {
+                    $rootDelete->execute();
+                    continue;
+                }
+
+                $rootDelete
+                    ->setDelete("\"{$rootTable}\"")
+                    ->addLeftJoin(
+                        $baseTable,
+                        "\"{$rootTable}\".\"ID\" = \"{$baseTable}\".\"ID\""
+                    )
+                    // Only when join matches no localisations is it safe to delete
+                    ->addWhere("\"{$baseTable}\".\"ID\" IS NULL")
+                    ->execute();
+
                 continue;
             }