Changeset 4964 for trunk/lib/Doctrine

Timestamp:

09/13/08 13:40:17 (4 months ago)

Author:

romanb

Message:

more cleanups. introducing ClassLoader?.

Location:

trunk/lib/Doctrine

Files:

• Common/ClassLoader.php (added)
• DBAL/Types/Type.php (modified) (1 diff)
• Expression.php (deleted)
• Manager.php (deleted)
• ORM/Internal/Hydration/AbstractHydrator.php (modified) (1 diff)
• ORM/Internal/Hydration/StandardHydrator.php (modified) (5 diffs)
• Query.php (modified) (3 diffs)
• Query/ParserRule.php (modified) (1 diff)

trunk/lib/Doctrine/DBAL/Types/Type.php

@@ -30 +30 @@
     
     /**
-     * Factory method.
+     * Factory method to create type instances.
+     * Type instances are implemented as flyweights.
      *
      * @param string $name The name of the type (as returned by getName()).

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

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

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

@@ -90 +90 @@
         $stmt = $parserResult->getDatabaseStatement();
         
-        if ($hydrationMode == Doctrine::HYDRATE_NONE) {
+        if ($hydrationMode == Doctrine_Query::HYDRATE_NONE) {
             return $stmt->fetchAll(PDO::FETCH_NUM);
         }
@@ -97 +97 @@
         $this->_queryComponents = $parserResult->getQueryComponents();
 
-        if ($hydrationMode == Doctrine::HYDRATE_ARRAY) {
+        if ($hydrationMode == Doctrine_Query::HYDRATE_ARRAY) {
             $driver = new Doctrine_ORM_Internal_Hydration_ArrayDriver();
         } else {
@@ -124 +124 @@
         
         // Holds the resulting hydrated data structure
-        if ($parserResult->isMixedQuery() || $hydrationMode == Doctrine::HYDRATE_SCALAR) {
+        if ($parserResult->isMixedQuery() || $hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
             $result = array();
         } else {
@@ -146 +146 @@
         $cache = array();
         // Evaluate HYDRATE_SINGLE_SCALAR
-        if ($hydrationMode == Doctrine::HYDRATE_SINGLE_SCALAR) {
+        if ($hydrationMode == Doctrine_Query::HYDRATE_SINGLE_SCALAR) {
             $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
             if (count($result) > 1 || count($result[0]) > 1) {
@@ -155 +155 @@
         
         // Process result set
-        while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) {
+        while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
             // Evaluate HYDRATE_SCALAR
-            if ($hydrationMode == Doctrine::HYDRATE_SCALAR) {
+            if ($hydrationMode == Doctrine_Query::HYDRATE_SCALAR) {
                 $result[] = $this->_gatherScalarRowData($data, $cache);
                 continue;      

trunk/lib/Doctrine/Query.php

@@ -21 +21 @@
  */
 
+#namespace Doctrine::ORM;
+
 /**
  * A Doctrine_Query object represents a DQL query. It is used to query databases for
@@ -37 +39 @@
 class Doctrine_Query extends Doctrine_Query_Abstract
 {
+    /* Hydration mode constants */
+    /**
+     * Hydrates an object graph. This is the default behavior.
+     */
+    const HYDRATE_OBJECT = 1;
+    /**
+     * Hydrates an array graph.
+     */
+    const HYDRATE_ARRAY = 2;
+    /**
+     * Hydrates a flat, rectangular result set with scalar values.
+     */
+    const HYDRATE_SCALAR = 3;
+    /**
+     * Hydrates a single scalar value.
+     */
+    const HYDRATE_SINGLE_SCALAR = 4;
+    /**
+     * Hydrates nothing.
+     */
+    const HYDRATE_NONE = 5;
+    
     /**
      * @var Doctrine_EntityManager The entity manager used by this query object.
@@ -55 +79 @@
      * @var string $_sql Cached SQL query.
      */
-    protected $_sql = null;
+    protected $_sql;
 
 

trunk/lib/Doctrine/Query/ParserRule.php

@@ -152 +152 @@
 
         //echo $class . "\r\n";
-
+        //TODO: This expensive check is not necessary. Should be removed at the end.
+        //      "new $class" will throw an error anyway if the class is not found.
         if ( ! class_exists($class)) {
             throw new Doctrine_Query_Parser_Exception(