Changeset 4925 for trunk/lib/Doctrine

Show
Ignore:
Timestamp:
09/12/08 11:02:06 (4 months ago)
Author:
romanb
Message:

moved id generators

Location:
trunk/lib/Doctrine
Files:
6 added
1 removed
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/lib/Doctrine/ClassMetadata.php

    r4915 r4925  
    793793    { 
    794794        if ($this->_generatorType == self::GENERATOR_TYPE_IDENTITY) { 
    795             $this->_idGenerator = new Doctrine_Id_IdentityGenerator($this->_em); 
     795            $this->_idGenerator = new Doctrine_ORM_Id_IdentityGenerator($this->_em); 
    796796        } else if ($this->_generatorType == self::GENERATOR_TYPE_SEQUENCE) { 
    797             $this->_idGenerator = new Doctrine_Id_SequenceGenerator($this->_em); 
     797            $this->_idGenerator = new Doctrine_ORM_Id_SequenceGenerator($this->_em); 
    798798        } else if ($this->_generatorType == self::GENERATOR_TYPE_TABLE) { 
    799             $this->_idGenerator = new Doctrine_Id_TableGenerator($this->_em); 
     799            $this->_idGenerator = new Doctrine_ORM_Id_TableGenerator($this->_em); 
    800800        } else { 
    801             $this->_idGenerator = new Doctrine_Id_Assigned($this->_em); 
     801            $this->_idGenerator = new Doctrine_ORM_Id_Assigned($this->_em); 
    802802        } 
    803803    } 

  • trunk/lib/Doctrine/Connection/UnitOfWork.php

    r4910 r4925  
    639639            case Doctrine_Entity::STATE_NEW: 
    640640                $result = $class->getIdGenerator()->generate($entity); 
    641                 if ($result == Doctrine_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) { 
     641                if ($result == Doctrine_ORM_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) { 
    642642                    $insertNow[$entity->getOid()] = $entity; 
    643643                } else {