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

Made AbstractHydrator::gatherRowData() more understandable without breaking functionality.

Browse source
This commit is contained in:
Guilherme Blanco 2014-04-23 06:08:18 +00:00
parent 29de3e00ff
commit 9ebce31a46
1 changed files with 91 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,6 +167,18 @@ abstract class AbstractHydrator
return $result; return $result;
} }
/**
* When executed in a hydrate() loop we have to clear internal state to
* decrease memory consumption.
*
* @param mixed $eventArgs
*
* @return void
*/
public function onClear($eventArgs)
{
}
/** /**
* Executes one-time preparation tasks, once each time hydration is started * Executes one-time preparation tasks, once each time hydration is started
* through {@link hydrateAll} or {@link iterate()}. * through {@link hydrateAll} or {@link iterate()}.
@ -251,6 +263,19 @@ abstract class AbstractHydrator
$cache[$key]['isIdentifier'] = $classMetadata->isIdentifier($fieldName); $cache[$key]['isIdentifier'] = $classMetadata->isIdentifier($fieldName);
$cache[$key]['dqlAlias'] = $this->_rsm->columnOwnerMap[$key]; $cache[$key]['dqlAlias'] = $this->_rsm->columnOwnerMap[$key];
break; break;
case (isset($this->_rsm->newObjectMappings[$key])):
// WARNING: A NEW object is also a scalar, so it must be declared before!
$mapping = $this->_rsm->newObjectMappings[$key];
$cache[$key]['isScalar'] = true;
$cache[$key]['isNewObjectParameter'] = true;
$cache[$key]['fieldName'] = $this->_rsm->scalarMappings[$key];
$cache[$key]['type'] = Type::getType($this->_rsm->typeMappings[$key]);
$cache[$key]['argIndex'] = $mapping['argIndex'];
$cache[$key]['objIndex'] = $mapping['objIndex'];
$cache[$key]['class'] = new \ReflectionClass($mapping['className']);
break;
case (isset($this->_rsm->scalarMappings[$key])): case (isset($this->_rsm->scalarMappings[$key])):
$cache[$key]['fieldName'] = $this->_rsm->scalarMappings[$key]; $cache[$key]['fieldName'] = $this->_rsm->scalarMappings[$key];
@ -274,63 +299,69 @@ abstract class AbstractHydrator
// maybe from an additional column that has not been defined in a NativeQuery ResultSetMapping. // maybe from an additional column that has not been defined in a NativeQuery ResultSetMapping.
continue 2; continue 2;
} }
if (isset($this->_rsm->newObjectMappings[$key])) {
$mapping = $this->_rsm->newObjectMappings[$key];
$cache[$key]['isNewObjectParameter'] = true;
$cache[$key]['argIndex'] = $mapping['argIndex'];
$cache[$key]['objIndex'] = $mapping['objIndex'];
$cache[$key]['class'] = new \ReflectionClass($mapping['className']);
}
} }
switch (true) {
case (isset($cache[$key]['isNewObjectParameter'])):
$fieldName = $cache[$key]['fieldName'];
$argIndex = $cache[$key]['argIndex'];
$objIndex = $cache[$key]['objIndex'];
$type = $cache[$key]['type'];
$value = $type->convertToPHPValue($value, $this->_platform);
if (isset($cache[$key]['isNewObjectParameter'])) { $rowData['newObjects'][$objIndex]['class'] = $cache[$key]['class'];
$class = $cache[$key]['class']; $rowData['newObjects'][$objIndex]['args'][$argIndex] = $value;
$argIndex = $cache[$key]['argIndex'];
$objIndex = $cache[$key]['objIndex']; $rowData['scalars'][$fieldName] = $value;
$value = $cache[$key]['type']->convertToPHPValue($value, $this->_platform); break;
case (isset($cache[$key]['isScalar'])):
$value = $cache[$key]['type']->convertToPHPValue($value, $this->_platform);
$rowData['newObjects'][$objIndex]['class'] = $class; $rowData['scalars'][$cache[$key]['fieldName']] = $value;
$rowData['newObjects'][$objIndex]['args'][$argIndex] = $value; break;
}
case (isset($cache[$key]['isMetaColumn'])):
if (isset($cache[$key]['isScalar'])) { $dqlAlias = $cache[$key]['dqlAlias'];
$value = $cache[$key]['type']->convertToPHPValue($value, $this->_platform); $fieldName = $cache[$key]['fieldName'];
$rowData['scalars'][$cache[$key]['fieldName']] = $value; // Avoid double setting or null assignment
if (isset($rowData[$dqlAlias][$fieldName]) || $value === null) {
continue; break;
} }
$dqlAlias = $cache[$key]['dqlAlias'];
if ($cache[$key]['isIdentifier']) {
$id[$dqlAlias] .= '|' . $value;
}
if (isset($cache[$key]['isMetaColumn'])) {
if ( ! isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) && $value !== null) {
$rowData[$dqlAlias][$cache[$key]['fieldName']] = $value;
if ($cache[$key]['isIdentifier']) { if ($cache[$key]['isIdentifier']) {
$id[$dqlAlias] .= '|' . $value;
$nonemptyComponents[$dqlAlias] = true; $nonemptyComponents[$dqlAlias] = true;
} }
}
$rowData[$dqlAlias][$fieldName] = $value;
break;
default:
$dqlAlias = $cache[$key]['dqlAlias'];
$fieldName = $cache[$key]['fieldName'];
$type = $cache[$key]['type'];
// in an inheritance hierarchy the same field could be defined several times.
// We overwrite this value so long we don't have a non-null value, that value we keep.
// Per definition it cannot be that a field is defined several times and has several values.
if (isset($rowData[$dqlAlias][$fieldName]) && $value === null) {
break;
}
continue; if ($cache[$key]['isIdentifier']) {
} $id[$dqlAlias] .= '|' . $value;
}
// in an inheritance hierarchy the same field could be defined several times.
// We overwrite this value so long we don't have a non-null value, that value we keep. $value = $type->convertToPHPValue($value, $this->_platform);
// Per definition it cannot be that a field is defined several times and has several values.
if (isset($rowData[$dqlAlias][$cache[$key]['fieldName']]) && $value === null) { if ( ! isset($nonemptyComponents[$dqlAlias]) && $value !== null) {
continue; $nonemptyComponents[$dqlAlias] = true;
} }
$rowData[$dqlAlias][$cache[$key]['fieldName']] = $cache[$key]['type']->convertToPHPValue($value, $this->_platform); $rowData[$dqlAlias][$fieldName] = $value;
break;
if ( ! isset($nonemptyComponents[$dqlAlias]) && $value !== null) {
$nonemptyComponents[$dqlAlias] = true;
} }
} }
@ -423,33 +454,21 @@ abstract class AbstractHydrator
{ {
if ($class->isIdentifierComposite) { if ($class->isIdentifierComposite) {
$id = array(); $id = array();
foreach ($class->identifier as $fieldName) { foreach ($class->identifier as $fieldName) {
if (isset($class->associationMappings[$fieldName])) { $id[$fieldName] = isset($class->associationMappings[$fieldName])
$id[$fieldName] = $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]; ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
} else { : $data[$fieldName];
$id[$fieldName] = $data[$fieldName];
}
} }
} else { } else {
if (isset($class->associationMappings[$class->identifier[0]])) { $identifier = $class->identifier[0];
$id = array($class->identifier[0] => $data[$class->associationMappings[$class->identifier[0]]['joinColumns'][0]['name']]); $id = array(
} else { $identifier => isset($class->associationMappings[$identifier])
$id = array($class->identifier[0] => $data[$class->identifier[0]]); ? $data[$class->associationMappings[$identifier]['joinColumns'][0]['name']]
} : $data[$identifier]
);
} }
$this->_em->getUnitOfWork()->registerManaged($entity, $id, $data); $this->_em->getUnitOfWork()->registerManaged($entity, $id, $data);
} }
/**
* When executed in a hydrate() loop we have to clear internal state to
* decrease memory consumption.
*
* @param mixed $eventArgs
*
* @return void
*/
public function onClear($eventArgs)
{
}
} }