Changeset 4971 for trunk/lib/Doctrine

Timestamp:

09/23/08 03:45:02 (4 months ago)

Author:

guilhermeblanco

Message:

[2.0] Moved Doctrine_Query to definite namespace Doctrine_ORM_Query.
Fixed paths that were referring wrong namespace resolution.
Implemented more Parser and AST classes: JoinVariableDeclaration? and Join.
Fixed wrong semantical checks of IndexBy? grammar rule. They should be in IdentificationVariableDeclaration? and JoinVariableDeclaration?.

Location:

trunk/lib/Doctrine

Files:

• ORM/EntityManager.php (modified) (1 diff)
• ORM/Internal/Hydration/AbstractHydrator.php (modified) (1 diff)
• ORM/Internal/Hydration/StandardHydrator.php (modified) (9 diffs)
• ORM/Query.php (added)
• Query (deleted)
• Query.php (deleted)

trunk/lib/Doctrine/ORM/EntityManager.php

@@ -244 +244 @@
     public function createQuery($dql = "")
     {
-        $query = new Doctrine_Query($this);
+        $query = new Doctrine_ORM_Query($this);
         if ( ! empty($dql)) {
             $query->setDql($dql);

trunk/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

@@ -55 +55 @@
      * The current hydration mode.
      */
-    protected $_hydrationMode = Doctrine_Query::HYDRATE_OBJECT;
+    protected $_hydrationMode = Doctrine_ORM_Query::HYDRATE_OBJECT;
     
     protected $_nullObject;

trunk/lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php

@@ -90 +90 @@
         $stmt = $parserResult->getDatabaseStatement();
         
-        if ($hydrationMode == Doctrine_Query::HYDRATE_NONE) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_NONE) {
             return $stmt->fetchAll(PDO::FETCH_NUM);
         }
@@ -97 +97 @@
         $this->_queryComponents = $parserResult->getQueryComponents();
 
-        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
             $driver = new Doctrine_ORM_Internal_Hydration_ArrayDriver();
         } else {
@@ -124 +124 @@
         
         // Holds the resulting hydrated data structure
-        if ($parserResult->isMixedQuery() || $hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+        if ($parserResult->isMixedQuery() || $hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
             $result = array();
         } else {
@@ -146 +146 @@
         $cache = array();
         // Evaluate HYDRATE_SINGLE_SCALAR
-        if ($hydrationMode == Doctrine_Query::HYDRATE_SINGLE_SCALAR) {
+        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR) {
             $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
             if (count($result) > 1 || count($result[0]) > 1) {
@@ -158 +158 @@
         while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
             // Evaluate HYDRATE_SCALAR
-            if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
+            if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
                 $result[] = $this->_gatherScalarRowData($data, $cache);
                 continue;      
@@ -247 +247 @@
                         }
                     } else if ( ! isset($baseElement[$relationAlias])) {
-                        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+                        if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
                             $baseElement[$relationAlias] = array();
                         } else {
@@ -267 +267 @@
                 }
                 
-                if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
+                if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
                     $coll =& $baseElement[$relationAlias];
                 } else {
@@ -360 +360 @@
                 
                 // Cache general information like the column name <-> field name mapping
-                $e = explode(Doctrine_Query_ParserRule::SQLALIAS_SEPARATOR, $key);
+                $e = explode(Doctrine_ORM_Query_ParserRule::SQLALIAS_SEPARATOR, $key);
                 $columnName = array_pop($e);                
                 $cache[$key]['dqlAlias'] = $this->_tableAliases[
-                        implode(Doctrine_Query_ParserRule::SQLALIAS_SEPARATOR, $e)
+                        implode(Doctrine_ORM_Query_ParserRule::SQLALIAS_SEPARATOR, $e)
                         ];
                 $classMetadata = $this->_queryComponents[$cache[$key]['dqlAlias']]['metadata'];
@@ -445 +445 @@
                 
                 // cache general information like the column name <-> field name mapping
-                $e = explode(Doctrine_Query_ParserRule::SQLALIAS_SEPARATOR, $key);
+                $e = explode(Doctrine_ORM_Query_ParserRule::SQLALIAS_SEPARATOR, $key);
                 $columnName = array_pop($e);              
                 $cache[$key]['dqlAlias'] = $this->_tableAliases[
-                        implode(Doctrine_Query_ParserRule::SQLALIAS_SEPARATOR, $e)
+                        implode(Doctrine_ORM_Query_ParserRule::SQLALIAS_SEPARATOR, $e)
                         ];
                 $classMetadata = $this->_queryComponents[$cache[$key]['dqlAlias']]['metadata'];