RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

moved id generators

Browse Source
This commit is contained in:
romanb 2008-09-12 10:02:06 +00:00
parent 43e35d3bfd
commit d05522258a
10 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ClassMetadata.php
View File

@ -792,13 +792,13 @@ class Doctrine_ClassMetadata implements Doctrine_Configurable, Serializable
protected function _createIdGenerator()
{
if ($this->_generatorType == self::GENERATOR_TYPE_IDENTITY) {
$this->_idGenerator = new Doctrine_Id_IdentityGenerator($this->_em);
$this->_idGenerator = new Doctrine_ORM_Id_IdentityGenerator($this->_em);
} else if ($this->_generatorType == self::GENERATOR_TYPE_SEQUENCE) {
$this->_idGenerator = new Doctrine_Id_SequenceGenerator($this->_em);
$this->_idGenerator = new Doctrine_ORM_Id_SequenceGenerator($this->_em);
} else if ($this->_generatorType == self::GENERATOR_TYPE_TABLE) {
$this->_idGenerator = new Doctrine_Id_TableGenerator($this->_em);
$this->_idGenerator = new Doctrine_ORM_Id_TableGenerator($this->_em);
} else {
$this->_idGenerator = new Doctrine_Id_Assigned($this->_em);
$this->_idGenerator = new Doctrine_ORM_Id_Assigned($this->_em);
}
}

2
lib/Doctrine/Connection/UnitOfWork.php
View File

@ -638,7 +638,7 @@ class Doctrine_Connection_UnitOfWork
break;
case Doctrine_Entity::STATE_NEW:
$result = $class->getIdGenerator()->generate($entity);
if ($result == Doctrine_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
if ($result == Doctrine_ORM_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
$insertNow[$entity->getOid()] = $entity;
} else {
$entity->_assignIdentifier($result);

2
lib/Doctrine/Id/AbstractIdGenerator.php → lib/Doctrine/ORM/Id/AbstractIdGenerator.php
View File

@ -7,7 +7,7 @@
*
* @todo Rename to AbstractIdGenerator
*/
abstract class Doctrine_Id_AbstractIdGenerator
abstract class Doctrine_ORM_Id_AbstractIdGenerator
{
const POST_INSERT_INDICATOR = 'POST_INSERT_INDICATOR';

2
lib/Doctrine/Id/Assigned.php → lib/Doctrine/ORM/Id/Assigned.php
View File

@ -5,7 +5,7 @@
*
* @since 2.0
*/
class Doctrine_Id_Assigned extends Doctrine_Id_AbstractIdGenerator
class Doctrine_ORM_Id_Assigned extends Doctrine_ORM_Id_AbstractIdGenerator
{
/**
* Enter description here...

2
lib/Doctrine/Id/IdentityGenerator.php → lib/Doctrine/ORM/Id/IdentityGenerator.php
View File

@ -1,6 +1,6 @@
<?php
class Doctrine_Id_IdentityGenerator extends Doctrine_Id_AbstractIdGenerator
class Doctrine_ORM_Id_IdentityGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
{
/**
* Enter description here...

2
lib/Doctrine/Id/SequenceGenerator.php → lib/Doctrine/ORM/Id/SequenceGenerator.php
View File

@ -1,6 +1,6 @@
<?php
class Doctrine_Id_SequenceGenerator extends Doctrine_Id_AbstractIdGenerator
class Doctrine_ORM_Id_SequenceGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
{
private $_sequenceName;

2
lib/Doctrine/Id/SequenceIdentityGenerator.php → lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php
View File

@ -1,6 +1,6 @@
<?php
class Doctrine_Id_SequenceIdentityGenerator extends Doctrine_Id_IdentityGenerator
class Doctrine_ORM_Id_SequenceIdentityGenerator extends Doctrine_ORM_Id_IdentityGenerator
{
private $_sequenceName;

2
lib/Doctrine/Id/TableGenerator.php → lib/Doctrine/ORM/Id/TableGenerator.php
View File

@ -5,7 +5,7 @@
*
* @since 2.0
*/
class Doctrine_Id_TableGenerator extends Doctrine_Id_AbstractIdGenerator
class Doctrine_ORM_Id_TableGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
{
public function generate(Doctrine_Entity $entity)

2
tests/lib/mocks/Doctrine_ClassMetadataMock.php
View File

@ -6,7 +6,7 @@ class Doctrine_ClassMetadataMock extends Doctrine_ClassMetadata
/* Mock API */
public function setIdGenerator(Doctrine_Id_AbstractIdGenerator $g) {
public function setIdGenerator(Doctrine_ORM_Id_AbstractIdGenerator $g) {
$this->_idGenerator = $g;
}

2
tests/lib/mocks/Doctrine_SequenceMock.php
View File

@ -1,6 +1,6 @@
<?php
class Doctrine_SequenceMock extends Doctrine_Id_SequenceGenerator
class Doctrine_SequenceMock extends Doctrine_ORM_Id_SequenceGenerator
{
private $_sequenceNumber = 0;