deleting objects

generator/lib/builder/om/PHP5ObjectBuilder.php

@@ -270,15 +270,22 @@ protected function addClassBody(&$script)
 
         if ($table->hasCrossForeignKeys()) {
             foreach ($table->getCrossFks() as $fkList) {
+                /* @var $refFK ForeignKey */
                 list($refFK, $crossFK) = $fkList;
                 $fkName = $this->getFKPhpNameAffix($crossFK, $plural = true);
-                $this->addScheduledForDeletionAttribute($script, $fkName);
+
+                if (!$refFK->isLocalPrimaryKey()) {
+                    $this->addScheduledForDeletionAttribute($script, $fkName);
+                }
             }
         }
 
         foreach ($table->getReferrers() as $refFK) {
             $fkName = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-            $this->addScheduledForDeletionAttribute($script, $fkName);
+
+            if (!$refFK->isLocalPrimaryKey()) {
+                $this->addScheduledForDeletionAttribute($script, $fkName);
+            }
         }
 
         if ($this->hasDefaultValues()) {
@@ -4307,9 +4314,8 @@ protected function addRefFkScheduledForDeletion(&$script, ForeignKey $refFK)
             if (\$this->{$lowerRelatedName}ScheduledForDeletion !== null) {
                 if (!\$this->{$lowerRelatedName}ScheduledForDeletion->isEmpty()) {";
 
-        if ($refFK->getOnDelete() == ForeignKey::CASCADE) {
+        if ($refFK->isLocalColumnsRequired() || ForeignKey::CASCADE === $refFK->getOnDelete()) {
             $script .= "
-                    //the foreign key is flagged as `CASCADE`, so we delete the items
                     $queryClassName::create()
                         ->filterByPrimaryKeys(\$this->{$lowerRelatedName}ScheduledForDeletion->getPrimaryKeys(false))
                         ->delete(\$con);";
@@ -4781,8 +4787,6 @@ protected function doSave(PropelPDO \$con" . ($reloadOnUpdate || $reloadOnInsert
         }
 
         foreach ($table->getReferrers() as $refFK) {
-            $this->addRefFkScheduledForDeletion($script, $refFK);
-
             if ($refFK->isLocalPrimaryKey()) {
                 $varName = $this->getPKRefFKVarName($refFK);
                 $script .= "
@@ -4793,6 +4797,8 @@ protected function doSave(PropelPDO \$con" . ($reloadOnUpdate || $reloadOnInsert
             }
 ";
             } else {
+                $this->addRefFkScheduledForDeletion($script, $refFK);
+
                 $collName = $this->getRefFKCollVarName($refFK);
                 $script .= "
             if (\$this->$collName !== null) {

test/testsuite/generator/builder/om/GeneratedObjectMoreRelationTest.php

@@ -49,7 +49,7 @@ public function setUp()
         <column name="user_id" required="true" primaryKey="true" type="INTEGER" />
         <column name="page_id" required="true" primaryKey="true" type="INTEGER" />
         <column name="comment" type="VARCHAR" size="100" />
-        <foreign-key foreignTable="more_relation_test_page" onDelete="cascade">
+        <foreign-key foreignTable="more_relation_test_page" onDelete="restrict">
           <reference local="page_id" foreign="id"/>
         </foreign-key>
     </table>
@@ -212,4 +212,25 @@ public function testContentsDeletion()
 
     }
 
+    public function testOnDeleteCascadeNotRequired()
+    {
+        \MoreRelationTest\PagePeer::doDeleteAll();
+        \MoreRelationTest\ContentPeer::doDeleteAll();
+
+        $page = new \MoreRelationTest\Page();
+        $page->setTitle('Some important Page');
+
+        $content = new \MoreRelationTest\Content();
+        $content->setTitle('Content');
+
+        $page->addContent($content);
+        $page->save();
+
+        $this->assertEquals(1, \MoreRelationTest\ContentQuery::create()->count());
+
+        $page->removeContent($content);
+        $page->save();
+
+        $this->assertEquals(0, \MoreRelationTest\ContentQuery::create()->count());
+    }
 }