Skip to content

D
doctrine-dbal
Commit dd1afc7e authored by romanb's avatar romanb
Browse files
Options

hydrator cleanup and 2 new methods for ClassMetadata

parent 4e62d4a9
Show whitespace changes
Inline Side-by-side
Showing with 177 additions and 1106 deletions
lib/Doctrine/DBAL/Platforms/MySqlPlatform.php
View file @ dd1afc7e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* <http://www.phpdoctrine.org>. * <http://www.phpdoctrine.org>.
*/ */
#namespace Doctrine::DBAL::Platforms; #namespace Doctrine\DBAL\Platforms;
/** /**
* The MySqlPlatform provides the behavior, features and SQL dialect of the * The MySqlPlatform provides the behavior, features and SQL dialect of the
......
lib/Doctrine/ORM/Collection.php
View file @ dd1afc7e
...@@ -104,6 +104,8 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti ...@@ -104,6 +104,8 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti
*/ */
private $_hydrationFlag; private $_hydrationFlag;
private $_ownerClass;
/** /**
* Creates a new persistent collection. * Creates a new persistent collection.
*/ */
...@@ -111,8 +113,9 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti ...@@ -111,8 +113,9 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti
{ {
$this->_entityBaseType = $entityBaseType; $this->_entityBaseType = $entityBaseType;
$this->_em = $em; $this->_em = $em;
$this->_ownerClass = $em->getClassMetadata($entityBaseType);
if ($keyField !== null) { if ($keyField !== null) {
if ( ! $this->_em->getClassMetadata($entityBaseType)->hasField($keyField)) { if ( ! $this->_ownerClass->hasField($keyField)) {
throw new Doctrine_Exception("Invalid field '$keyField' can't be uses as key."); throw new Doctrine_Exception("Invalid field '$keyField' can't be uses as key.");
} }
$this->_keyField = $keyField; $this->_keyField = $keyField;
...@@ -227,7 +230,7 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti ...@@ -227,7 +230,7 @@ final class Doctrine_ORM_Collection extends Doctrine_Common_Collections_Collecti
if ($this->_hydrationFlag) { if ($this->_hydrationFlag) {
if ($this->_backRefFieldName) { if ($this->_backRefFieldName) {
// set back reference to owner // set back reference to owner
$this->_em->getClassMetadata($this->_entityBaseType)->getReflectionProperty( $this->_ownerClass->getReflectionProperty(
$this->_backRefFieldName)->setValue($value, $this->_owner); $this->_backRefFieldName)->setValue($value, $this->_owner);
} }
} else { } else {
......
lib/Doctrine/ORM/Entity.php
View file @ dd1afc7e
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
* @link www.doctrine-project.org * @link www.doctrine-project.org
* @since 2.0 * @since 2.0
* @version $Revision: 4342 $ * @version $Revision: 4342 $
* @DEPRECATED
*/ */
interface Doctrine_ORM_Entity interface Doctrine_ORM_Entity
{} {}
lib/Doctrine/ORM/EntityManager.php
View file @ dd1afc7e
...@@ -594,9 +594,11 @@ class Doctrine_ORM_EntityManager ...@@ -594,9 +594,11 @@ class Doctrine_ORM_EntityManager
$this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this); $this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this);
break; break;
case Doctrine_ORM_Query::HYDRATE_SCALAR: case Doctrine_ORM_Query::HYDRATE_SCALAR:
case Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR:
$this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_ScalarHydrator($this); $this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_ScalarHydrator($this);
break; break;
case Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR:
$this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_SingleScalarHydrator($this);
break;
case Doctrine_ORM_Query::HYDRATE_NONE: case Doctrine_ORM_Query::HYDRATE_NONE:
$this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_NoneHydrator($this); $this->_hydrators[$hydrationMode] = new Doctrine_ORM_Internal_Hydration_NoneHydrator($this);
break; break;
......
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php
View file @ dd1afc7e
...@@ -38,11 +38,11 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator ...@@ -38,11 +38,11 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator
* *
* Two dimensional array containing the map for query aliases. Main keys are component aliases. * Two dimensional array containing the map for query aliases. Main keys are component aliases.
* *
* table Table object associated with given alias. * metadata ClassMetadata object associated with given alias.
* relation Relation object owned by the parent. * relation Relation object owned by the parent.
* parent Alias of the parent. * parent Alias of the parent.
* agg Aggregates of this component. * agg Aggregates of this component.
* map Name of the column / aggregate value this component is mapped to a collection. * map Name of the column / aggregate value this component is mapped to in a collection.
*/ */
protected $_queryComponents = array(); protected $_queryComponents = array();
...@@ -100,7 +100,7 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator ...@@ -100,7 +100,7 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator
{ {
$this->_stmt = $stmt; $this->_stmt = $stmt;
$this->_prepare($parserResult); $this->_prepare($parserResult);
$result = $this->_hydrateAll($parserResult); $result = $this->_hydrateAll();
$this->_cleanup(); $this->_cleanup();
return $result; return $result;
} }
...@@ -164,7 +164,7 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator ...@@ -164,7 +164,7 @@ abstract class Doctrine_ORM_Internal_Hydration_AbstractHydrator
* *
* @param object $parserResult * @param object $parserResult
*/ */
abstract protected function _hydrateAll($parserResult); abstract protected function _hydrateAll();
/** /**
* Gets the row container used during row-by-row hydration through {@link iterate()}. * Gets the row container used during row-by-row hydration through {@link iterate()}.
......
lib/Doctrine/ORM/Internal/Hydration/ArrayDriver.php
View file @ dd1afc7e
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
* @version $Revision$ * @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @DEPRECATED
*/ */
class Doctrine_ORM_Internal_Hydration_ArrayDriver class Doctrine_ORM_Internal_Hydration_ArrayDriver
{ {
......
lib/Doctrine/ORM/Internal/Hydration/ArrayHydrator.php
View file @ dd1afc7e
...@@ -39,7 +39,7 @@ class Doctrine_ORM_Internal_Hydration_ArrayHydrator extends Doctrine_ORM_Interna ...@@ -39,7 +39,7 @@ class Doctrine_ORM_Internal_Hydration_ArrayHydrator extends Doctrine_ORM_Interna
} }
/** @override */ /** @override */
protected function _hydrateAll($parserResult) protected function _hydrateAll()
{ {
$s = microtime(true); $s = microtime(true);
...@@ -61,7 +61,7 @@ class Doctrine_ORM_Internal_Hydration_ArrayHydrator extends Doctrine_ORM_Interna ...@@ -61,7 +61,7 @@ class Doctrine_ORM_Internal_Hydration_ArrayHydrator extends Doctrine_ORM_Interna
// 1) Initialize // 1) Initialize
$id = $this->_idTemplate; // initialize the id-memory $id = $this->_idTemplate; // initialize the id-memory
$nonemptyComponents = array(); $nonemptyComponents = array();
$rowData = parent::_gatherRowData($data, $cache, $id, $nonemptyComponents); $rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents);
$rootAlias = $this->_rootAlias; $rootAlias = $this->_rootAlias;
// 2) Hydrate the data of the root entity from the current row // 2) Hydrate the data of the root entity from the current row
......
lib/Doctrine/ORM/Internal/Hydration/ObjectDriver.php
View file @ dd1afc7e
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @internal All the methods in this class are performance-sentitive. * @internal All the methods in this class are performance-sentitive.
* @DEPRECATED
*/ */
class Doctrine_ORM_Internal_Hydration_ObjectDriver class Doctrine_ORM_Internal_Hydration_ObjectDriver
{ {
......
lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
View file @ dd1afc7e
<?php <?php
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
/** /**
* Description of ObjectHydrator * Description of ObjectHydrator
...@@ -11,7 +8,7 @@ ...@@ -11,7 +8,7 @@
*/ */
class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator
{ {
/** Collections initialized by the driver */ /** Collections initialized by the hydrator */
private $_collections = array(); private $_collections = array();
/** Memory for initialized relations */ /** Memory for initialized relations */
private $_initializedRelations = array(); private $_initializedRelations = array();
...@@ -42,8 +39,12 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -42,8 +39,12 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
} }
} }
/** @override */ /**
protected function _hydrateAll($parserResult) * {@inheritdoc}
*
* @override
*/
protected function _hydrateAll()
{ {
$s = microtime(true); $s = microtime(true);
...@@ -54,7 +55,6 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -54,7 +55,6 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
} }
$cache = array(); $cache = array();
// Process result set
while ($data = $this->_stmt->fetch(PDO::FETCH_ASSOC)) { while ($data = $this->_stmt->fetch(PDO::FETCH_ASSOC)) {
$this->_hydrateRow($data, $cache, $result); $this->_hydrateRow($data, $cache, $result);
} }
...@@ -111,7 +111,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -111,7 +111,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
} }
} }
private function getElementCollection($component) private function getCollection($component)
{ {
$coll = new Doctrine_ORM_Collection($this->_em, $component); $coll = new Doctrine_ORM_Collection($this->_em, $component);
$this->_collections[] = $coll; $this->_collections[] = $coll;
...@@ -125,7 +125,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -125,7 +125,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
if ( ! isset($this->_initializedRelations[$oid][$name])) { if ( ! isset($this->_initializedRelations[$oid][$name])) {
$relation = $classMetadata->getAssociationMapping($name); $relation = $classMetadata->getAssociationMapping($name);
$relatedClass = $this->_em->getClassMetadata($relation->getTargetEntityName()); $relatedClass = $this->_em->getClassMetadata($relation->getTargetEntityName());
$coll = $this->getElementCollection($relatedClass->getClassName()); $coll = $this->getCollection($relatedClass->getClassName());
$coll->_setOwner($entity, $relation); $coll->_setOwner($entity, $relation);
$coll->_setHydrationFlag(true); $coll->_setHydrationFlag(true);
$classMetadata->getReflectionProperty($name)->setValue($entity, $coll); $classMetadata->getReflectionProperty($name)->setValue($entity, $coll);
...@@ -142,7 +142,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -142,7 +142,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
private function getLastKey($coll) private function getLastKey($coll)
{ {
// check needed because of mixed results. // Check needed because of mixed results.
// is_object instead of is_array because is_array is slow on large arrays. // is_object instead of is_array because is_array is slow on large arrays.
if (is_object($coll)) { if (is_object($coll)) {
$coll->last(); $coll->last();
...@@ -153,9 +153,9 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -153,9 +153,9 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
} }
} }
private function getElement(array $data, $className) private function getEntity(array $data, $className)
{ {
$entity = $this->_em->getUnitOfWork()->createEntity($className, $data); $entity = $this->_uow->createEntity($className, $data);
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
$this->_metadataMap[$oid] = $this->_em->getClassMetadata($className); $this->_metadataMap[$oid] = $this->_em->getClassMetadata($className);
return $entity; return $entity;
...@@ -169,7 +169,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -169,7 +169,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
* @param <type> $entity2 * @param <type> $entity2
* @param <type> $indexField * @param <type> $indexField
*/ */
private function addRelatedIndexedElement($entity1, $property, $entity2, $indexField) private function addRelatedIndexedEntity($entity1, $property, $entity2, $indexField)
{ {
$classMetadata1 = $this->_metadataMap[spl_object_hash($entity1)]; $classMetadata1 = $this->_metadataMap[spl_object_hash($entity1)];
$classMetadata2 = $this->_metadataMap[spl_object_hash($entity2)]; $classMetadata2 = $this->_metadataMap[spl_object_hash($entity2)];
...@@ -184,15 +184,23 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -184,15 +184,23 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
* @param <type> $property * @param <type> $property
* @param <type> $entity2 * @param <type> $entity2
*/ */
private function addRelatedElement($entity1, $property, $entity2) private function addRelatedEntity($entity1, $property, $entity2)
{ {
$classMetadata1 = $this->_metadataMap[spl_object_hash($entity1)]; $classMetadata1 = $this->_metadataMap[spl_object_hash($entity1)];
$classMetadata1->getReflectionProperty($property)->getValue($entity1)->add($entity2); $classMetadata1->getReflectionProperty($property)->getValue($entity1)->add($entity2);
} }
/**
* Checks whether a field on an entity has a non-null value.
*
* @param object $entity
* @param string $field
* @return boolean
*/
private function isFieldSet($entity, $field) private function isFieldSet($entity, $field)
{ {
return $this->_metadataMap[spl_object_hash($entity)]->getReflectionProperty($field) return $this->_metadataMap[spl_object_hash($entity)]
->getReflectionProperty($field)
->getValue($entity) !== null; ->getValue($entity) !== null;
} }
...@@ -220,7 +228,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -220,7 +228,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
$targetClass->getReflectionProperty($sourceProp)->setValue($entity2, $entity1); $targetClass->getReflectionProperty($sourceProp)->setValue($entity2, $entity1);
} }
} else { } else {
// for sure bidirectional, as there is no inverse side in unidirectional // For sure bidirectional, as there is no inverse side in unidirectional
$mappedByProp = $relation->getMappedByFieldName(); $mappedByProp = $relation->getMappedByFieldName();
$targetClass->getReflectionProperty($mappedByProp)->setValue($entity2, $entity1); $targetClass->getReflectionProperty($mappedByProp)->setValue($entity2, $entity1);
} }
...@@ -228,11 +236,8 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -228,11 +236,8 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
} }
/** /**
* Hydrates a single row. * {@inheritdoc}
* *
* @param <type> $data The row data.
* @param <type> $cache The cache to use.
* @param <type> $result The result to append to.
* @override * @override
*/ */
protected function _hydrateRow(array &$data, array &$cache, &$result) protected function _hydrateRow(array &$data, array &$cache, &$result)
...@@ -240,7 +245,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -240,7 +245,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
// 1) Initialize // 1) Initialize
$id = $this->_idTemplate; // initialize the id-memory $id = $this->_idTemplate; // initialize the id-memory
$nonemptyComponents = array(); $nonemptyComponents = array();
$rowData = parent::_gatherRowData($data, $cache, $id, $nonemptyComponents); $rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents);
$rootAlias = $this->_rootAlias; $rootAlias = $this->_rootAlias;
// 2) Hydrate the data of the root entity from the current row // 2) Hydrate the data of the root entity from the current row
...@@ -318,11 +323,11 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -318,11 +323,11 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
$index = $indexExists ? $this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]] : false; $index = $indexExists ? $this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]] : false;
$indexIsValid = $index !== false ? $this->isIndexKeyInUse($baseElement, $relationAlias, $index) : false; $indexIsValid = $index !== false ? $this->isIndexKeyInUse($baseElement, $relationAlias, $index) : false;
if ( ! $indexExists || ! $indexIsValid) { if ( ! $indexExists || ! $indexIsValid) {
$element = $this->getElement($data, $entityName); $element = $this->getEntity($data, $entityName);
if ($field = $this->_getCustomIndexField($dqlAlias)) { if ($field = $this->_getCustomIndexField($dqlAlias)) {
$this->addRelatedIndexedElement($baseElement, $relationAlias, $element, $field); $this->addRelatedIndexedEntity($baseElement, $relationAlias, $element, $field);
} else { } else {
$this->addRelatedElement($baseElement, $relationAlias, $element); $this->addRelatedEntity($baseElement, $relationAlias, $element);
} }
$this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]] = $this->getLastKey( $this->_identifierMap[$path][$id[$parent]][$id[$dqlAlias]] = $this->getLastKey(
$this->_metadataMap[$oid] $this->_metadataMap[$oid]
...@@ -341,7 +346,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern ...@@ -341,7 +346,7 @@ class Doctrine_ORM_Internal_Hydration_ObjectHydrator extends Doctrine_ORM_Intern
$this->setRelatedElement($baseElement, $relationAlias, null); $this->setRelatedElement($baseElement, $relationAlias, null);
} else if ( ! $this->isFieldSet($baseElement, $relationAlias)) { } else if ( ! $this->isFieldSet($baseElement, $relationAlias)) {
$this->setRelatedElement($baseElement, $relationAlias, $this->setRelatedElement($baseElement, $relationAlias,
$this->getElement($data, $entityName)); $this->getEntity($data, $entityName));
} }
} }
......
lib/Doctrine/ORM/Internal/Hydration/ScalarHydrator.php
View file @ dd1afc7e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
class Doctrine_ORM_Internal_Hydration_ScalarHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator class Doctrine_ORM_Internal_Hydration_ScalarHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator
{ {
/** @override */ /** @override */
protected function _hydrateAll($parserResult) protected function _hydrateAll()
{ {
$result = array(); $result = array();
$cache = array(); $cache = array();
......
lib/Doctrine/ORM/Internal/Hydration/SingleScalarHydrator.php
View file @ dd1afc7e
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
class Doctrine_ORM_Internal_Hydration_SingleScalarHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator class Doctrine_ORM_Internal_Hydration_SingleScalarHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator
{ {
/** @override */ /** @override */
protected function _hydrateAll($parserResult) protected function _hydrateAll()
{ {
$cache = array(); $cache = array();
$result = $this->_stmt->fetchAll(PDO::FETCH_ASSOC); $result = $this->_stmt->fetchAll(PDO::FETCH_ASSOC);
......
lib/Doctrine/ORM/Internal/Hydration/StandardHydrator.php
View file @ dd1afc7e
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
* @version $Revision: 3192 $ * @version $Revision: 3192 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @author Roman Borschel <roman@code-factory.org> * @author Roman Borschel <roman@code-factory.org>
* @DEPRECATED
*/ */
class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator class Doctrine_ORM_Internal_Hydration_StandardHydrator extends Doctrine_ORM_Internal_Hydration_AbstractHydrator
{ {
......
lib/Doctrine/ORM/Internal/Null.php
View file @ dd1afc7e
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
* @version $Revision: 4723 $ * @version $Revision: 4723 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
* @todo No longer needed? * @todo No longer needed?
* @DEPRECATED
*/ */
// static initializer // static initializer
Doctrine_ORM_Internal_Null::$INSTANCE = new Doctrine_ORM_Internal_Null(); Doctrine_ORM_Internal_Null::$INSTANCE = new Doctrine_ORM_Internal_Null();
......
lib/Doctrine/ORM/Mapping/ClassMetadata.php
View file @ dd1afc7e
...@@ -1499,6 +1499,32 @@ class Doctrine_ORM_Mapping_ClassMetadata ...@@ -1499,6 +1499,32 @@ class Doctrine_ORM_Mapping_ClassMetadata
return isset($this->_associationMappings[$fieldName]); return isset($this->_associationMappings[$fieldName]);
} }
/**
* Checks whether the class has a mapped association for the specified field
* and if yes, checks whether it is a single-valued association (to-one).
*
* @param string $fieldName
* @return boolean TRUE if the association exists and is single-valued, FALSE otherwise.
*/
public function isSingleValuedAssociation($fieldName)
{
return isset($this->_associationMappings[$fieldName]) &&
$this->_associationMappings[$fieldName]->isOneToOne();
}
/**
* Checks whether the class has a mapped association for the specified field
* and if yes, checks whether it is a collection-valued association (to-many).
*
* @param string $fieldName
* @return boolean TRUE if the association exists and is collection-valued, FALSE otherwise.
*/
public function isCollectionValuedAssociation($fieldName)
{
return isset($this->_associationMappings[$fieldName]) &&
! $this->_associationMappings[$fieldName]->isOneToOne();
}
/** Creates a string representation of the instance. */ /** Creates a string representation of the instance. */
public function __toString() public function __toString()
{ {
......
lib/Doctrine/ORM/Query.php
View file @ dd1afc7e
...@@ -304,10 +304,10 @@ class Doctrine_ORM_Query extends Doctrine_ORM_Query_Abstract ...@@ -304,10 +304,10 @@ class Doctrine_ORM_Query extends Doctrine_ORM_Query_Abstract
// Double the params if we are using limit-subquery algorithm // Double the params if we are using limit-subquery algorithm
// We always have an instance of Doctrine_ORM_Query_ParserResult on hands... // We always have an instance of Doctrine_ORM_Query_ParserResult on hands...
if ($this->_parserResult->isLimitSubqueryUsed() && /*if ($this->_parserResult->isLimitSubqueryUsed() &&
$this->_entityManager->getConnection()->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') { $this->_entityManager->getConnection()->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') {
$params = array_merge($params, $params); $params = array_merge($params, $params);
} }*/
// Executing the query and returning statement // Executing the query and returning statement
return $executor->execute($this->_conn, $params); return $executor->execute($this->_conn, $params);
......
lib/Doctrine/ORM/UnitOfWork.php
View file @ dd1afc7e
...@@ -1113,7 +1113,6 @@ class Doctrine_ORM_UnitOfWork ...@@ -1113,7 +1113,6 @@ class Doctrine_ORM_UnitOfWork
* @param Doctrine\ORM\Entity $entity * @param Doctrine\ORM\Entity $entity
* @param array $data * @param array $data
* @param boolean $overrideLocalChanges * @param boolean $overrideLocalChanges
* @return void
*/ */
private function _mergeData($entity, array $data, $class, $overrideLocalChanges = false) { private function _mergeData($entity, array $data, $class, $overrideLocalChanges = false) {
if ($overrideLocalChanges) { if ($overrideLocalChanges) {
......
tests/Orm/Functional/BasicCRUDTest.php
View file @ dd1afc7e
...@@ -50,7 +50,7 @@ class Orm_Functional_BasicCRUDTest extends Doctrine_OrmFunctionalTestCase { ...@@ -50,7 +50,7 @@ class Orm_Functional_BasicCRUDTest extends Doctrine_OrmFunctionalTestCase {
} }
public function testMore() { public function testMore() {
echo PHP_EOL . "SECOND" . PHP_EOL; #echo PHP_EOL . "SECOND" . PHP_EOL;
/*$user = new CmsUser; /*$user = new CmsUser;
$user->name = 'jon'; $user->name = 'jon';
$user->*/ $user->*/
......
tests/Orm/Hydration/AllTests.php
View file @ dd1afc7e
...@@ -23,7 +23,6 @@ class Orm_Hydration_AllTests ...@@ -23,7 +23,6 @@ class Orm_Hydration_AllTests
{ {
$suite = new Doctrine_TestSuite('Doctrine Orm Hydration'); $suite = new Doctrine_TestSuite('Doctrine Orm Hydration');
//$suite->addTestSuite('Orm_Hydration_BasicHydrationTest');
$suite->addTestSuite('Orm_Hydration_ObjectHydratorTest'); $suite->addTestSuite('Orm_Hydration_ObjectHydratorTest');
$suite->addTestSuite('Orm_Hydration_ArrayHydratorTest'); $suite->addTestSuite('Orm_Hydration_ArrayHydratorTest');
$suite->addTestSuite('Orm_Hydration_ScalarHydratorTest'); $suite->addTestSuite('Orm_Hydration_ScalarHydratorTest');
......
tests/Orm/Hydration/ArrayHydratorTest.php
View file @ dd1afc7e
...@@ -46,7 +46,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -46,7 +46,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY)); $queryComponents, $tableAliasMap));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -115,7 +115,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -115,7 +115,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -185,7 +185,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -185,7 +185,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -257,7 +257,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -257,7 +257,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -377,7 +377,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -377,7 +377,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -525,7 +525,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -525,7 +525,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -647,7 +647,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -647,7 +647,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY)); $queryComponents, $tableAliasMap));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -692,7 +692,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest ...@@ -692,7 +692,7 @@ class Orm_Hydration_ArrayHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ArrayHydrator($this->_em);
$iterableResult = $hydrator->iterate($stmt, $this->_createParserResult( $iterableResult = $hydrator->iterate($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_ARRAY)); $queryComponents, $tableAliasMap));
$rowNum = 0; $rowNum = 0;
while (($row = $iterableResult->next()) !== false) { while (($row = $iterableResult->next()) !== false) {
......
tests/Orm/Hydration/BasicHydrationTest.php deleted 100644 → 0
View file @ 4e62d4a9
<?php
#namespace Doctrine\Tests\ORM\Hydration;
require_once 'lib/DoctrineTestInit.php';
require_once 'lib/mocks/Doctrine_HydratorMockStatement.php';
class Orm_Hydration_BasicHydrationTest extends Doctrine_OrmTestCase
{
private $_em;
protected function setUp()
{
parent::setUp();
$this->_em = $this->_getTestEntityManager();
}
/** Getter for the hydration mode dataProvider */
public static function hydrationModeProvider()
{
return array(
array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_OBJECT),
array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_ARRAY),
array('hydrationMode' => Doctrine_ORM_Query::HYDRATE_SCALAR)
);
}
/** Helper method */
private function _createParserResult($stmt, $queryComponents, $tableToClassAliasMap,
$hydrationMode, $isMixedQuery = false)
{
$parserResult = new Doctrine_ORM_Query_ParserResultDummy();
$parserResult->setDatabaseStatement($stmt);
$parserResult->setHydrationMode($hydrationMode);
$parserResult->setQueryComponents($queryComponents);
$parserResult->setTableToClassAliasMap($tableToClassAliasMap);
$parserResult->setMixedQuery($isMixedQuery);
return $parserResult;
}
/**
* Select u.id, u.name from CmsUser u
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationSimpleEntityQuery($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u'
);
// Faked result set
$resultSet = array(
array(
'u__id' => '1',
'u__name' => 'romanb'
),
array(
'u__id' => '2',
'u__name' => 'jwage'
)
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0] instanceof CmsUser);
$this->assertTrue($result[1] instanceof CmsUser);
$this->assertEquals(1, $result[0]->id);
$this->assertEquals('romanb', $result[0]->name);
$this->assertEquals(2, $result[1]->id);
$this->assertEquals('jwage', $result[1]->name);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
$this->assertTrue(is_array($result));
$this->assertEquals(1, $result[0]['id']);
$this->assertEquals('romanb', $result[0]['name']);
$this->assertEquals(2, $result[1]['id']);
$this->assertEquals('jwage', $result[1]['name']);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
$this->assertTrue(is_array($result));
$this->assertEquals(2, count($result));
$this->assertEquals('romanb', $result[0]['u_name']);
$this->assertEquals(1, $result[0]['u_id']);
$this->assertEquals('jwage', $result[1]['u_name']);
$this->assertEquals(2, $result[1]['u_id']);
}
}
/**
* select u.id, u.status, p.phonenumber, upper(u.name) nameUpper from User u
* join u.phonenumbers p
* =
* select u.id, u.status, p.phonenumber, upper(u.name) as u__0 from USERS u
* INNER JOIN PHONENUMBERS p ON u.id = p.user_id
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationMixedQueryFetchJoin($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null,
'agg' => array('0' => 'nameUpper')
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91'
)
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
//var_dump($result);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result[0][0] instanceof CmsUser);
$this->assertTrue($result[0][0]->phonenumbers instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->phonenumbers[0] instanceof CmsPhonenumber);
$this->assertTrue($result[0][0]->phonenumbers[1] instanceof CmsPhonenumber);
$this->assertTrue($result[1][0] instanceof CmsUser);
$this->assertTrue($result[1][0]->phonenumbers instanceof Doctrine_ORM_Collection);
// first user => 2 phonenumbers
$this->assertEquals(2, count($result[0][0]->phonenumbers));
$this->assertEquals('ROMANB', $result[0]['nameUpper']);
// second user => 1 phonenumber
$this->assertEquals(1, count($result[1][0]->phonenumbers));
$this->assertEquals('JWAGE', $result[1]['nameUpper']);
$this->assertEquals(42, $result[0][0]->phonenumbers[0]->phonenumber);
$this->assertEquals(43, $result[0][0]->phonenumbers[1]->phonenumber);
$this->assertEquals(91, $result[1][0]->phonenumbers[0]->phonenumber);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
// first user => 2 phonenumbers
$this->assertEquals(2, count($result[0][0]['phonenumbers']));
$this->assertEquals('ROMANB', $result[0]['nameUpper']);
// second user => 1 phonenumber
$this->assertEquals(1, count($result[1][0]['phonenumbers']));
$this->assertEquals('JWAGE', $result[1]['nameUpper']);
$this->assertEquals(42, $result[0][0]['phonenumbers'][0]['phonenumber']);
$this->assertEquals(43, $result[0][0]['phonenumbers'][1]['phonenumber']);
$this->assertEquals(91, $result[1][0]['phonenumbers'][0]['phonenumber']);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
$this->assertTrue(is_array($result));
$this->assertEquals(3, count($result));
$this->assertEquals(1, $result[0]['u_id']);
$this->assertEquals('developer', $result[0]['u_status']);
$this->assertEquals('ROMANB', $result[0]['u_nameUpper']);
$this->assertEquals(42, $result[0]['p_phonenumber']);
// ... more checks to come
}
}
/**
* select u.id, u.status, count(p.phonenumber) numPhones from User u
* join u.phonenumbers p group by u.status, u.id
* =
* select u.id, u.status, count(p.phonenumber) as p__0 from USERS u
* INNER JOIN PHONENUMBERS p ON u.id = p.user_id group by u.id, u.status
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationMixedQueryNormalJoin($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null,
'agg' => array('0' => 'numPhones')
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'p__0' => '2',
),
array(
'u__id' => '2',
'u__status' => 'developer',
'p__0' => '1',
)
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
//var_dump($result);
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
// first user => 2 phonenumbers
$this->assertEquals(2, $result[0]['numPhones']);
// second user => 1 phonenumber
$this->assertEquals(1, $result[1]['numPhones']);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result[0][0] instanceof CmsUser);
$this->assertTrue($result[1][0] instanceof CmsUser);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
$this->assertEquals(2, count($result));
$this->assertEquals(1, $result[0]['u_id']);
$this->assertEquals('developer', $result[0]['u_status']);
$this->assertEquals(2, $result[0]['p_numPhones']);
$this->assertEquals(2, $result[1]['u_id']);
$this->assertEquals('developer', $result[1]['u_status']);
$this->assertEquals(1, $result[1]['p_numPhones']);
}
}
/**
* select u.id, u.status, upper(u.name) nameUpper from User u index by u.id
* join u.phonenumbers p indexby p.phonenumber
* =
* select u.id, u.status, upper(u.name) as p__0 from USERS u
* INNER JOIN PHONENUMBERS p ON u.id = p.user_id
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationMixedQueryFetchJoinCustomIndex($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'agg' => array('0' => 'nameUpper'),
'map' => 'id'
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => 'phonenumber'
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91'
)
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
//var_dump($result);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
// test the scalar values
$this->assertEquals('ROMANB', $result[0]['nameUpper']);
$this->assertEquals('JWAGE', $result[1]['nameUpper']);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result[0]['1'] instanceof CmsUser);
$this->assertTrue($result[1]['2'] instanceof CmsUser);
$this->assertTrue($result[0]['1']->phonenumbers instanceof Doctrine_ORM_Collection);
// first user => 2 phonenumbers. notice the custom indexing by user id
$this->assertEquals(2, count($result[0]['1']->phonenumbers));
// second user => 1 phonenumber. notice the custom indexing by user id
$this->assertEquals(1, count($result[1]['2']->phonenumbers));
// test the custom indexing of the phonenumbers
$this->assertTrue(isset($result[0]['1']->phonenumbers['42']));
$this->assertTrue(isset($result[0]['1']->phonenumbers['43']));
$this->assertTrue(isset($result[1]['2']->phonenumbers['91']));
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
// first user => 2 phonenumbers. notice the custom indexing by user id
$this->assertEquals(2, count($result[0]['1']['phonenumbers']));
// second user => 1 phonenumber. notice the custom indexing by user id
$this->assertEquals(1, count($result[1]['2']['phonenumbers']));
// test the custom indexing of the phonenumbers
$this->assertTrue(isset($result[0]['1']['phonenumbers']['42']));
$this->assertTrue(isset($result[0]['1']['phonenumbers']['43']));
$this->assertTrue(isset($result[1]['2']['phonenumbers']['91']));
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
// NOTE: Indexing has no effect with HYDRATE_SCALAR
//... asserts to come
}
}
/**
* select u.id, u.status, p.phonenumber, upper(u.name) nameUpper, a.id, a.topic
* from User u
* join u.phonenumbers p
* join u.articles a
* =
* select u.id, u.status, p.phonenumber, upper(u.name) as u__0, a.id, a.topic
* from USERS u
* inner join PHONENUMBERS p ON u.id = p.user_id
* inner join ARTICLES a ON u.id = a.user_id
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationMixedQueryMultipleFetchJoin($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null,
'agg' => array('0' => 'nameUpper')
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null
),
'a' => array(
'metadata' => $this->_em->getClassMetadata('CmsArticle'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('articles'),
'map' => null
),
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p',
'a' => 'a'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
'a__id' => '1',
'a__topic' => 'Getting things done!'
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
'a__id' => '1',
'a__topic' => 'Getting things done!'
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
'a__id' => '2',
'a__topic' => 'ZendCon'
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
'a__id' => '2',
'a__topic' => 'ZendCon'
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91',
'a__id' => '3',
'a__topic' => 'LINQ'
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91',
'a__id' => '4',
'a__topic' => 'PHP6'
),
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
//var_dump($result);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result[0][0] instanceof CmsUser);
$this->assertTrue($result[0][0]->phonenumbers instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->phonenumbers[0] instanceof CmsPhonenumber);
$this->assertTrue($result[0][0]->phonenumbers[1] instanceof CmsPhonenumber);
$this->assertTrue($result[0][0]->articles instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->articles[0] instanceof CmsArticle);
$this->assertTrue($result[0][0]->articles[1] instanceof CmsArticle);
$this->assertTrue($result[1][0] instanceof CmsUser);
$this->assertTrue($result[1][0]->phonenumbers instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[1][0]->phonenumbers[0] instanceof CmsPhonenumber);
$this->assertTrue($result[1][0]->articles[0] instanceof CmsArticle);
$this->assertTrue($result[1][0]->articles[1] instanceof CmsArticle);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
// first user => 2 phonenumbers, 2 articles
$this->assertEquals(2, count($result[0][0]['phonenumbers']));
$this->assertEquals(2, count($result[0][0]['articles']));
$this->assertEquals('ROMANB', $result[0]['nameUpper']);
// second user => 1 phonenumber, 2 articles
$this->assertEquals(1, count($result[1][0]['phonenumbers']));
$this->assertEquals(2, count($result[1][0]['articles']));
$this->assertEquals('JWAGE', $result[1]['nameUpper']);
$this->assertEquals(42, $result[0][0]['phonenumbers'][0]['phonenumber']);
$this->assertEquals(43, $result[0][0]['phonenumbers'][1]['phonenumber']);
$this->assertEquals(91, $result[1][0]['phonenumbers'][0]['phonenumber']);
$this->assertEquals('Getting things done!', $result[0][0]['articles'][0]['topic']);
$this->assertEquals('ZendCon', $result[0][0]['articles'][1]['topic']);
$this->assertEquals('LINQ', $result[1][0]['articles'][0]['topic']);
$this->assertEquals('PHP6', $result[1][0]['articles'][1]['topic']);
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
//...
$this->assertEquals(6, count($result));
//var_dump($result);
}
}
/**
* select u.id, u.status, p.phonenumber, upper(u.name) nameUpper, a.id, a.topic,
* c.id, c.topic
* from User u
* join u.phonenumbers p
* join u.articles a
* left join a.comments c
* =
* select u.id, u.status, p.phonenumber, upper(u.name) as u__0, a.id, a.topic,
* c.id, c.topic
* from USERS u
* inner join PHONENUMBERS p ON u.id = p.user_id
* inner join ARTICLES a ON u.id = a.user_id
* left outer join COMMENTS c ON a.id = c.article_id
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationMixedQueryMultipleDeepMixedFetchJoin($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null,
'agg' => array('0' => 'nameUpper')
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null
),
'a' => array(
'metadata' => $this->_em->getClassMetadata('CmsArticle'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('articles'),
'map' => null
),
'c' => array(
'metadata' => $this->_em->getClassMetadata('CmsComment'),
'parent' => 'a',
'relation' => $this->_em->getClassMetadata('CmsArticle')->getAssociationMapping('comments'),
'map' => null
),
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p',
'a' => 'a',
'c' => 'c'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
'a__id' => '1',
'a__topic' => 'Getting things done!',
'c__id' => '1',
'c__topic' => 'First!'
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
'a__id' => '1',
'a__topic' => 'Getting things done!',
'c__id' => '1',
'c__topic' => 'First!'
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
'a__id' => '2',
'a__topic' => 'ZendCon',
'c__id' => null,
'c__topic' => null
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
'a__id' => '2',
'a__topic' => 'ZendCon',
'c__id' => null,
'c__topic' => null
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91',
'a__id' => '3',
'a__topic' => 'LINQ',
'c__id' => null,
'c__topic' => null
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91',
'a__id' => '4',
'a__topic' => 'PHP6',
'c__id' => null,
'c__topic' => null
),
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
//var_dump($result);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result[0][0] instanceof CmsUser);
$this->assertTrue($result[1][0] instanceof CmsUser);
// phonenumbers
$this->assertTrue($result[0][0]->phonenumbers instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->phonenumbers[0] instanceof CmsPhonenumber);
$this->assertTrue($result[0][0]->phonenumbers[1] instanceof CmsPhonenumber);
$this->assertTrue($result[1][0]->phonenumbers instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[1][0]->phonenumbers[0] instanceof CmsPhonenumber);
// articles
$this->assertTrue($result[0][0]->articles instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->articles[0] instanceof CmsArticle);
$this->assertTrue($result[0][0]->articles[1] instanceof CmsArticle);
$this->assertTrue($result[1][0]->articles[0] instanceof CmsArticle);
$this->assertTrue($result[1][0]->articles[1] instanceof CmsArticle);
// article comments
$this->assertTrue($result[0][0]->articles[0]->comments instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0][0]->articles[0]->comments[0] instanceof CmsComment);
// empty comment collections
$this->assertTrue($result[0][0]->articles[1]->comments instanceof Doctrine_ORM_Collection);
$this->assertEquals(0, count($result[0][0]->articles[1]->comments));
$this->assertTrue($result[1][0]->articles[0]->comments instanceof Doctrine_ORM_Collection);
$this->assertEquals(0, count($result[1][0]->articles[0]->comments));
$this->assertTrue($result[1][0]->articles[1]->comments instanceof Doctrine_ORM_Collection);
$this->assertEquals(0, count($result[1][0]->articles[1]->comments));
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
//...
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
// first user => 2 phonenumbers, 2 articles, 1 comment on first article
$this->assertEquals(2, count($result[0][0]['phonenumbers']));
$this->assertEquals(2, count($result[0][0]['articles']));
$this->assertEquals(1, count($result[0][0]['articles'][0]['comments']));
$this->assertEquals('ROMANB', $result[0]['nameUpper']);
// second user => 1 phonenumber, 2 articles, no comments
$this->assertEquals(1, count($result[1][0]['phonenumbers']));
$this->assertEquals(2, count($result[1][0]['articles']));
$this->assertEquals('JWAGE', $result[1]['nameUpper']);
$this->assertEquals(42, $result[0][0]['phonenumbers'][0]['phonenumber']);
$this->assertEquals(43, $result[0][0]['phonenumbers'][1]['phonenumber']);
$this->assertEquals(91, $result[1][0]['phonenumbers'][0]['phonenumber']);
$this->assertEquals('Getting things done!', $result[0][0]['articles'][0]['topic']);
$this->assertEquals('ZendCon', $result[0][0]['articles'][1]['topic']);
$this->assertEquals('LINQ', $result[1][0]['articles'][0]['topic']);
$this->assertEquals('PHP6', $result[1][0]['articles'][1]['topic']);
$this->assertEquals('First!', $result[0][0]['articles'][0]['comments'][0]['topic']);
$this->assertTrue(isset($result[0][0]['articles'][0]['comments']));
// empty comment collections
$this->assertTrue(is_array($result[0][0]['articles'][1]['comments']));
$this->assertEquals(0, count($result[0][0]['articles'][1]['comments']));
$this->assertTrue(is_array($result[1][0]['articles'][0]['comments']));
$this->assertEquals(0, count($result[1][0]['articles'][0]['comments']));
$this->assertTrue(is_array($result[1][0]['articles'][1]['comments']));
$this->assertEquals(0, count($result[1][0]['articles'][1]['comments']));
}
}
/**
* Tests that the hydrator does not rely on a particular order of the rows
* in the result set.
*
* DQL:
* select c.id, c.position, c.name, b.id, b.position
* from ForumCategory c inner join c.boards b
* order by c.position asc, b.position asc
*
* Checks whether the boards are correctly assigned to the categories.
*
* The 'evil' result set that confuses the object population is displayed below.
*
* c.id | c.position | c.name | boardPos | b.id | b.category_id (just for clarity)
* 1 | 0 | First | 0 | 1 | 1
* 2 | 0 | Second | 0 | 2 | 2 <--
* 1 | 0 | First | 1 | 3 | 1
* 1 | 0 | First | 2 | 4 | 1
*
* @dataProvider hydrationModeProvider
*/
public function testNewHydrationEntityQueryCustomResultSetOrder($hydrationMode)
{
// Faked query components
$queryComponents = array(
'c' => array(
'metadata' => $this->_em->getClassMetadata('ForumCategory'),
'parent' => null,
'relation' => null,
'map' => null
),
'b' => array(
'metadata' => $this->_em->getClassMetadata('ForumBoard'),
'parent' => 'c',
'relation' => $this->_em->getClassMetadata('ForumCategory')->getAssociationMapping('boards'),
'map' => null
),
);
// Faked table alias map
$tableAliasMap = array(
'c' => 'c',
'b' => 'b'
);
// Faked result set
$resultSet = array(
array(
'c__id' => '1',
'c__position' => '0',
'c__name' => 'First',
'b__id' => '1',
'b__position' => '0',
//'b__category_id' => '1'
),
array(
'c__id' => '2',
'c__position' => '0',
'c__name' => 'Second',
'b__id' => '2',
'b__position' => '0',
//'b__category_id' => '2'
),
array(
'c__id' => '1',
'c__position' => '0',
'c__name' => 'First',
'b__id' => '3',
'b__position' => '1',
//'b__category_id' => '1'
),
array(
'c__id' => '1',
'c__position' => '0',
'c__name' => 'First',
'b__id' => '4',
'b__position' => '2',
//'b__category_id' => '1'
)
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode));
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
//var_dump($result);
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY || $hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertEquals(2, count($result));
}
if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_ARRAY) {
$this->assertTrue(is_array($result));
$this->assertTrue(is_array($result[0]));
$this->assertTrue(is_array($result[1]));
$this->assertTrue(isset($result[0]['boards']));
$this->assertEquals(3, count($result[0]['boards']));
$this->assertTrue(isset($result[1]['boards']));
$this->assertEquals(1, count($result[1]['boards']));
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_OBJECT) {
$this->assertTrue($result instanceof Doctrine_ORM_Collection);
$this->assertTrue($result[0] instanceof ForumCategory);
$this->assertTrue($result[1] instanceof ForumCategory);
$this->assertEquals(1, $result[0]->getId());
$this->assertEquals(2, $result[1]->getId());
$this->assertTrue(isset($result[0]->boards));
$this->assertEquals(3, count($result[0]->boards));
$this->assertTrue(isset($result[1]->boards));
$this->assertEquals(1, count($result[1]->boards));
} else if ($hydrationMode == Doctrine_ORM_Query::HYDRATE_SCALAR) {
//...
}
}
/** Result set provider for the HYDRATE_SINGLE_SCALAR tests */
public static function singleScalarResultSetProvider() {
return array(
// valid
array('name' => 'result1',
'resultSet' => array(
array(
'u__name' => 'romanb'
)
)),
// valid
array('name' => 'result2',
'resultSet' => array(
array(
'u__id' => '1'
)
)),
// invalid
array('name' => 'result3',
'resultSet' => array(
array(
'u__id' => '1',
'u__name' => 'romanb'
)
)),
// invalid
array('name' => 'result4',
'resultSet' => array(
array(
'u__id' => '1'
),
array(
'u__id' => '2'
)
)),
);
}
/**
* select u.name from CmsUser u where u.id = 1
*
* @dataProvider singleScalarResultSetProvider
*/
public function testHydrateSingleScalar($name, $resultSet)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u'
);
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
if ($name == 'result1') {
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
$this->assertEquals('romanb', $result);
} else if ($name == 'result2') {
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
$this->assertEquals(1, $result);
} else if ($name == 'result3' || $name == 'result4') {
try {
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR));
$this->fail();
} catch (Doctrine_ORM_Exceptions_HydrationException $ex) {}
}
}
/**
* select u.id, u.status, p.phonenumber, upper(u.name) nameUpper from User u
* join u.phonenumbers p
* =
* select u.id, u.status, p.phonenumber, upper(u.name) as u__0 from USERS u
* INNER JOIN PHONENUMBERS p ON u.id = p.user_id
*
* @dataProvider hydrationModeProvider
*/
/*public function testNewHydrationMixedQueryFetchJoinPerformance($hydrationMode)
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null,
'agg' => array('0' => 'nameUpper')
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91'
)
);
for ($i=4; $i<5000; $i++) {
$resultSet[] = array(
'u__id' => $i,
'u__status' => 'developer',
'u__0' => 'JWAGE' . $i,
'p__phonenumber' => '91'
);
}
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_StandardHydrator($this->_em);
$result = $hydrator->hydrateResultSet($this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, $hydrationMode, true));
}*/
}
tests/Orm/Hydration/HydrationTest.php
View file @ dd1afc7e
...@@ -19,12 +19,9 @@ class Orm_Hydration_HydrationTest extends Doctrine_OrmTestCase ...@@ -19,12 +19,9 @@ class Orm_Hydration_HydrationTest extends Doctrine_OrmTestCase
} }
/** Helper method */ /** Helper method */
protected function _createParserResult($stmt, $queryComponents, $tableToClassAliasMap, protected function _createParserResult($queryComponents, $tableToClassAliasMap, $isMixedQuery = false)
$hydrationMode, $isMixedQuery = false)
{ {
$parserResult = new Doctrine_ORM_Query_ParserResultDummy(); $parserResult = new Doctrine_ORM_Query_ParserResultDummy();
$parserResult->setDatabaseStatement($stmt);
$parserResult->setHydrationMode($hydrationMode);
$parserResult->setQueryComponents($queryComponents); $parserResult->setQueryComponents($queryComponents);
$parserResult->setTableToClassAliasMap($tableToClassAliasMap); $parserResult->setTableToClassAliasMap($tableToClassAliasMap);
$parserResult->setMixedQuery($isMixedQuery); $parserResult->setMixedQuery($isMixedQuery);
......
tests/Orm/Hydration/ObjectHydratorTest.php
View file @ dd1afc7e
...@@ -46,7 +46,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -46,7 +46,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT)); $queryComponents, $tableAliasMap));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue($result instanceof Doctrine_ORM_Collection); $this->assertTrue($result instanceof Doctrine_ORM_Collection);
...@@ -117,7 +117,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -117,7 +117,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -194,7 +194,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -194,7 +194,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -268,7 +268,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -268,7 +268,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -392,7 +392,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -392,7 +392,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -536,7 +536,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -536,7 +536,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT, true)); $queryComponents, $tableAliasMap, true));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
...@@ -652,7 +652,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -652,7 +652,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT)); $queryComponents, $tableAliasMap));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
$this->assertTrue($result instanceof Doctrine_ORM_Collection); $this->assertTrue($result instanceof Doctrine_ORM_Collection);
...@@ -700,7 +700,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -700,7 +700,7 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$iterableResult = $hydrator->iterate($stmt, $this->_createParserResult( $iterableResult = $hydrator->iterate($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_OBJECT)); $queryComponents, $tableAliasMap));
$rowNum = 0; $rowNum = 0;
while (($row = $iterableResult->next()) !== false) { while (($row = $iterableResult->next()) !== false) {
...@@ -716,5 +716,78 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest ...@@ -716,5 +716,78 @@ class Orm_Hydration_ObjectHydratorTest extends Orm_Hydration_HydrationTest
++$rowNum; ++$rowNum;
} }
} }
/**
* select u.id, u.status, p.phonenumber, upper(u.name) nameUpper from User u
* join u.phonenumbers p
* =
* select u.id, u.status, p.phonenumber, upper(u.name) as u__0 from USERS u
* INNER JOIN PHONENUMBERS p ON u.id = p.user_id
*
* @dataProvider hydrationModeProvider
*/
/*public function testNewHydrationMixedQueryFetchJoinPerformance()
{
// Faked query components
$queryComponents = array(
'u' => array(
'metadata' => $this->_em->getClassMetadata('CmsUser'),
'parent' => null,
'relation' => null,
'map' => null,
'agg' => array('0' => 'nameUpper')
),
'p' => array(
'metadata' => $this->_em->getClassMetadata('CmsPhonenumber'),
'parent' => 'u',
'relation' => $this->_em->getClassMetadata('CmsUser')->getAssociationMapping('phonenumbers'),
'map' => null
)
);
// Faked table alias map
$tableAliasMap = array(
'u' => 'u',
'p' => 'p'
);
// Faked result set
$resultSet = array(
//row1
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '42',
),
array(
'u__id' => '1',
'u__status' => 'developer',
'u__0' => 'ROMANB',
'p__phonenumber' => '43',
),
array(
'u__id' => '2',
'u__status' => 'developer',
'u__0' => 'JWAGE',
'p__phonenumber' => '91'
)
);
for ($i=4; $i<300; $i++) {
$resultSet[] = array(
'u__id' => $i,
'u__status' => 'developer',
'u__0' => 'JWAGE' . $i,
'p__phonenumber' => '91'
);
}
$stmt = new Doctrine_HydratorMockStatement($resultSet);
$hydrator = new Doctrine_ORM_Internal_Hydration_ObjectHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$queryComponents, $tableAliasMap, true));
}*/
} }
tests/Orm/Hydration/ScalarHydratorTest.php
View file @ dd1afc7e
...@@ -46,7 +46,7 @@ class Orm_Hydration_ScalarHydratorTest extends Orm_Hydration_HydrationTest ...@@ -46,7 +46,7 @@ class Orm_Hydration_ScalarHydratorTest extends Orm_Hydration_HydrationTest
$hydrator = new Doctrine_ORM_Internal_Hydration_ScalarHydrator($this->_em); $hydrator = new Doctrine_ORM_Internal_Hydration_ScalarHydrator($this->_em);
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SCALAR)); $queryComponents, $tableAliasMap));
$this->assertTrue(is_array($result)); $this->assertTrue(is_array($result));
$this->assertEquals(2, count($result)); $this->assertEquals(2, count($result));
......
tests/Orm/Hydration/SingleScalarHydratorTest.php
View file @ dd1afc7e
...@@ -74,16 +74,16 @@ class Orm_Hydration_SingleScalarHydratorTest extends Orm_Hydration_HydrationTest ...@@ -74,16 +74,16 @@ class Orm_Hydration_SingleScalarHydratorTest extends Orm_Hydration_HydrationTest
if ($name == 'result1') { if ($name == 'result1') {
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR)); $queryComponents, $tableAliasMap));
$this->assertEquals('romanb', $result); $this->assertEquals('romanb', $result);
} else if ($name == 'result2') { } else if ($name == 'result2') {
$result = $hydrator->hydrateAll($stmt, $this->_createParserResult( $result = $hydrator->hydrateAll($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR)); $queryComponents, $tableAliasMap));
$this->assertEquals(1, $result); $this->assertEquals(1, $result);
} else if ($name == 'result3' || $name == 'result4') { } else if ($name == 'result3' || $name == 'result4') {
try { try {
$result = $hydrator->hydrateall($stmt, $this->_createParserResult( $result = $hydrator->hydrateall($stmt, $this->_createParserResult(
$stmt, $queryComponents, $tableAliasMap, Doctrine_ORM_Query::HYDRATE_SINGLE_SCALAR)); $queryComponents, $tableAliasMap));
$this->fail(); $this->fail();
} catch (Doctrine_ORM_Exceptions_HydrationException $ex) {} } catch (Doctrine_ORM_Exceptions_HydrationException $ex) {}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment