Doctrine

Timestamp:

06/29/08 06:19:44 (12 months ago)

Author:

jwage

Message:

fixes #1124

Location:

branches/0.11

Files:

• lib/Doctrine/Table.php (modified) (3 diffs)
• tests/run.php (modified) (1 diff)
• tests/Ticket/1124TestCase.php (added)

branches/0.11/lib/Doctrine/Table.php

@@ -953 +953 @@
         }
 
-        return $fieldName;
+        return strtolower($fieldName);
     }
 
@@ -2169 +2169 @@
 
     /**
+     * Resolve the passed find by field name to the appropriate field name
+     * regardless of whether the user passes a column name, field name, or a Doctrine_Inflector::classified()
+     * version of their column name. It will be inflected with Doctrine_Inflector::tableize() 
+     * to get the column or field name
+     *
+     * @param string $name 
+     * @return string $fieldName
+     */
+    protected function _resolveFindByFieldName($name)
+    {
+        $fieldName = Doctrine_Inflector::tableize($name);
+        if ($this->hasColumn($name) || $this->hasField($name)) {
+            return $this->getFieldName($this->getColumnName($name));
+        } else if ($this->hasColumn($fieldName) || $this->hasField($fieldName)) {
+            return $this->getFieldName($this->getColumnName($fieldName));
+        } else {
+            return false;
+        }
+    }
+
+    /**
      * __call
      *
@@ -2192 +2213 @@
             }
 
-            $fieldName = Doctrine_Inflector::tableize($by);
+            $fieldName = $this->_resolveFindByFieldName($by);
             $hydrationMode = isset($arguments[1]) ? $arguments[1]:null;
-            if ($this->hasColumn($this->getColumnName($fieldName))) {
+            if ($this->hasField($fieldName)) {
                 return $this->$method($fieldName, $arguments[0], $hydrationMode);
             } else if ($this->hasRelation($by)) {

branches/0.11/tests/run.php

@@ -82 +82 @@
 $tickets->addTestCase(new Doctrine_Ticket_1118_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1123_TestCase());
+$tickets->addTestCase(new Doctrine_Ticket_1124_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1133_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_1175_TestCase());