Doctrine

Timestamp:

07/12/08 19:11:44 (12 months ago)

Author:

guilhermeblanco

Message:

Added named query support, which already exists in 2.0. It is not a backport, only a custom implementation to minimize the discrepancies between 1.0 and 2.0. Documentation needed, but I already create a ticket to track for this change.

Location:

branches/1.0

Files:

• lib/Doctrine/Table.php (modified) (3 diffs)
• manual/docs/en/dql-doctrine-query-language.txt (modified) (1 diff)

branches/1.0/lib/Doctrine/Table.php

@@ -1217 +1217 @@
         return $record;
     }
+    
+    /**
+     * adds a named query in the query registry
+     *
+     * @param $queryKey  Query key name
+     * @param $query      DQL string or Doctrine_Query object
+     * @return void
+         */
+        public function addNamedQuery($queryKey, $query)
+    {
+        $registry = Doctrine_Manager::getInstance()->getQueryRegistry();
+        $registry->add($this->getComponentName() . '/' . $queryKey, $query);
+    }
+    
+    /**
+     * creates a named query in the query registry
+     *
+     * @param $queryKey  Query key name
+     * @return Doctrine_Query
+         */
+        public function createNamedQuery($queryKey)
+    {
+        return Doctrine_Manager::getInstance()->getQueryRegistry()
+                   ->get($queryKey, $this->getComponentName());
+    }
+
 
     /**
@@ -1305 +1331 @@
     public function execute($queryKey, $params = array(), $hydrationMode = Doctrine::HYDRATE_RECORD)
     {
-        return Doctrine_Manager::getInstance()
-                            ->getQueryRegistry()
-                            ->get($queryKey, $this->getComponentName())
-                            ->execute($params, $hydrationMode);
+        return $this->createNamedQuery($queryKey)->execute($params, $hydrationMode);
     }
 
@@ -1325 +1348 @@
     public function executeOne($queryKey, $params = array(), $hydrationMode = Doctrine::HYDRATE_RECORD)
     {
-        return Doctrine_Manager::getInstance()
-                            ->getQueryRegistry()
-                            ->get($queryKey, $this->getComponentName())
-                            ->fetchOne($params, $hydrationMode);
+        return $this->createNamedQuery($queryKey)->fetchOne($params, $hydrationMode);
     }
 

branches/1.0/manual/docs/en/dql-doctrine-query-language.txt

@@ -39 +39 @@
 $r->add('User/byName', 'FROM User u WHERE u.name = ?');
 
-$user = new User();
+$userTable = Doctrine::getTable('User');
 
 // find the user named Jack Daniels
-$user = $user->findOneByName('Jack Daniels');
+$user = $userTable->findOneByName('Jack Daniels');
 
 // find all users
-$users = $user->find('all');
+$users = $userTable->find('all');
 </code>