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

Added type conversion to meta column in case a type is specified (such as a foreign key or discriminator column).

Browse source
This commit is contained in:
Guilherme Blanco 2014-04-25 05:22:33 +00:00
parent 21437bb276
commit 35c8cd7f23
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,10 +197,11 @@ abstract class AbstractHydrator
*/ */
protected function cleanup() protected function cleanup()
{ {
$this->_rsm = null;
$this->_stmt->closeCursor(); $this->_stmt->closeCursor();
$this->_stmt = null;
$this->_stmt = null;
$this->_rsm = null;
$this->_cache = array();
} }
/** /**
@ -277,6 +278,7 @@ abstract class AbstractHydrator
case (isset($cacheKeyInfo['isMetaColumn'])): case (isset($cacheKeyInfo['isMetaColumn'])):
$dqlAlias = $cacheKeyInfo['dqlAlias']; $dqlAlias = $cacheKeyInfo['dqlAlias'];
$fieldName = $cacheKeyInfo['fieldName']; $fieldName = $cacheKeyInfo['fieldName'];
$type = $cacheKeyInfo['type'];
// Avoid double setting or null assignment // Avoid double setting or null assignment
if (isset($rowData['data'][$dqlAlias][$fieldName]) || $value === null) { if (isset($rowData['data'][$dqlAlias][$fieldName]) || $value === null) {
@ -288,6 +290,10 @@ abstract class AbstractHydrator
$nonemptyComponents[$dqlAlias] = true; $nonemptyComponents[$dqlAlias] = true;
} }
if ($type) {
$value = $type->convertToPHPValue($value, $this->_platform);
}
$rowData['data'][$dqlAlias][$fieldName] = $value; $rowData['data'][$dqlAlias][$fieldName] = $value;
break; break;
@ -359,6 +365,11 @@ abstract class AbstractHydrator
case (isset($cacheKeyInfo['isMetaColumn'])): case (isset($cacheKeyInfo['isMetaColumn'])):
$dqlAlias = $cacheKeyInfo['dqlAlias']; $dqlAlias = $cacheKeyInfo['dqlAlias'];
$type = $cacheKeyInfo['type'];
if ($type) {
$value = $type->convertToPHPValue($value, $this->_platform);
}
$rowData[$dqlAlias . '_' . $fieldName] = $value; $rowData[$dqlAlias . '_' . $fieldName] = $value;
break; break;