Doctrine

Timestamp:

04/21/08 23:38:18 (15 months ago)

Author:

jwage

Message:

Fixed error messagge in _getImportedObject() to be accurate and more complete.

Files:

• branches/0.11/lib/Doctrine/Data/Import.php (modified) (4 diffs)

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

@@ -156 +156 @@
      * @param  Doctrine_Record $record
      * @param  string $relationName
+     * @param  string $referringRowKey
      * @return Doctrine_Record
      * @throws Doctrine_Data_Exception
      */
-    protected function _getImportedObject($rowKey, Doctrine_Record $record, $relationName)
+    protected function _getImportedObject($rowKey, Doctrine_Record $record, $relationName, $referringRowKey)
     {
         if ( ! isset($this->_importedObjects[$rowKey])) {
@@ -171 +172 @@
             if ( ! is_subclass_of($relatedRowKeyObject, $relation->getClass())) {
                 throw new Doctrine_Data_Exception(sprintf(
-                    'Class referred to is expected to be "%s" and "%s" was given',
-                    get_class($relatedRowKeyObject), $relation->getClass()));
+                    'Class referred to in "%s" is expected to be "%s" and "%s" was given',
+                    $referringRowKey, $relation->getClass(), get_class($relatedRowKeyObject)));
             }
         }
@@ -201 +202 @@
                         foreach ($value as $link) {
                             if ($obj->getTable()->getRelation($key)->getType() === Doctrine_Relation::ONE) {
-                                $obj->set($key, $this->_getImportedObject($link, $obj, $key));
+                                $obj->set($key, $this->_getImportedObject($link, $obj, $key, $rowKey));
                             } else if ($obj->getTable()->getRelation($key)->getType() === Doctrine_Relation::MANY) {
                                 $relation = $obj->$key;
                                 
-                                $relation[] = $this->_getImportedObject($link, $obj, $key);
+                                $relation[] = $this->_getImportedObject($link, $obj, $key, $rowKey);
                             }
                         }
@@ -212 +213 @@
                     }
                 } else {
-                    $obj->set($key, $this->_getImportedObject($value, $obj, $key));
+                    $obj->set($key, $this->_getImportedObject($value, $obj, $key, $rowKey));
                 }
             } else {