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

#1178 - correcting association column type when dealing with multiple derived associations/identifier levels

Browse Source 
Since the ClassMetadata can only know about internal state, any `joinColumn` association details on the
inverse side of an association need to be computed by fetching associated metadata.
This commit is contained in:
Marco Pivetta 2015-01-17 01:40:56 +01:00
parent 445798ed46
commit a80532a538
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -36,6 +36,7 @@ use Doctrine\ORM\Persisters\SqlValueVisitor;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use Doctrine\ORM\UnitOfWork; use Doctrine\ORM\UnitOfWork;
use Doctrine\ORM\Utility\IdentifierFlattener; use Doctrine\ORM\Utility\IdentifierFlattener;
use Doctrine\ORM\Utility\PersisterHelper;
/** /**
* A BasicEntityPersister maps an entity to a single table in a relational database. * A BasicEntityPersister maps an entity to a single table in a relational database.
@ -610,15 +611,16 @@ class BasicEntityPersister implements EntityPersister
*/ */
protected function prepareUpdateData($entity) protected function prepareUpdateData($entity)
{ {
$result = array(); $versionField = null;
$uow = $this->em->getUnitOfWork(); $result = array();
$uow = $this->em->getUnitOfWork();
if (($versioned = $this->class->isVersioned) != false) { if (($versioned = $this->class->isVersioned) != false) {
$versionField = $this->class->versionField; $versionField = $this->class->versionField;
} }
foreach ($uow->getEntityChangeSet($entity) as $field => $change) { foreach ($uow->getEntityChangeSet($entity) as $field => $change) {
if ($versioned && $versionField == $field) { if (isset($versionField) && $versionField == $field) {
continue; continue;
} }
@ -668,7 +670,7 @@ class BasicEntityPersister implements EntityPersister
$quotedColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform); $quotedColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform);
$this->quotedColumns[$sourceColumn] = $quotedColumn; $this->quotedColumns[$sourceColumn] = $quotedColumn;
$this->columnTypes[$sourceColumn] = $targetClass->getTypeOfColumn($targetColumn); $this->columnTypes[$sourceColumn] = PersisterHelper::getTypeOfColumn($targetColumn, $targetClass, $this->em);
$result[$owningTable][$sourceColumn] = $newValId $result[$owningTable][$sourceColumn] = $newValId
? $newValId[$targetClass->getFieldForColumn($targetColumn)] ? $newValId[$targetClass->getFieldForColumn($targetColumn)]
: null; : null;
@ -1426,7 +1428,7 @@ class BasicEntityPersister implements EntityPersister
} }
if ($this->class->generatorType != ClassMetadata::GENERATOR_TYPE_IDENTITY || $this->class->identifier[0] != $name) { if ($this->class->generatorType != ClassMetadata::GENERATOR_TYPE_IDENTITY || $this->class->identifier[0] != $name) {
$columns[] = $this->quoteStrategy->getColumnName($name, $this->class, $this->platform); $columns[] = $this->quoteStrategy->getColumnName($name, $this->class, $this->platform);
$this->columnTypes[$name] = $this->class->fieldMappings[$name]['type']; $this->columnTypes[$name] = $this->class->fieldMappings[$name]['type'];
} }
} }