Doctrine

Timestamp:

06/01/08 07:41:27 (13 months ago)

Author:

romanb

Message:

Fixed #1099.

Location:

branches/0.11

Files:

• lib/Doctrine/Node.php (modified) (1 diff)
• lib/Doctrine/Record/Abstract.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1099TestCase.php (added)
• tests/Ticket/NewTicketTestCase.php (added)

branches/0.11/lib/Doctrine/Node.php

@@ -71 +71 @@
         $this->options = $options;
         
-        // Make sure that the tree object of the root component is used in the case
-        // of column aggregation inheritance.
+        // Make sure that the tree object of the root class is used in the case
+        // of column aggregation inheritance (single table inheritance).
         $class = $record->getTable()->getComponentName();
-        $table = $record->getTable();
-        if ($table->getOption('inheritanceMap')) {
-            $subclasses = $table->getOption('subclasses');
-            while (in_array($class, (array) $subclasses)) {
+        $thisTable = $record->getTable();
+        $table = $thisTable;
+        if ($thisTable->getOption('inheritanceMap')) {
+            // Move up the hierarchy until we find the "subclasses" option. This option
+            // MUST be set on the root class of the user's hierarchy that uses STI.
+            while ( ! $subclasses = $table->getOption('subclasses')) {
                 $class = get_parent_class($class);
+                if ($class == 'Doctrine_Record') {
+                    throw new Doctrine_Node_Exception("No subclasses specified. You are "
+                            . "using Single Table Inheritance with NestedSet but you have "
+                            . "not specified the subclasses correctly. Make sure you use "
+                            . "setSubclasses() in the root class of your hierarchy.");
+                }
+                $table = $table->getConnection()->getTable($class);
             }
         }
-        if ($class != $table->getComponentName()) {
-            $this->_tree = $table->getConnection()->getTable($class)->getTree();
+        if ($thisTable != $table) {
+            $this->_tree = $table->getTree();
         } else {
-            $this->_tree = $table->getTree();
+            $this->_tree = $thisTable->getTree();
         }
     }

branches/0.11/lib/Doctrine/Record/Abstract.php

@@ -132 +132 @@
             return;
         }
-
         $this->_table->setOption('subclasses', array_keys($map));
     }

branches/0.11/tests/run.php

@@ -46 +46 @@
 $tickets->addTestCase(new Doctrine_Ticket_941_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_930_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1099_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_NewTicket_TestCase());
 
 // Only uncomment the following ticket if you want to check free() performance!