RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-171] Fixed.

Browse source
This commit is contained in:
romanb 2009-12-09 16:06:39 +00:00
parent 909e98c6f2
commit 3a39bea9f0
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/DBAL/Logging/DebugStack.php
View file

@ -29,7 +29,7 @@ class DebugStack implements SqlLogger
public function logSql($sql, array $params = null) public function logSql($sql, array $params = null)
{ {
if($this->enabled) { if ($this->enabled) {
$this->queries[] = array('sql' => $sql, 'params' => $params); $this->queries[] = array('sql' => $sql, 'params' => $params);
} }
} }

2
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View file

@ -305,7 +305,7 @@ abstract class AbstractHydrator
*/ */
private function _lookupDeclaringClass($class, $fieldName) private function _lookupDeclaringClass($class, $fieldName)
{ {
//FIXME: What if two subclasses declare a (mapped) field with the same name? // FIXME: What if two subclasses declare a (mapped) field with the same name?
// We probably need to encode the information to which subclass a field // We probably need to encode the information to which subclass a field
// belongs in the column alias / result set mapping. // belongs in the column alias / result set mapping.
// This would solve the issue and would probably make this lookup superfluous. // This would solve the issue and would probably make this lookup superfluous.

2
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View file

@ -354,6 +354,7 @@ class ObjectHydrator extends AbstractHydrator
} }
} else { } else {
$targetClass->reflFields[$inverseAssoc->sourceFieldName]->setValue($element, $parentObject); $targetClass->reflFields[$inverseAssoc->sourceFieldName]->setValue($element, $parentObject);
$this->_uow->setOriginalEntityProperty(spl_object_hash($element), $inverseAssoc->sourceFieldName, $parentObject);
} }
} else if ($parentClass === $targetClass && $relation->mappedByFieldName) { } else if ($parentClass === $targetClass && $relation->mappedByFieldName) {
// Special case: bi-directional self-referencing one-one on the same class // Special case: bi-directional self-referencing one-one on the same class
@ -362,6 +363,7 @@ class ObjectHydrator extends AbstractHydrator
} else { } else {
// For sure bidirectional, as there is no inverse side in unidirectional mappings // For sure bidirectional, as there is no inverse side in unidirectional mappings
$targetClass->reflFields[$relation->mappedByFieldName]->setValue($element, $parentObject); $targetClass->reflFields[$relation->mappedByFieldName]->setValue($element, $parentObject);
$this->_uow->setOriginalEntityProperty(spl_object_hash($element), $relation->mappedByFieldName, $parentObject);
} }
// Update result pointer // Update result pointer
$this->_resultPointers[$dqlAlias] = $element; $this->_resultPointers[$dqlAlias] = $element;