Doctrine

Timestamp:

08/27/08 05:44:41 (10 months ago)

Author:

guilhermeblanco

Message:

Completed Doctrine_Query_Registry support. Included named query support, backported from trunk. From now on you're able to define and run named queries from *Table classes. Documentation to be added.

Location:

branches/1.0

Files:

• lib/Doctrine/Manager.php (modified) (1 diff)
• lib/Doctrine/Query/Registry.php (modified) (1 diff)
• lib/Doctrine/Table.php (modified) (2 diffs)
• tests/run.php (modified) (1 diff)
• tests/Table/NamedQueryTestCase.php (added)

branches/1.0/lib/Doctrine/Manager.php

@@ -138 +138 @@
     {
         if ( ! isset($this->_queryRegistry)) {
-           $this->_queryRegistry = new Doctrine_Query_Registry;
+           $this->_queryRegistry = new Doctrine_Query_Registry();
         }
         return $this->_queryRegistry;

branches/1.0/lib/Doctrine/Query/Registry.php

@@ -68 +68 @@
         return $query;
     }
+    
+    
+    public function has($key, $namespace = null)
+    {
+        return isset($namespace) 
+            ? isset($this->_queries[$namespace][$key])
+            : isset($this->_queries[$key]);
+    }
 }

branches/1.0/lib/Doctrine/Table.php

@@ -1234 +1234 @@
         public function createNamedQuery($queryKey)
     {
-        return Doctrine_Manager::getInstance()->getQueryRegistry()
-                   ->get($queryKey, $this->getComponentName());
+        $queryRegistry = Doctrine_Manager::getInstance()->getQueryRegistry();
+
+        if (strpos($queryKey, '/') !== false) {
+            $e = explode('/', $queryKey);
+            
+            return $queryRegistry->get($e[0], $e[1]);
+        }
+
+        return $queryRegistry->get($queryKey, $this->getComponentName());
     }
 
@@ -1242 +1249 @@
      * finds a record by its identifier
      *
-     * @param $id                       database row id
-     * @param int $hydrationMode        Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD
-     * @return mixed                    Array or Doctrine_Record or false if no result
-     */
-    public function find($id, $hydrationMode = null)
-    {
-        if (is_null($id)) {
+     * @param mixed $name         Database Row ID or Query Name defined previously as a NamedQuery
+     * @param mixed $params       This argument is the hydration mode (Doctrine::HYDRATE_ARRAY or 
+     *                            Doctrine::HYDRATE_RECORD) if first param is a Database Row ID. 
+     *                            Otherwise this argument expect an array of query params.
+     * @param int $hydrationMode  Optional Doctrine::HYDRATE_ARRAY or Doctrine::HYDRATE_RECORD if 
+     *                            first argument is a NamedQuery
+     * @return mixed              Doctrine_Collection, array, Doctrine_Record or false if no result
+     */
+    public function find()
+    {
+        $num_args = func_num_args();
+
+        // Named Query or IDs
+        $name = func_get_arg(0);
+        
+        if (is_null($name)) { 
             return false;
         }
 
-        $id = is_array($id) ? array_values($id) : array($id);
-
-        $q = $this->createQuery('dctrn_find')
-            ->where(
-                'dctrn_find.' . implode(
-                    ' = ? AND dctrn_find.', (array) $this->getIdentifier()
-                ) . ' = ?', $id
-            )
-            ->limit(1);
-        $res = $q->fetchOne(array(), $hydrationMode);
+        // Define query to be used
+        if (
+            ! is_array($name) &&
+            Doctrine_Manager::getInstance()->getQueryRegistry()->has($name, $this->getComponentName())
+        ) {
+            // We're dealing with a named query
+            $q = $this->createNamedQuery($name);
+
+            // Parameters construction
+            $params = ($num_args >= 2) ? func_get_arg(1) : array();
+
+            // Hydration mode
+            $hydrationMode = ($num_args == 3) ? func_get_arg(2) : null;
+
+            // Executing query
+            $res = $q->execute($params, $hydrationMode);
+        } else {
+            // We're passing a single ID or an array of IDs
+            $q = $this->createQuery('dctrn_find')
+                ->where('dctrn_find.' . implode(' = ? AND dctrn_find.', (array) $this->getIdentifier()) . ' = ?')
+                ->limit(1);
+                
+            // Parameters construction
+            $params = is_array($name) ? array_values($name) : array($name);
+
+            // Hydration mode
+            $hydrationMode = ($num_args == 2) ? func_get_arg(1) : null;
+            
+            // Executing query
+            $res = $q->fetchOne($params, $hydrationMode);
+        }
+
         $q->free();
         

branches/1.0/tests/run.php

@@ -224 +224 @@
 $core->addTestCase(new Doctrine_Table_TestCase());
 $core->addTestCase(new Doctrine_Table_RemoveColumn_TestCase());
+$core->addTestCase(new Doctrine_Table_NamedQuery_TestCase());
 $core->addTestCase(new Doctrine_UnitOfWork_TestCase());
 $core->addTestCase(new Doctrine_Collection_TestCase());