Doctrine

Timestamp:

08/22/08 02:57:41 (11 months ago)

Author:

guilhermeblanco

Message:

fixes #1288. Added a fixed alias to findXXX methods. THe alias name is 'dctrn_find'.

Files:

• branches/1.0/lib/Doctrine/Table.php (modified) (5 diffs)

branches/1.0/lib/Doctrine/Table.php

@@ -1253 +1253 @@
 
         $id = is_array($id) ? array_values($id) : array($id);
-        
-        $q = $this->createQuery();
-        $q->where(implode(' = ? AND ', (array) $this->getIdentifier()) . ' = ?', $id)
-                ->limit(1);
+
+        $q = $this->createQuery('dctrn_find')
+            ->where(
+                'dctrn_find.' . implode(
+                    ' = ? AND dctrn_find.', (array) $this->getIdentifier()
+                ) . ' = ?', $id
+            )
+            ->limit(1);
         $res = $q->fetchOne(array(), $hydrationMode);
         $q->free();
@@ -1272 +1276 @@
     public function findAll($hydrationMode = null)
     {
-        return $this->createQuery()->execute(array(), $hydrationMode);
+        return $this->createQuery('dctrn_find')
+            ->execute(array(), $hydrationMode);
     }
 
@@ -1290 +1295 @@
     public function findBySql($dql, $params = array(), $hydrationMode = null)
     {
-        return $this->createQuery()->where($dql)->execute($params, $hydrationMode);
+        return $this->createQuery('dctrn_find')
+            ->where($dql)->execute($params, $hydrationMode);
     }
 
@@ -1307 +1313 @@
         $parser = new Doctrine_Query($this->_conn);
         $component = $this->getComponentName();
-        $query = 'FROM ' . $component . ' WHERE ' . $dql;
+        $query = 'FROM ' . $component . ' dctrn_find WHERE ' . $dql;
 
         return $parser->query($query, $params, $hydrationMode);
+    }
+    
+    /**
+     * findBy
+     *
+     * @param string $column
+     * @param string $value
+     * @param string $hydrationMode
+     * @return void
+     */
+    protected function findBy($fieldName, $value, $hydrationMode = null)
+    {
+        return $this->createQuery('dctrn_find')
+            ->where('dctrn_find.' . $fieldName . ' = ?', array($value))
+            ->execute(array(), $hydrationMode);
+    }
+
+    /**
+     * findOneBy
+     *
+     * @param string $column
+     * @param string $value
+     * @param string $hydrationMode
+     * @return void
+     */
+    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;
+        }
     }
 
@@ -2165 +2210 @@
 
     /**
-     * findBy
-     *
-     * @param string $column
-     * @param string $value
-     * @param string $hydrationMode
-     * @return void
-     */
-    protected function findBy($fieldName, $value, $hydrationMode = null)
-    {
-        return $this->createQuery()->where($fieldName . ' = ?', array($value))->execute(array(), $hydrationMode);
-    }
-
-    /**
-     * findOneBy
-     *
-     * @param string $column
-     * @param string $value
-     * @param string $hydrationMode
-     * @return void
-     */
-    protected function findOneBy($fieldName, $value, $hydrationMode = null)
-    {
-        $results = $this->createQuery()
-                        ->where($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;
-        }
-    }
-
-    /**
      * 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()