Doctrine

Timestamp:

06/06/08 16:30:01 (13 months ago)

Author:

jwage

Message:

fixes #1044 again - Added override option for relationship options to override the relation if it already exists

Location:

branches/0.11

Files:

• lib/Doctrine/Import/Schema.php (modified) (1 diff)
• lib/Doctrine/Relation.php (modified) (1 diff)
• lib/Doctrine/Relation/Parser.php (modified) (1 diff)
• manual/docs/en/relations.txt (modified) (1 diff)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Import/Schema.php

@@ -116 +116 @@
                                                           'onDelete',
                                                           'onUpdate',
-                                                          'equal'),
+                                                          'equal',
+                                                          'override'),
 
                                    'inheritance'=>  array('type',

branches/0.11/lib/Doctrine/Relation.php

@@ -79 +79 @@
                                   'equal'       => false,
                                   'cascade'     => array(), // application-level cascades
-                                  'owningSide'  => false // whether this is the owning side
+                                  'owningSide'  => false, // whether this is the owning side
+                                  'override'    => false // whether to override if relation exists already
                                   );
 

branches/0.11/lib/Doctrine/Relation/Parser.php

@@ -136 +136 @@
         }
 
-        if ($this->hasRelation($alias)) {
+        if ($this->hasRelation($alias) && (! isset($options['override']) || ! $options['override'])) {
             throw new Doctrine_Relation_Exception('A relationship with the name "' . $alias . '" already exists.');
         }
+
+        if (isset($this->relations[$alias])) { 
+                    unset($this->relations[$alias]); 
+        }
+
+        if (isset($this->_pending[$alias])) { 
+                    unset($this->_pending[$alias]); 
+        } 
 
         $this->_pending[$alias] = array_merge($options, array('class' => $name, 'alias' => $alias));

branches/0.11/manual/docs/en/relations.txt

@@ -14 +14 @@
 * **onDelete**, (optional) the onDelete integrity action that is applied on the foreign key constraint when the tables are created by Doctrine.
 * **onUpdate**, (optional) the onUpdate integrity action that is applied on the foreign key constraint when the tables are created by Doctrine.
+* **override**, (optional) the override option will override the relation definition if one already exists with the same name. This is useful in cases where you have child classes using inheritance which redefine a relations information for the child class.
 
 So lets take our first example, say we have two classes Forum_Board and Forum_Thread. Here Forum_Board has many 

branches/0.11/tests/run.php

@@ -73 +73 @@
 $tickets->addTestCase(new Doctrine_Ticket_1028_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1071_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1044_TestCase());
 $test->addTestCase($tickets);