Doctrine

Timestamp:

10/13/08 21:39:16 (9 months ago)

Author:

jwage

Message:

[1.0, 1.1] fixes #1548

Location:

branches

Files:

• 1.0/lib/Doctrine/Table.php (modified) (1 diff)
• 1.1/lib/Doctrine/Table.php (modified) (1 diff)

branches/1.0/lib/Doctrine/Table.php

@@ -1346 +1346 @@
     protected function findOneBy($fieldName, $value, $hydrationMode = null)
     {
-        $results = $this->createQuery('dctrn_find')
-                        ->where('dctrn_find.' . $fieldName . ' = ?',array($value))
-                        ->limit(1)
-                        ->execute(array(), $hydrationMode);
-
-        if (is_array($results) && isset($results[0])) {
-            return $results[0];
-        } else if ($results instanceof Doctrine_Collection && $results->count() > 0) {
-            return $results->getFirst();
-        } else {
-            return false;
-        }
+        return $this->createQuery('dctrn_find')
+                    ->where('dctrn_find.' . $fieldName . ' = ?', array($value))
+                    ->limit(1)
+                    ->fetchOne(array(), $hydrationMode);
     }
 

branches/1.1/lib/Doctrine/Table.php

@@ -1399 +1399 @@
     protected function findOneBy($fieldName, $value, $hydrationMode = null)
     {
-        $results = $this->createQuery('dctrn_find')
-                        ->where('dctrn_find.' . $fieldName . ' = ?',array($value))
-                        ->limit(1)
-                        ->execute(array(), $hydrationMode);
-
-        if (is_array($results) && isset($results[0])) {
-            return $results[0];
-        } else if ($results instanceof Doctrine_Collection && $results->count() > 0) {
-            return $results->getFirst();
-        } else {
-            return false;
-        }
+        return $this->createQuery('dctrn_find')
+                    ->where('dctrn_find.' . $fieldName . ' = ?', array($value))
+                    ->limit(1)
+                    ->fetchOne(array(), $hydrationMode);
     }