Changeset 4452 for trunk/lib/Doctrine

Timestamp:

05/27/08 05:52:50 (8 months ago)

Author:

guilhermeblanco

Message:

Changed Doctrine_Query to accept a Doctrine_EntityManager instead of a Doctrine_Connection. Updated Doctrine_EntityManager. Updated test cases and included one new passing test case for SELECT generation. Fixed whitespace bug in DELETE and UPDATE statements.

Location:

trunk/lib/Doctrine

Files:

• EntityManager.php (modified) (1 diff)
• Query.php (modified) (9 diffs)
• Query/Parser.php (modified) (1 diff)
• Query/ParserResult.php (modified) (1 diff)
• Query/Production/DeleteStatement.php (modified) (1 diff)
• Query/Production/UpdateStatement.php (modified) (1 diff)
• Query/Production/WhereClause.php (modified) (1 diff)
• Query/SqlBuilder.php (modified) (1 diff)

trunk/lib/Doctrine/EntityManager.php

@@ -247 +247 @@
         $query = new Doctrine_Query($this);
         if ( ! empty($dql)) {
-            $query->parseQuery($dql);
+            $query->setDql($dql);
         }
         

trunk/lib/Doctrine/Query.php

@@ -38 +38 @@
 {
     /**
-     * @var Doctrine_Connection The connection used by this query object.
-     */
-    protected $_connection;
+     * @var Doctrine_EntityManager The entity manager used by this query object.
+     */
+    protected $_entityManager;
 
     /**
@@ -94 +94 @@
 
 
-    public function __construct(Doctrine_Connection $conn = null, Doctrine_Hydrator_Abstract $hydrator = null)
-    {
-        $this->setConnection($conn);
-
-        if ($hydrator === null) {
-            $hydrator = new Doctrine_Hydrator(Doctrine_EntityManager::getManager());
-        }
-
-        $this->_hydrator = $hydrator;
+    public function __construct(Doctrine_EntityManager $entityManager)
+    {
+        $this->_entityManager = $entityManager;
+        $this->_hydrator = new Doctrine_Hydrator($entityManager);
 
         $this->free();
@@ -121 +116 @@
 
     /**
-     * Retrieves the assocated Doctrine_Connection to this Doctrine_Query
-     *
-     * @return Doctrine_Connection
-     */
-    public function getConnection()
-    {
-        return $this->_connection;
-    }
-
-
-    /**
-     * Defines an assocated Doctrine_Connection to this Doctrine_Query
-     *
-     * @param Doctrine_Connection $conn A valid Doctrine_Connection
-     * @return void
-     */
-    public function setConnection(Doctrine_Connection $conn = null)
-    {
-        if ($conn === null) {
-            $conn = Doctrine_EntityManager::getManager()->getConnection();
-        }
-
-        $this->_connection = $conn;
+     * Retrieves the assocated Doctrine_EntityManager to this Doctrine_Query
+     *
+     * @return Doctrine_EntityManager
+     */
+    public function getEntityManager()
+    {
+        return $this->_entityManager;
     }
 
@@ -231 +210 @@
     {
         if ($this->_state === self::STATE_DIRTY) {
-            $parser = new Doctrine_Query_Parser($this->getDql());
+            $parser = new Doctrine_Query_Parser($this);
             $this->_parserResult = $parser->parse();
             $this->_state = self::STATE_CLEAN;
@@ -314 +293 @@
     {
         // If there is a CacheDriver associated to cache queries...
-        if ($this->_queryCache || $this->_connection->getAttribute(Doctrine::ATTR_QUERY_CACHE)) {
+        if ($this->_queryCache || $this->_entityManager->getConnection()->getAttribute(Doctrine::ATTR_QUERY_CACHE)) {
             $queryCacheDriver = $this->getQueryCacheDriver();
 
@@ -348 +327 @@
         // We always have an instance of Doctrine_Query_ParserResult on hands...
         if ($this->_parserResult->isLimitSubqueryUsed() &&
-            $this->_connection->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') {
+            $this->_entityManager->getConnection()->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') {
             $params = array_merge($params, $params);
         }
@@ -363 +342 @@
     {
         // Convert boolean params
-        $params = $this->_connection->convertBooleans($params);
+        $params = $this->_entityManager->getConnection()->convertBooleans($params);
 
         // Convert enum params
@@ -400 +379 @@
             return $this->_resultCache;
         } else {
-            return $this->_connection->getResultCacheDriver();
+            return $this->_entityManager->getConnection()->getResultCacheDriver();
         }
     }
@@ -489 +468 @@
             return $this->_queryCache;
         } else {
-            return $this->_connection->getQueryCacheDriver();
+            return $this->_entityManager->getConnection()->getQueryCacheDriver();
         }
     }

trunk/lib/Doctrine/Query/Parser.php

@@ -112 +112 @@
      * @param Doctrine_Connection $connection The connection to use
      */
-    public function __construct($dql, Doctrine_Connection $connection = null)
-    {
-        $this->_scanner = new Doctrine_Query_Scanner($dql);
-        $this->_sqlBuilder = Doctrine_Query_SqlBuilder::fromConnection($connection);
+    public function __construct(Doctrine_Query $query)
+    {
+        $this->_scanner = new Doctrine_Query_Scanner($query->getDql());
+        $this->_sqlBuilder = Doctrine_Query_SqlBuilder::fromConnection($query->getEntityManager());
         $this->_keywordTable = new Doctrine_Query_Token();
 

trunk/lib/Doctrine/Query/ParserResult.php

@@ -75 +75 @@
      * @param array $queryFields Query fields.
      */
-    public function setQueryComponents(array $queryFields)
+    public function setQueryFields(array $queryFields)
     {
         $this->_queryFields = $queryFields;

trunk/lib/Doctrine/Query/Production/DeleteStatement.php

@@ -55 +55 @@
         // Simple "DELETE FROM table_name" gives 0 affected rows.
         return $this->_deleteClause->buildSql() . (($this->_whereClause !== null)
-             ? $this->_whereClause->buildSql() : ' WHERE 1 = 1');
+             ? ' ' . $this->_whereClause->buildSql() : ' WHERE 1 = 1');
     }
 }

trunk/lib/Doctrine/Query/Production/UpdateStatement.php

@@ -55 +55 @@
         // Simple "UPDATE table_name SET column_name = value" gives 0 affected rows.
         return $this->_updateClause->buildSql() . (($this->_whereClause !== null)
-             ? $this->_whereClause->buildSql() : ' WHERE 1 = 1');
+             ? ' ' . $this->_whereClause->buildSql() : ' WHERE 1 = 1');
     }
 }

trunk/lib/Doctrine/Query/Production/WhereClause.php

@@ -48 +48 @@
     public function buildSql()
     {
-        return ' WHERE ' . $this->_conditionalExpression->buildSql();
+        return 'WHERE ' . $this->_conditionalExpression->buildSql();
     }
 }

trunk/lib/Doctrine/Query/SqlBuilder.php

@@ -43 +43 @@
 
 
-    public static function fromConnection(Doctrine_Connection $connection = null)
+    public static function fromConnection(Doctrine_EntityManager $entityManager)
     {
-        if ($connection === null) {
-            $connection = Doctrine_EntityManager::getManager()->getConnection();
-        }
+        $connection = $entityManager->getConnection();
 
         $className = "Doctrine_Query_SqlBuilder_" . $connection->getDriverName();