Changeset 4877 for trunk/lib/Doctrine

Timestamp:

09/07/08 14:48:40 (4 months ago)

Author:

romanb

Message:

cleanup

Location:

trunk/lib/Doctrine

Files:

• ClassMetadata.php (modified) (7 diffs)
• Collection.php (modified) (2 diffs)
• Connection.php (modified) (3 diffs)
• Connection/Firebird (deleted)
• Connection/Informix (deleted)
• Connection/Mock.php (deleted)
• Connection/Mssql (deleted)
• Connection/Mysql (deleted)
• Connection/Oracle (deleted)
• Connection/Pgsql (deleted)
• Connection/Sqlite (deleted)
• Connection/UnitOfWork.php (modified) (10 diffs)
• ConnectionFactory (deleted)
• ConnectionFactory.php (modified) (5 diffs)
• DatabasePlatform/FirebirdPlatform.php (modified) (1 diff)
• DatabasePlatform/OraclePlatform.php (modified) (1 diff)
• DataDict (deleted)
• Entity.php (modified) (1 diff)
• EntityManager.php (modified) (10 diffs)
• EntityManagerFactory.php (deleted)
• EntityPersister/Abstract.php (modified) (2 diffs)
• EventListener (deleted)
• Export/Exception.php (deleted)
• Export/Firebird.php (deleted)
• Export/Mssql.php (deleted)
• Export/Mysql.php (deleted)
• Export/Oracle.php (deleted)
• Export/Pgsql.php (deleted)
• Export/Sqlite.php (deleted)
• Expression (deleted)
• Hook (deleted)
• Id/AbstractIdGenerator.php (modified) (3 diffs)
• Id/Assigned.php (added)
• Id/IdentityGenerator.php (modified) (1 diff)
• Id/SequenceGenerator.php (modified) (1 diff)
• Id/SequenceIdentityGenerator.php (added)
• Id/TableGenerator.php (modified) (1 diff)
• Import/Firebird.php (deleted)
• Import/Informix.php (deleted)
• Import/Mssql.php (deleted)
• Import/Mysql.php (deleted)
• Import/Oracle.php (deleted)
• Import/Pgsql.php (deleted)
• Import/Sqlite.php (deleted)
• Manager (deleted)
• Query/Filter (deleted)
• Query/Tokenizer (deleted)
• RawSql (deleted)
• Record/Exception.php (deleted)
• Record/Filter (deleted)
• Record/Filter.php (deleted)
• Record/Iterator.php (deleted)
• Record/Listener (deleted)
• Record/Listener.php (deleted)
• Record/State (deleted)
• Relation (deleted)
• Sequence/Db2.php (modified) (1 diff)
• Sequence/Informix.php (modified) (1 diff)
• Sequence/Mssql.php (modified) (1 diff)
• Sequence/Mysql.php (modified) (1 diff)
• Sequence/Oracle.php (modified) (1 diff)
• Sequence/Pgsql.php (modified) (1 diff)
• Sequence/Sqlite.php (modified) (1 diff)
• View (deleted)

trunk/lib/Doctrine/ClassMetadata.php

@@ -170 +170 @@
     
     /**
+     * The Id generator.
+     *
+     * @var Doctrine::ORM::Id::IdGenerator
+     */
+    protected $_idGenerator;
+    
+    /**
      * The field mappings of the class.
      * Keys are field names and values are mapping definitions.
@@ -599 +606 @@
      */
     public function getAssociationMappings()
+    {
+        return $this->_associationMappings;
+    }
+    
+    /**
+     * Gets all association mappings of the class.
+     * Alias for getAssociationMappings().
+     *
+     * @return array
+     */
+    public function getAssociations()
     {
         return $this->_associationMappings;
@@ -687 +705 @@
         }
         $this->_fieldMappings[$mapping['fieldName']] = $mapping;
-    }
-    
-    /**
-     * Overrides an existant field mapping.
-     * Used i.e. by Entity classes deriving from another Entity class that acts
-     * as a mapped superclass to refine the basic mapping.
-     *
-     * @param array $newMapping
-     * @todo Implementation.
-     */
-    public function overrideFieldMapping(array $newMapping)
-    {
-        //...
     }
     
@@ -756 +761 @@
         
         return $mapping;
+    }
+    
+    /**
+     * @todo Implementation of Optimistic Locking.
+     */
+    public function mapVersionField(array $mapping)
+    {
+        //...
+    }
+    
+    /**
+     * Overrides an existant field mapping.
+     * Used i.e. by Entity classes deriving from another Entity class that acts
+     * as a mapped superclass to refine the basic mapping.
+     *
+     * @param array $newMapping
+     * @todo Implementation.
+     */
+    public function overrideFieldMapping(array $newMapping)
+    {
+        //...
+    }
+    
+    /**
+     * Used to lazily create the id generator.
+     *
+     * @param string $generatorType
+     * @return void
+     */
+    protected function _createIdGenerator()
+    {
+        if ($this->_generatorType == self::GENERATOR_TYPE_IDENTITY) {
+            $this->_idGenerator = new Doctrine_Id_IdentityGenerator($this->_em);
+        } else if ($this->_generatorType == self::GENERATOR_TYPE_SEQUENCE) {
+            $this->_idGenerator = new Doctrine_Id_SequenceGenerator($this->_em);
+        } else if ($this->_generatorType == self::GENERATOR_TYPE_TABLE) {
+            $this->_idGenerator = new Doctrine_Id_TableGenerator($this->_em);
+        } else {
+            $this->_idGenerator = new Doctrine_Id_Assigned($this->_em);
+        }
     }
     
@@ -1621 +1666 @@
          return $this->_customRepositoryClassName;
     }
+    
+    /**
+     * Gets the Id generator used by the class.
+     *
+     * @return Doctrine::ORM::Id::AbstractIdGenerator
+     */
+    public function getIdGenerator()
+    {
+        if (is_null($this->_idGenerator)) {
+            $this->_createIdGenerator();
+        }
+        return $this->_idGenerator;
+    }
 
     /**
@@ -1725 +1783 @@
     
     /**
-     * Completes the identifier mapping of the class.
+     * INTERNAL: Completes the identifier mapping of the class.
      * NOTE: Should only be called by the ClassMetadataFactory!
      * 
@@ -1732 +1790 @@
     public function completeIdentifierMapping()
     {
-        if ($this->getIdGeneratorType() == self::GENERATOR_TYPE_AUTO) {
+        if ($this->_generatorType == self::GENERATOR_TYPE_AUTO) {
             $platform = $this->_em->getConnection()->getDatabasePlatform();
+            if ($platform === null) {
+                try {
+                    throw new Exception();
+                } catch (Exception $e) {
+                    echo $e->getTraceAsString();
+                }
+            }
             if ($platform->prefersSequences()) {
                 $this->_generatorType = self::GENERATOR_TYPE_SEQUENCE;

trunk/lib/Doctrine/Collection.php

@@ -131 +131 @@
     {
         $this->_entityBaseType = $entityBaseType;
-        $this->_em = Doctrine_EntityManagerFactory::getManager($entityBaseType);
+        $this->_em = Doctrine_EntityManager::getActiveEntityManager();
 
         if ($keyField !== null) {
@@ -1019 +1019 @@
     public function unserialize($serialized)
     {
-        $manager = Doctrine_EntityManagerFactory::getManager();
+        $manager = Doctrine_EntityManager::getActiveEntityManager();
         $connection = $manager->getConnection();
         

trunk/lib/Doctrine/Connection.php

@@ -162 +162 @@
     
     /**
-     * The sequence manager.
-     *
-     * @var Doctrine::DBAL::Sequencing::SequenceManager
-     */
-    protected $_sequenceManager;
-    
-    /**
      * The schema manager.
      *
@@ -947 +940 @@
      * @param string $field     Name of the field into which a new row was inserted.
      */
-    public function lastInsertId($table = null, $field = null)
-    {
-        return $this->getSequenceManager()->lastInsertId($table, $field);
+    public function lastInsertId($seqName = null)
+    {
+        return $this->_pdo->lastInsertId($seqName);
     }
 
@@ -1179 +1172 @@
     
     /**
-     * Gets the SequenceManager that can be used to retrieve sequence values
-     * through this connection.
-     *
-     * @return Doctrine::DBAL::Sequencing::SequenceManager
-     */
-    public function getSequenceManager()
-    {
-        if ( ! $this->_sequenceManager) {
-            $class = "Doctrine_Sequence_" . $this->_driverName;
-            $this->_sequenceManager = new $class;
-        }
-        return $this->_sequenceManager;
-    }
-    
-    /**
      * Gets the SchemaManager that can be used to inspect or change the 
      * database schema through the connection.

trunk/lib/Doctrine/Connection/UnitOfWork.php

@@ -183 +183 @@
     }
 
+    /**
+     * Executes all entity insertions for entities of the specified type.
+     *
+     * @param Doctrine::ORM::Mapping::ClassMetadata $class
+     */
     private function _executeInserts($class)
     {
@@ -194 +199 @@
             if ($entity->getClass()->getClassName() == $className) {
                 $persister->insert($entity);
+                if ($class->isIdGeneratorIdentity()) {
+                    $entity->_assignIdentifier($class->getIdGenerator()->getPostInsertId());
+                }
             }
         }
     }
 
+    /**
+     * Executes all entity updates for entities of the specified type.
+     *
+     * @param Doctrine::ORM::Mapping::ClassMetadata $class
+     */
     private function _executeUpdates($class)
     {
@@ -209 +222 @@
     }
 
+    /**
+     * Executes all entity deletions for entities of the specified type.
+     *
+     * @param Doctrine::ORM::Mapping::ClassMetadata $class
+     */
     private function _executeDeletions($class)
     {
@@ -225 +243 @@
      * @return array
      */
-    private function _getCommitOrder()
+    private function _getCommitOrder(array $entityChangeSet = null)
     {
         //TODO: Once these 3 arrays are indexed by classname we can do this:
@@ -234 +252 @@
             array_keys($this->_deletedEntities)
         );*/
-
-        $entityChangeSet = array_merge($this->_newEntities, $this->_dirtyEntities, $this->_deletedEntities);
+        
+        if (is_null($entityChangeSet)) {
+            $entityChangeSet = array_merge($this->_newEntities, $this->_dirtyEntities, $this->_deletedEntities);
+        }
         
         /* if (count($entityChangeSet) == 1) {
@@ -384 +404 @@
             return; // entity has not been persisted yet, so nothing more to do.
         }
-        /* Seems unnecessary since _dirtyEntities is filled & cleared on commit, not earlier
-         if (isset($this->_dirtyEntities[$oid])) {
-         unset($this->_dirtyEntities[$oid]);
-         }*/
+
+        if (isset($this->_dirtyEntities[$oid])) {
+            unset($this->_dirtyEntities[$oid]);
+        }
         if ( ! isset($this->_deletedEntities[$oid])) {
             $this->_deletedEntities[$oid] = $entity;
@@ -431 +451 @@
         $oid = $entity->getOid();
         return isset($this->_newEntities[$oid]) ||
-                //isset($this->_dirtyEntities[$oid]) ||
+                isset($this->_dirtyEntities[$oid]) ||
                 isset($this->_deletedEntities[$oid]) ||
                 $this->isInIdentityMap($entity);
@@ -585 +605 @@
         $this->_doSave($entity, $visited, $insertNow);
         if ( ! empty($insertNow)) {
-            // We have no choice. This means that there are either new entities
-            // with an IDENTITY key generation or with a natural identifier.
-            // In both cases we must commit the inserts instantly.
-            //TODO: Isnt it enough to only execute the inserts instead of full flush?
-            $this->commit();
-            /* The following may be better:
+            // We have no choice. This means that there are new entities
+            // with an IDENTITY column key generation.
             $commitOrder = $this->_getCommitOrder($insertNow);
             foreach ($commitOrder as $class) {
                 $this->_executeInserts($class);
             }
-            //... remove them from _newEntities, or dont store them there in the first place
-            */
+            // remove them from _newEntities
+            $this->_newEntities = array_diff_key($this->_newEntities, $insertNow);
         }
     }
@@ -622 +638 @@
                 break;
             case Doctrine_Entity::STATE_NEW:
-                if ($class->isIdGeneratorIdentity()) {
+                $result = $class->getIdGenerator()->generate($entity);
+                if ($result == Doctrine_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
                     $insertNow[$entity->getOid()] = $entity;
-                    $this->_newEntities[$entity->getOid()] = $entity;
-                } else if ( ! $class->usesIdGenerator()) {
-                    $insertNow[$entity->getOid()] = $entity;
-                    $this->_newEntities[$entity->getOid()] = $entity;
-                    //...
-                } else if ($class->isIdGeneratorSequence()) {
-                    // Get the next sequence number
-                    //TODO: sequence name?
-                    $id = $this->_em->getConnection()->getSequenceManager()->nextId("foo");
-                    $entity->set($class->getSingleIdentifierFieldName(), $id);
-                    $this->registerNew($entity);
                 } else {
-                    throw new Doctrine_Exception("Unable to handle ID generation of new entity.");
+                    $entity->_assignIdentifier($result);
                 }
+                $this->registerNew($entity);
                 break;
             case Doctrine_Entity::STATE_DETACHED:
@@ -671 +678 @@
     }
 
+    /**
+     * Enter description here...
+     *
+     * @param Doctrine_Entity $entity
+     * @param array $visited
+     */
     private function _doDelete(Doctrine_Entity $entity, array &$visited)
     {

trunk/lib/Doctrine/ConnectionFactory.php

@@ -46 +46 @@
             'firebird' => 'Doctrine_Connection_Firebird',
             'informix' => 'Doctrine_Connection_Informix',
-            'mock'     => 'Doctrine_Connection_Mock');
-     
-     /**
-     * The EventManager that is injected into all created Connections.
-     *
-     * @var EventManager
-     */
-    private $_eventManager;
-    
-    /**
-     * The Configuration that is injected into all created Connections.
-     *
-     * @var Configuration
-     */
-    private $_config;
+            );
     
     public function __construct()
     {
         
-    }
-    
-    /**
-     * Sets the Configuration that is injected into all Connections.
-     *
-     * @param Doctrine_Configuration $config
-     */
-    public function setConfiguration(Doctrine_Configuration $config)
-    {
-        $this->_config = $config;
-    }
-    
-    /**
-     * Sets the EventManager that is injected into all Connections.
-     *
-     * @param Doctrine_EventManager $eventManager
-     */
-    public function setEventManager(Doctrine_EventManager $eventManager)
-    {
-        $this->_eventManager = $eventManager;
     }
     
@@ -93 +59 @@
      * @return Connection
      */
-    public function createConnection(array $params)
+    public function createConnection(array $params, Doctrine_Configuration $config = null,
+            Doctrine_EventManager $eventManager = null)
     {
         // create default config and event manager, if not set
-        if ( ! $this->_config) {
-            $this->_config = new Doctrine_Configuration();
+        if ( ! $config) {
+            $config = new Doctrine_Configuration();
         }
-        if ( ! $this->_eventManager) {
-            $this->_eventManager = new Doctrine_EventManager();
+        if ( ! $eventManager) {
+            $eventManager = new Doctrine_EventManager();
         }
         
@@ -111 +78 @@
             $this->_checkParams($params);
         }
-        $className = $this->_drivers[$params['driver']];
+        if (isset($params['driverClass'])) {
+            $className = $params['driverClass'];
+        } else {
+            $className = $this->_drivers[$params['driver']];
+        }
         
-        return new $className($params, $this->_config, $this->_eventManager);
+        return new $className($params, $config, $eventManager);
     }
     
@@ -126 +97 @@
         
         // driver
-        if ( ! isset($params['driver'])) {
+        if ( ! isset($params['driver']) && ! isset($params['driverClass'])) {
             throw Doctrine_ConnectionFactory_Exception::driverRequired();
         }
@@ -133 +104 @@
         
         // driver
-        if ( ! isset($this->_drivers[$params['driver']])) {
+        if ( isset($params['driver']) && ! isset($this->_drivers[$params['driver']])) {
             throw Doctrine_ConnectionFactory_Exception::unknownDriver($driverName);
         }

trunk/lib/Doctrine/DatabasePlatform/FirebirdPlatform.php

@@ -247 +247 @@
     }
     
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $sequenceName
+     * @override
+     */
+    public function getSequenceNextValSql($sequenceName)
+    {
+        return 'SELECT GEN_ID(' . $this->quoteIdentifier($sequenceName) . ', 1) FROM RDB$DATABASE';
+    }
+    
 }
 

trunk/lib/Doctrine/DatabasePlatform/OraclePlatform.php

@@ -332 +332 @@
                      'fixed'    => $fixed);
     }
+    
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $sequenceName
+     * @override
+     */
+    public function getSequenceNextValSql($sequenceName)
+    {
+        return 'SELECT ' . $this->quoteIdentifier($sequenceName) . '.nextval FROM DUAL';
+    }
 }
 

trunk/lib/Doctrine/Entity.php

@@ -205 +205 @@
     {
         $this->_entityName = get_class($this);
-        $this->_em = Doctrine_EntityManagerFactory::getManager($this->_entityName);
+        $this->_em = Doctrine_EntityManager::getActiveEntityManager();
         $this->_class = $this->_em->getClassMetadata($this->_entityName);
         $this->_oid = self::$_index++;

trunk/lib/Doctrine/EntityManager.php

@@ -63 +63 @@
     
     /**
+     * The currently active EntityManager. Only one EntityManager can be active
+     * at any time.
+     *
+     * @var Doctrine::ORM::EntityManager
+     */
+    private static $_activeEm;
+    
+    /**
      * The unique name of the EntityManager. The name is used to bind entity classes
      * to certain EntityManagers.
@@ -133 +141 @@
     private $_tmpEntityData = array();
     
+    private $_closed = false;
+    
     /**
      * Creates a new EntityManager that operates on the given database connection.
@@ -139 +149 @@
      * @param string $name
      */
-    public function __construct(Doctrine_Connection $conn, $name = null)
+    protected function __construct(Doctrine_Connection $conn, $name, Doctrine_Configuration $config,
+            Doctrine_EventManager $eventManager)
     {
         $this->_conn = $conn;
         $this->_name = $name;
+        $this->_config = $config;
+        $this->_eventManager = $eventManager;
         $this->_metadataFactory = new Doctrine_ClassMetadata_Factory(
                 $this, new Doctrine_ClassMetadata_CodeDriver());
@@ -157 +170 @@
     {
         return $this->_conn;
+    }
+    
+    /**
+     * Gets the name of the EntityManager.
+     *
+     * @return string The name of the EntityManager.
+     */
+    public function getName()
+    {
+        return $this->_name;
     }
     
@@ -303 +326 @@
     public function flush()
     {
+        $this