Doctrine

Timestamp:

12/17/08 21:14:01 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixes issue with inheritance type column when it is aliased (closes #1713)

Location:

branches

Files:

• 1.0/lib/Doctrine/Hydrator/RecordDriver.php (modified) (1 diff)
• 1.0/tests/Ticket/1713TestCase.php (added)
• 1.1/lib/Doctrine/Hydrator/RecordDriver.php (modified) (1 diff)
• 1.1/tests/Ticket/1713TestCase.php (added)

branches/1.0/lib/Doctrine/Hydrator/RecordDriver.php

@@ -160 +160 @@
             $inheritanceMap = $table->getOption('inheritanceMap');
             list($key, $value) = each($inheritanceMap);
+            $key = $this->_tables[$component]->getFieldName($key);
             if ( ! isset($data[$key]) || $data[$key] != $value) {
                 continue;

branches/1.1/lib/Doctrine/Hydrator/RecordDriver.php

@@ -160 +160 @@
             $inheritanceMap = $table->getOption('inheritanceMap');
             list($key, $value) = each($inheritanceMap);
+            $key = $this->_tables[$component]->getFieldName($key);
             if ( ! isset($data[$key]) || $data[$key] != $value) {
                 continue;