Changeset 4524 for trunk/lib/Doctrine

Timestamp:

06/16/08 19:31:21 (7 months ago)

Author:

romanb

Message:

Removed static EntityManager? lookup from productions. Entity refactorings.

Location:

trunk/lib/Doctrine

Files:

• Entity.php (modified) (6 diffs)
• EntityManager.php (modified) (2 diffs)
• EntityPersister/Abstract.php (modified) (3 diffs)
• Query/Parser.php (modified) (3 diffs)
• Query/Production.php (modified) (3 diffs)
• Query/Production/PathExpression.php (modified) (1 diff)
• Query/Production/PathExpressionEndingWithAsterisk.php (modified) (1 diff)
• Query/Production/RangeVariableDeclaration.php (modified) (2 diffs)
• Query/Production/SelectExpression.php (modified) (1 diff)
• Query/Production/VariableDeclaration.php (modified) (2 diffs)

trunk/lib/Doctrine/Entity.php

@@ -67 +67 @@
      * An Entity is in proxy state when its properties are not fully loaded.
      */
-    const STATE_PROXY = 4;
+    //const STATE_PROXY = 4;
 
     /**
@@ -964 +964 @@
         }
         
-        $class = $this->_class;
-        if ($class->hasField($fieldName)) {
-            if ($value instanceof Doctrine_Entity) {
+        if ($this->_class->hasField($fieldName)) {
+            /*if ($value instanceof Doctrine_Entity) {
                 $type = $class->getTypeOf($fieldName);
                 // FIXME: composite key support
@@ -974 +973 @@
                     $value = $id;
                 }
-            }
+            }*/
 
             $old = isset($this->_data[$fieldName]) ? $this->_data[$fieldName] : null;
 
-            if ($old !== $value) {
+            if ($old != $value) {
                 $this->_data[$fieldName] = $value;
                 $this->_modified[] = $fieldName;
                 
-                /* We can't do this currently because there are tests that change
-                 * the primary key of already persisted entities (ugh). */
-                if ($this->isTransient() && $class->isIdentifier($fieldName)) {
+                if ($this->isTransient() && $this->_class->isIdentifier($fieldName)) {
                     $this->_id[$fieldName] = $value;
                 }
@@ -997 +994 @@
                 }
             }
-        } else if ($class->hasRelation($fieldName)) {
+        } else if ($this->_class->hasRelation($fieldName)) {
             $this->_rawSetReference($fieldName, $value);
         } else {
@@ -1142 +1139 @@
                     break;
                 default:
-                    if ($this->_data[$field] instanceof Doctrine_Entity) {
+                    /*if ($this->_data[$field] instanceof Doctrine_Entity) {
                         // FIXME: composite key support
                         $ids = $this->_data[$field]->identifier();
                         $id = count($ids) > 0 ? array_pop($ids) : null;
                         $this->_data[$field] = $id;
-                    }
+                    }*/
                     /** TODO:
                     if ($this->_data[$v] === null) {
@@ -1160 +1157 @@
         // @todo cleanup
         // populates the discriminator field in Single & Class Table Inheritance
-        $class = $this->_class;
-        if ($class->getInheritanceType() == Doctrine::INHERITANCE_TYPE_JOINED ||
-                $class->getInheritanceType() == Doctrine::INHERITANCE_TYPE_SINGLE_TABLE) {
-            $discCol = $class->getInheritanceOption('discriminatorColumn');
-            $discMap = $class->getInheritanceOption('discriminatorMap');
+        if ($this->_class->getInheritanceType() == Doctrine::INHERITANCE_TYPE_JOINED ||
+                $this->_class->getInheritanceType() == Doctrine::INHERITANCE_TYPE_SINGLE_TABLE) {
+            $discCol = $this->_class->getInheritanceOption('discriminatorColumn');
+            $discMap = $this->_class->getInheritanceOption('discriminatorMap');
             $old = $this->get($discCol, false);
             $discValue = array_search($this->_entityName, $discMap);

trunk/lib/Doctrine/EntityManager.php

@@ -60 +60 @@
     private $_config;
     
-    
     /**
      * The database connection used by the EntityManager.
@@ -410 +409 @@
     public function save(Doctrine_Entity $entity)
     {
+        $state = $entity->_state();
+        if ($state == Doctrine_Entity::STATE_CLEAN || $state == Doctrine_Entity::STATE_LOCKED) {
+            return;
+        }
+        
         //...
+        //$this->_unitOfWork->
+        switch ($entity->_state()) {
+            case Doctrine_Entity::STATE_CLEAN:
+                //nothing to do
+                break;
+            case Doctrine_Entity::STATE_DIRTY:
+                $this->_unitOfWork->registerDirty($entity);
+                break;
+            case Doctrine_Entity::STATE_TCLEAN:
+            case Doctrine_Entity::STATE_TDIRTY:
+                //...
+        }
     }
     

trunk/lib/Doctrine/EntityPersister/Abstract.php

@@ -249 +249 @@
     
     /**
-     * Saves an entity and all it's related entities.
+     * Saves an entity.
      *
      * @param Doctrine_Entity $record    The entity to save.
      * @param Doctrine_Connection $conn  The connection to use. Will default to the mapper's
      *                                   connection.
-     * @throws Doctrine_Mapper_Exception If the mapper is unable to save the given entity.
-     */
-    public function save(Doctrine_Entity $record, Doctrine_Connection $conn = null)
+     */
+    public function save(Doctrine_Entity $record)
     {
         if ( ! ($record instanceof $this->_domainClassName)) {
@@ -283 +282 @@
                 $this->_insertOrUpdate($record);
             } else {
-                $conn->transaction->addInvalid($record);
+                $conn->getTransaction()->addInvalid($record);
             }
 
@@ -376 +375 @@
                 // Protection against infinite function recursion before attempting to save
                 if ($obj instanceof Doctrine_Entity && $obj->isModified()) {
-                    $obj->save($this->_conn);
+                    $obj->save();
                     
                     /** Can this be removed?

trunk/lib/Doctrine/Query/Parser.php

@@ -102 +102 @@
      */
     protected $_errorDistance;
+    
+    /**
+     * The EntityManager.
+     *
+     * @var EnityManager
+     */
+    protected $_em;
 
     // End of Error management stuff
@@ -114 +121 @@
     public function __construct(Doctrine_Query $query)
     {
+        $this->_em = $query->getEntityManager();
         $this->_scanner = new Doctrine_Query_Scanner($query->getDql());
-        $this->_sqlBuilder = Doctrine_Query_SqlBuilder::fromConnection($query->getEntityManager());
+        $this->_sqlBuilder = Doctrine_Query_SqlBuilder::fromConnection($this->_em);
         $this->_keywordTable = new Doctrine_Query_Token();
 
@@ -334 +342 @@
         $this->_errorDistance = 0;
     }
-
+    
+    /**
+     * Gets the EntityManager used by the parser.
+     *
+     * @return EntityManager
+     */
+    public function getEntityManager()
+    {
+        return $this->_em;
+    }
 }

trunk/lib/Doctrine/Query/Production.php

@@ -1 +1 @@
 <?php
-
 /*
  *  $Id$
@@ -54 +53 @@
      */
     protected $_parser;
+    
+    /**
+     * The EntityManager.
+     *
+     * @var EntityManager
+     */
+    protected $_em;
 
 
@@ -64 +70 @@
     {
         $this->_parser = $parser;
+        $this->_em = $this->_parser->getEntityManager();
     }
 

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

@@ -131 +131 @@
 
         // Retrieving connection
-        $manager = Doctrine_EntityManagerFactory::getManager(); 
-        $conn = $manager->getConnection();
+        $conn = $this->_em->getConnection();
 
         // Looking for queryComponent to fetch

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

@@ -120 +120 @@
 
         // Retrieving connection
-        $manager = Doctrine_EntityManagerFactory::getManager(); 
-        $conn = $manager->getConnection();
+        $conn = $this->_em->getConnection();
 
         // Looking for componentAlias to fetch

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

@@ -116 +116 @@
 
         // Get the connection for the component
-        $conn = $this->_parser->getSqlBuilder()->getConnection();
-        $manager = Doctrine_EntityManagerFactory::getManager();
+        $conn = $this->_em->getConnection();
         $componentName = $this->_identifiers[0];
 
         // Retrieving ClassMetadata and Mapper
         try {
-            $classMetadata = $manager->getClassMetadata($componentName);
+            $classMetadata = $this->_em->getClassMetadata($componentName);
 
             // Building queryComponent
@@ -156 +155 @@
 
         // Get the connection for the component
-        $conn = $this->_parser->getSqlBuilder()->getConnection();
-        $manager = Doctrine_EntityManagerFactory::getManager();
+        $conn = $this->_em->getConnection();
 
         // Retrieve the base component

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

@@ -137 +137 @@
 
         // Retrieving connection
-        $manager = Doctrine_EntityManagerFactory::getManager(); 
-        $conn = $manager->getConnection();
+        $conn = $this->_em->getConnection();
 
         switch (get_class($this->_leftExpression)) {

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

@@ -84 +84 @@
 
             // Get the connection for the component
-            $conn = $this->_parser->getSqlBuilder()->getConnection();
-            $manager = Doctrine_EntityManagerFactory::getManager();
+            $conn = $this->_em->getConnection();
 
             // Retrieving ClassMetadata and Mapper
             try {
-                $classMetadata = $manager->getMetadata($this->_componentName);
+                $classMetadata = $this->_em->getMetadata($this->_componentName);
 
                 // Building queryComponent
@@ -125 +124 @@
 
         // Retrieving connection
-        $manager = Doctrine_EntityManagerFactory::getManager();
-        $conn = $manager->getConnection();
+        $conn = $this->_em->getConnection();
 
         return $conn->quoteIdentifier($queryComponent['metadata']->getTableName()) . ' '