RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-26 01:43:52 +03:00
Code Issues Projects Releases Wiki Activity

removing orphaned scalar results and allowing mixed results when use new object expressions

Browse Source
This commit is contained in:
James Murray 2014-10-28 17:59:37 -04:00
parent 85eac7200d
commit da7e4ed8de
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,8 +272,6 @@ abstract class AbstractHydrator
$rowData['newObjects'][$objIndex]['class'] = $cacheKeyInfo['class']; $rowData['newObjects'][$objIndex]['class'] = $cacheKeyInfo['class'];
$rowData['newObjects'][$objIndex]['args'][$argIndex] = $value; $rowData['newObjects'][$objIndex]['args'][$argIndex] = $value;
$rowData['scalars'][$fieldName] = $value;
break; break;
case (isset($cacheKeyInfo['isScalar'])): case (isset($cacheKeyInfo['isScalar'])):

5
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View File

@ -545,14 +545,15 @@ class ObjectHydrator extends AbstractHydrator
$resultKey = $this->resultCounter - 1; $resultKey = $this->resultCounter - 1;
} }
$count = count($rowData['newObjects']);
$scalarCount = count($rowData['scalars']);
foreach ($rowData['newObjects'] as $objIndex => $newObject) { foreach ($rowData['newObjects'] as $objIndex => $newObject) {
$class = $newObject['class']; $class = $newObject['class'];
$args = $newObject['args']; $args = $newObject['args'];
$obj = $class->newInstanceArgs($args); $obj = $class->newInstanceArgs($args);
if ($count === 1) { if (count($args) == $scalarCount) {
$result[$resultKey] = $obj; $result[$resultKey] = $obj;
continue; continue;