RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

More refactorings and small speed improvements on the default hydrator.

Browse Source
This commit is contained in:
romanb 2007-11-21 14:29:59 +00:00
parent 205c50ea39
commit 929273a0f1
10 changed files with 170 additions and 392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lib/Doctrine/Hydrate/Array.php
View File

@ -1,73 +0,0 @@
<?php
/*
* $Id$
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_Hydrate_Array
* defines an array fetching strategy for Doctrine_Hydrate
*
* @package Doctrine
* @subpackage Hydrate
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.com
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
class Doctrine_Hydrate_Array
{
public function getElementCollection($component)
{
return array();
}
public function getElement(array $data, $component)
{
return $data;
}
public function isIdentifiable(array $data, Doctrine_Table $table)
{
return ( ! empty($data));
}
public function registerCollection($coll)
{
}
public function initRelated(array &$data, $name)
{
if ( ! isset($data[$name])) {
$data[$name] = array();
}
return true;
}
public function getNullPointer()
{
return null;
}
public function getLastKey(&$data)
{
end($data);
return key($data);
}
public function flush()
{
}
}

132
lib/Doctrine/Hydrate/Record.php
View File

@ -1,132 +0,0 @@
<?php
/*
* $Id$
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* This software consists of voluntary contributions made by many individuals
* and is licensed under the LGPL. For more information, see
* <http://www.phpdoctrine.com>.
*/
/**
* Doctrine_Hydrate_Record
* defines a record fetching strategy for Doctrine_Hydrate
*
* @package Doctrine
* @subpackage Hydrate
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
* @link www.phpdoctrine.com
* @since 1.0
* @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/
class Doctrine_Hydrate_Record extends Doctrine_Locator_Injectable
{
protected $_collections = array();
protected $_records = array();
protected $_tables = array();
public function getElementCollection($component)
{
$coll = new Doctrine_Collection($component);
$this->_collections[] = $coll;
return $coll;
}
public function getLastKey($coll)
{
$coll->end();
return $coll->key();
}
public function initRelated($record, $name)
{
if ( ! is_array($record)) {
$record[$name];
return true;
}
return false;
}
public function registerCollection(Doctrine_Collection $coll)
{
$this->_collections[] = $coll;
}
/**
* isIdentifiable
* returns whether or not a given data row is identifiable (it contains
* all primary key fields specified in the second argument)
*
* @param array $row
* @param Doctrine_Table $table
* @return boolean
*/
public function isIdentifiable(array $row, Doctrine_Table $table)
{
$primaryKeys = $table->getIdentifierColumnNames();
if (is_array($primaryKeys)) {
foreach ($primaryKeys as $id) {
if ( ! isset($row[$id])) {
return false;
}
}
} else {
if ( ! isset($row[$primaryKeys])) {
return false;
}
}
return true;
}
public function getNullPointer()
{
return self::$_null;
}
public function getElement(array $data, $component)
{
if ( ! isset($this->_tables[$component])) {
$this->_tables[$component] = Doctrine_Manager::getInstance()->getTable($component);
$this->_tables[$component]->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
}
$this->_tables[$component]->setData($data);
$record = $this->_tables[$component]->getRecord();
if ( ! isset($this->_records[$record->getOid()]) ) {
$record->clearRelated();
$this->_records[$record->getOid()] = $record;
}
return $record;
}
public function flush()
{
// take snapshots from all initialized collections
foreach ($this->_collections as $key => $coll) {
$coll->takeSnapshot();
}
foreach ($this->_tables as $table) {
$table->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, true);
}
}
}

18
lib/Doctrine/Hydrator/Abstract.php
View File

@ -47,7 +47,7 @@ abstract class Doctrine_Hydrator_Abstract extends Doctrine_Locator_Injectable
* map the name of the column / aggregate value this * map the name of the column / aggregate value this
* component is mapped to a collection * component is mapped to a collection
*/ */
protected $_aliasMap = array(); protected $_queryComponents = array();
/** /**
* The current hydration mode. * The current hydration mode.
@ -59,10 +59,7 @@ abstract class Doctrine_Hydrator_Abstract extends Doctrine_Locator_Injectable
* *
* @param Doctrine_Connection|null $connection * @param Doctrine_Connection|null $connection
*/ */
public function __construct() public function __construct() {}
{
}
/** /**
* Sets the fetchmode. * Sets the fetchmode.
@ -81,10 +78,9 @@ abstract class Doctrine_Hydrator_Abstract extends Doctrine_Locator_Injectable
* @param array $map alias map * @param array $map alias map
* @return Doctrine_Hydrate this object * @return Doctrine_Hydrate this object
*/ */
public function setAliasMap(array $map) public function setQueryComponents(array $queryComponents)
{ {
$this->_aliasMap = $map; $this->_queryComponents = $queryComponents;
return $this;
} }
/** /**
@ -93,9 +89,9 @@ abstract class Doctrine_Hydrator_Abstract extends Doctrine_Locator_Injectable
* *
* @return array component alias map * @return array component alias map
*/ */
public function getAliasMap() public function getQueryComponents()
{ {
return $this->_aliasMap; return $this->_queryComponents;
} }
/** /**
@ -114,6 +110,6 @@ abstract class Doctrine_Hydrator_Abstract extends Doctrine_Locator_Injectable
* @param mixed $stmt * @param mixed $stmt
* @return array * @return array
*/ */
abstract public function hydrateResultSet($stmt, $aliasMap, $tableAliases, $hydrationMode = null); abstract public function hydrateResultSet($stmt, $tableAliases, $hydrationMode = null);
} }

181
lib/Doctrine/Hydrator/Default.php
View File

@ -38,7 +38,7 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
* hydrateResultSet * hydrateResultSet
* parses the data returned by statement object * parses the data returned by statement object
* *
* This is method defines the core of Doctrine object population algorithm * This is method defines the core of Doctrine's object population algorithm
* hence this method strives to be as fast as possible * hence this method strives to be as fast as possible
* *
* The key idea is the loop over the rowset only once doing all the needed operations * The key idea is the loop over the rowset only once doing all the needed operations
@ -49,7 +49,8 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
* @param mixed $stmt * @param mixed $stmt
* @param array $tableAliases Array that maps table aliases (SQL alias => DQL alias) * @param array $tableAliases Array that maps table aliases (SQL alias => DQL alias)
* @param array $aliasMap Array that maps DQL aliases to their components * @param array $aliasMap Array that maps DQL aliases to their components
* (DQL alias => array('table' => Table object, * (DQL alias => array(
* 'table' => Table object,
* 'parent' => Parent DQL alias (if any), * 'parent' => Parent DQL alias (if any),
* 'relation' => Relation object (if any), * 'relation' => Relation object (if any),
* 'map' => ??? (if any) * 'map' => ??? (if any)
@ -57,23 +58,11 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
* ) * )
* @return array * @return array
*/ */
public function hydrateResultSet($stmt, $aliasMap, $tableAliases, $hydrationMode = null) public function hydrateResultSet($stmt, $tableAliases, $hydrationMode = null)
{ {
//$s = microtime(true); //$s = microtime(true);
$this->_aliasMap = $aliasMap;
$this->_tableAliases = $tableAliases; $this->_tableAliases = $tableAliases;
/*echo "aliasmap:<br />";
foreach ($this->_aliasMap as $map) {
if ( ! empty($map['map'])) {
Doctrine::dump($map['map']);
}
}*/
//Doctrine::dump($this->_aliasMap);
//echo "<br />";
//echo "tableAliases:<br />";
//Doctrine::dump($tableAliases);
//echo "<br /><br />";
if ($hydrationMode == Doctrine::HYDRATE_NONE) { if ($hydrationMode == Doctrine::HYDRATE_NONE) {
return $stmt->fetchAll(PDO::FETCH_NUM); return $stmt->fetchAll(PDO::FETCH_NUM);
@ -84,56 +73,57 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
} }
if ($hydrationMode === Doctrine::HYDRATE_ARRAY) { if ($hydrationMode === Doctrine::HYDRATE_ARRAY) {
$driver = new Doctrine_Hydrator_Default_FetchModeDriver_Array(); $driver = new Doctrine_Hydrator_Default_ArrayDriver();
} else { } else {
$driver = new Doctrine_Hydrator_Default_FetchModeDriver_Record(); $driver = new Doctrine_Hydrator_Default_RecordDriver();
} }
$event = new Doctrine_Event(null, Doctrine_Event::HYDRATE, null); $event = new Doctrine_Event(null, Doctrine_Event::HYDRATE, null);
// Used variables during hydration // Used variables during hydration
$rootMap = reset($this->_aliasMap); reset($this->_queryComponents);
$rootAlias = key($this->_aliasMap); $rootAlias = key($this->_queryComponents);
$componentName = $rootMap['table']->getComponentName(); $rootComponentName = $this->_queryComponents[$rootAlias]['table']->getComponentName();
$isSimpleQuery = count($this->_aliasMap) <= 1; // if only one component is involved we can make our lives easier
$result = array(); // Holds the resulting hydrated data structure $isSimpleQuery = count($this->_queryComponents) <= 1;
$listeners = array(); // Holds hydration listeners that get called during hydration // Holds the resulting hydrated data structure
$identifierMap = array(); // Lookup map to quickly discover/lookup existing records in the result $result = array();
$prev = array(); // Holds for each component the last previously seen element in the result set // Holds hydration listeners that get called during hydration
$id = array(); // holds the values of the identifier/primary key columns of components, $listeners = array();
// Lookup map to quickly discover/lookup existing records in the result
$identifierMap = array();
// Holds for each component the last previously seen element in the result set
$prev = array();
// holds the values of the identifier/primary key fields of components,
// separated by a pipe '|' and grouped by component alias (r, u, i, ... whatever) // separated by a pipe '|' and grouped by component alias (r, u, i, ... whatever)
$id = array();
$result = $driver->getElementCollection($componentName); $result = $driver->getElementCollection($rootComponentName);
if ($stmt === false || $stmt === 0) { if ($stmt === false || $stmt === 0) {
return $result; return $result;
} }
// Initialize the variables // Initialize
foreach ($this->_aliasMap as $alias => $data) { foreach ($this->_queryComponents as $dqlAlias => $data) {
$componentName = $data['table']->getComponentName(); $componentName = $data['table']->getComponentName();
$listeners[$componentName] = $data['table']->getRecordListener(); $listeners[$componentName] = $data['table']->getRecordListener();
$identifierMap[$alias] = array(); $identifierMap[$dqlAlias] = array();
$prev[$alias] = array(); $prev[$dqlAlias] = array();
$id[$alias] = ''; $id[$dqlAlias] = '';
} }
// Process result set // Process result set
$cache = array(); $cache = array();
while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) { while ($data = $stmt->fetch(Doctrine::FETCH_ASSOC)) {
$identifiable = array(); $nonemptyComponents = array();
$rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents);
$rowData = $this->_gatherRowData($data, $cache, $id, $identifiable);
//echo "rowData of row:<br />";
//Doctrine::dump($rowData);
//echo "<br /><br />";
// //
// hydrate the data of the root component from the current row // hydrate the data of the root component from the current row
// //
$table = $this->_aliasMap[$rootAlias]['table']; $table = $this->_queryComponents[$rootAlias]['table'];
$componentName = $table->getComponentName(); $componentName = $table->getComponentName();
$event->set('data', $rowData[$rootAlias]); $event->set('data', $rowData[$rootAlias]);
$listeners[$componentName]->preHydrate($event); $listeners[$componentName]->preHydrate($event);
@ -148,9 +138,9 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
// do we need to index by a custom field? // do we need to index by a custom field?
if ($field = $this->_getCustomIndexField($rootAlias)) { if ($field = $this->_getCustomIndexField($rootAlias)) {
if (isset($result[$field])) { if (isset($result[$field])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping."); throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found non-unique key mapping.");
} else if ( ! isset($element[$field])) { } else if ( ! isset($element[$field])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key."); throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found a non-existent key.");
} }
$result[$element[$field]] = $element; $result[$element[$field]] = $element;
} else { } else {
@ -166,17 +156,16 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
unset($rowData[$rootAlias]); unset($rowData[$rootAlias]);
// end hydrate data of the root component for the current row // end hydrate data of the root component for the current row
//echo "\$result after root element hydration:<br />";
//Doctrine::dump($result);
//echo "<br /><br />";
// $prev[$rootAlias] now points to the last element in $result.
// now hydrate the rest of the data found in the current row, that belongs to other // now hydrate the rest of the data found in the current row, that belongs to other
// (related) components // (related) components.
$oneToOne = false; $oneToOne = false;
foreach ($rowData as $alias => $data) { foreach ($rowData as $dqlAlias => $data) {
$index = false; $index = false;
$map = $this->_aliasMap[$alias]; $map = $this->_queryComponents[$dqlAlias];
$table = $this->_aliasMap[$alias]['table']; $table = $map['table'];
$componentName = $table->getComponentName(); $componentName = $table->getComponentName();
$event->set('data', $data); $event->set('data', $data);
$listeners[$componentName]->preHydrate($event); $listeners[$componentName]->preHydrate($event);
@ -185,65 +174,61 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
$parent = $map['parent']; $parent = $map['parent'];
$relation = $map['relation']; $relation = $map['relation'];
$componentAlias = $map['relation']->getAlias(); $relationAlias = $map['relation']->getAlias();
$path = $parent . '.' . $alias; $path = $parent . '.' . $dqlAlias;
if ( ! isset($prev[$parent])) { if ( ! isset($prev[$parent])) {
break; break;
} }
// check the type of the relation // check the type of the relation
if ( ! $relation->isOneToOne() && $driver->initRelated($prev[$parent], $componentAlias)) { if ( ! $relation->isOneToOne() && $driver->initRelated($prev[$parent], $relationAlias)) {
// append element // append element
if (isset($identifiable[$alias])) { if (isset($nonemptyComponents[$dqlAlias])) {
if ($isSimpleQuery || ! isset($identifierMap[$path][$id[$parent]][$id[$alias]])) { if ($isSimpleQuery || ! isset($identifierMap[$path][$id[$parent]][$id[$dqlAlias]])) {
//$index = false;
$event->set('data', $element); $event->set('data', $element);
$listeners[$componentName]->postHydrate($event); $listeners[$componentName]->postHydrate($event);
if ($field = $this->_getCustomIndexField($alias)) { if ($field = $this->_getCustomIndexField($dqlAlias)) {
if (isset($prev[$parent][$componentAlias][$field])) { if (isset($prev[$parent][$relationAlias][$field])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping."); throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found non-unique key mapping.");
} else if ( ! isset($element[$field])) { } else if ( ! isset($element[$field])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key."); throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found a non-existent key.");
} }
$prev[$parent][$componentAlias][$element[$field]] = $element; $prev[$parent][$relationAlias][$element[$field]] = $element;
} else { } else {
$prev[$parent][$componentAlias][] = $element; $prev[$parent][$relationAlias][] = $element;
} }
$identifierMap[$path][$id[$parent]][$id[$alias]] = $driver->getLastKey($prev[$parent][$componentAlias]); $identifierMap[$path][$id[$parent]][$id[$dqlAlias]] = $driver->getLastKey($prev[$parent][$relationAlias]);
} else { } else {
$index = $identifierMap[$path][$id[$parent]][$id[$alias]]; $index = $identifierMap[$path][$id[$parent]][$id[$dqlAlias]];
} }
} }
// register collection for later snapshots // register collection for later snapshots
$driver->registerCollection($prev[$parent][$componentAlias]); $driver->registerCollection($prev[$parent][$relationAlias]);
} else { } else {
if ( ! isset($identifiable[$alias])) { // 1-1 relation
$prev[$parent][$componentAlias] = $driver->getNullPointer();
} else {
$prev[$parent][$componentAlias] = $element;
}
$oneToOne = true; $oneToOne = true;
if ( ! isset($nonemptyComponents[$dqlAlias])) {
$prev[$parent][$relationAlias] = $driver->getNullPointer();
} else {
$prev[$parent][$relationAlias] = $element;
} }
$coll =& $prev[$parent][$componentAlias];
$this->_setLastElement($prev, $coll, $index, $alias, $oneToOne);
$id[$alias] = '';
} }
//echo "\$result after related element hydration:<br />"; $coll =& $prev[$parent][$relationAlias];
//Doctrine::dump($result); $this->_setLastElement($prev, $coll, $index, $dqlAlias, $oneToOne);
//echo "<br /><br />"; $id[$dqlAlias] = '';
}
$id[$rootAlias] = ''; $id[$rootAlias] = '';
} }
$driver->flush();
$stmt->closeCursor(); $stmt->closeCursor();
//$e = microtime(true); $driver->flush();
//$e = microtime(true);
//echo 'Hydration took: ' . ($e - $s) . ' for '.count($result).' records<br />'; //echo 'Hydration took: ' . ($e - $s) . ' for '.count($result).' records<br />';
return $result; return $result;
@ -259,30 +244,30 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
* @return void * @return void
* @todo Detailed documentation * @todo Detailed documentation
*/ */
protected function _setLastElement(&$prev, &$coll, $index, $alias, $oneToOne) protected function _setLastElement(&$prev, &$coll, $index, $dqlAlias, $oneToOne)
{ {
if ($coll === self::$_null) { if ($coll === self::$_null) {
return false; return false;
} }
if ($index !== false) { if ($index !== false) {
// Set lement at $index as previous element for the component // Link element at $index to previous element for the component
// identified by the DQL alias $alias // identified by the DQL alias $alias
$prev[$alias] =& $coll[$index]; $prev[$dqlAlias] =& $coll[$index];
return; return;
} }
if (is_array($coll) && $coll) { if (is_array($coll) && $coll) {
if ($oneToOne) { if ($oneToOne) {
$prev[$alias] =& $coll; $prev[$dqlAlias] =& $coll;
} else { } else {
end($coll); end($coll);
$prev[$alias] =& $coll[key($coll)]; $prev[$dqlAlias] =& $coll[key($coll)];
} }
} else if (count($coll) > 0) { } else if (count($coll) > 0) {
$prev[$alias] = $coll->getLast(); $prev[$dqlAlias] = $coll->getLast();
} else if (isset($prev[$alias])) { } else if (isset($prev[$dqlAlias])) {
unset($prev[$alias]); unset($prev[$dqlAlias]);
} }
} }
@ -294,7 +279,7 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
* @return array An array with all the fields (name => value) of the data row, * @return array An array with all the fields (name => value) of the data row,
* grouped by their component (alias). * grouped by their component (alias).
*/ */
protected function _gatherRowData(&$data, &$cache, &$id, &$identifiable) protected function _gatherRowData(&$data, &$cache, &$id, &$nonemptyComponents)
{ {
$rowData = array(); $rowData = array();
@ -303,28 +288,28 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
if ( ! isset($cache[$key])) { if ( ! isset($cache[$key])) {
$e = explode('__', $key); $e = explode('__', $key);
$last = strtolower(array_pop($e)); $last = strtolower(array_pop($e));
$cache[$key]['alias'] = $this->_tableAliases[strtolower(implode('__', $e))]; $cache[$key]['dqlAlias'] = $this->_tableAliases[strtolower(implode('__', $e))];
$fieldName = $this->_aliasMap[$cache[$key]['alias']]['table']->getFieldName($last); $fieldName = $this->_queryComponents[$cache[$key]['dqlAlias']]['table']->getFieldName($last);
$cache[$key]['fieldName'] = $fieldName; $cache[$key]['fieldName'] = $fieldName;
} }
$map = $this->_aliasMap[$cache[$key]['alias']]; $map = $this->_queryComponents[$cache[$key]['dqlAlias']];
$table = $map['table']; $table = $map['table'];
$alias = $cache[$key]['alias']; $dqlAlias = $cache[$key]['dqlAlias'];
$fieldName = $cache[$key]['fieldName']; $fieldName = $cache[$key]['fieldName'];
if (isset($this->_aliasMap[$alias]['agg'][$fieldName])) { if (isset($this->_queryComponents[$dqlAlias]['agg'][$fieldName])) {
$fieldName = $this->_aliasMap[$alias]['agg'][$fieldName]; $fieldName = $this->_queryComponents[$dqlAlias]['agg'][$fieldName];
} }
if ($table->isIdentifier($fieldName)) { if ($table->isIdentifier($fieldName)) {
$id[$alias] .= '|' . $value; $id[$dqlAlias] .= '|' . $value;
} }
$rowData[$alias][$fieldName] = $table->prepareValue($fieldName, $value); $rowData[$dqlAlias][$fieldName] = $table->prepareValue($fieldName, $value);
if ($value !== null) { if ( ! isset($nonemptyComponents[$dqlAlias]) && $value !== null) {
$identifiable[$alias] = true; $nonemptyComponents[$dqlAlias] = true;
} }
} }
@ -339,7 +324,7 @@ class Doctrine_Hydrator_Default extends Doctrine_Hydrator_Abstract
*/ */
protected function _getCustomIndexField($alias) protected function _getCustomIndexField($alias)
{ {
return isset($this->_aliasMap[$alias]['map']) ? $this->_aliasMap[$alias]['map'] : null; return isset($this->_queryComponents[$alias]['map']) ? $this->_queryComponents[$alias]['map'] : null;
} }
} }

2
lib/Doctrine/Hydrator/Default/FetchModeDriver/Array.php → lib/Doctrine/Hydrator/Default/ArrayDriver.php
View File

@ -31,7 +31,7 @@
* @version $Revision$ * @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/ */
class Doctrine_Hydrator_Default_FetchModeDriver_Array class Doctrine_Hydrator_Default_ArrayDriver
{ {
public function getElementCollection($component) public function getElementCollection($component)
{ {

6
lib/Doctrine/Hydrator/Default/FetchModeDriver/Record.php → lib/Doctrine/Hydrator/Default/RecordDriver.php
View File

@ -31,7 +31,7 @@
* @version $Revision$ * @version $Revision$
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/ */
class Doctrine_Hydrator_Default_FetchModeDriver_Record extends Doctrine_Locator_Injectable class Doctrine_Hydrator_Default_RecordDriver extends Doctrine_Locator_Injectable
{ {
protected $_collections = array(); protected $_collections = array();
@ -56,12 +56,14 @@ class Doctrine_Hydrator_Default_FetchModeDriver_Record extends Doctrine_Locator_
public function initRelated($record, $name) public function initRelated($record, $name)
{ {
return true;
/*
if ( ! is_array($record)) { if ( ! is_array($record)) {
$record[$name]; $record[$name];
return true; return true;
} }
return false; return false;
*/
} }
public function registerCollection(Doctrine_Collection $coll) public function registerCollection(Doctrine_Collection $coll)

4
lib/Doctrine/Hydrate/Exception.php → lib/Doctrine/Hydrator/Exception.php
View File

@ -20,7 +20,7 @@
*/ */
Doctrine::autoload('Doctrine_Exception'); Doctrine::autoload('Doctrine_Exception');
/** /**
* Doctrine_Hydrate_Exception * Doctrine_Hydrator_Exception
* *
* @package Doctrine * @package Doctrine
* @subpackage Hydrate * @subpackage Hydrate
@ -30,5 +30,5 @@ Doctrine::autoload('Doctrine_Exception');
* @version $Revision: 1080 $ * @version $Revision: 1080 $
* @author Konsta Vesterinen <kvesteri@cc.hut.fi> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
*/ */
class Doctrine_Hydrate_Exception extends Doctrine_Exception class Doctrine_Hydrator_Exception extends Doctrine_Exception
{ } { }

31
lib/Doctrine/Query.php
View File

@ -208,31 +208,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$this->_params = $params; $this->_params = $params;
} }
/**
* getCachedForm
* returns the cached form of this query for given resultSet
*
* @param array $resultSet
* @return string serialized string representation of this query
*/
public function getCachedForm(array $resultSet)
{
$map = '';
foreach ($this->getAliasMap() as $k => $v) {
if ( ! isset($v['parent'])) {
$map[$k][] = $v['table']->getComponentName();
} else {
$map[$k][] = $v['parent'] . '.' . $v['relation']->getAlias();
}
if (isset($v['agg'])) {
$map[$k][] = $v['agg'];
}
}
return serialize(array($resultSet, $map, $this->getTableAliases()));
}
/** /**
* fetchArray * fetchArray
* Convenience method to execute using array fetching as hydration mode. * Convenience method to execute using array fetching as hydration mode.
@ -950,8 +925,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
} }
if (count($tableAliases) !== 1) { if (count($tableAliases) !== 1) {
$componentAlias = reset($this->tableAliases); $componentAlias = reset($this->_tableAliases);
$tableAlias = key($this->tableAliases); $tableAlias = key($this->_tableAliases);
} }
$index = count($this->aggregateMap); $index = count($this->aggregateMap);
@ -1752,7 +1727,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$queryPart .= ' ' . $this->_conn->quoteIdentifier($tableAlias); $queryPart .= ' ' . $this->_conn->quoteIdentifier($tableAlias);
} }
$this->tableAliases[$tableAlias] = $componentAlias; $this->_tableAliases[$tableAlias] = $componentAlias;
$queryPart .= $this->buildInheritanceJoinSql($name, $componentAlias); $queryPart .= $this->buildInheritanceJoinSql($name, $componentAlias);

33
lib/Doctrine/Query/Abstract.php
View File

@ -752,8 +752,9 @@ abstract class Doctrine_Query_Abstract
if ($cached === false) { if ($cached === false) {
// cache miss // cache miss
$stmt = $this->_execute($params); $stmt = $this->_execute($params);
$array = $this->_hydrator->hydrateResultSet($stmt, $this->_aliasMap, $this->_hydrator->setQueryComponents($this->_aliasMap);
$this->_tableAliases, Doctrine::HYDRATE_ARRAY); $array = $this->_hydrator->hydrateResultSet($stmt, $this->_tableAliases,
Doctrine::HYDRATE_ARRAY);
$cached = $this->getCachedForm($array); $cached = $this->getCachedForm($array);
@ -786,12 +787,36 @@ abstract class Doctrine_Query_Abstract
return $stmt; return $stmt;
} }
$array = $this->_hydrator->hydrateResultSet($stmt, $this->_aliasMap, $this->_hydrator->setQueryComponents($this->_aliasMap);
$this->_tableAliases, $hydrationMode); $array = $this->_hydrator->hydrateResultSet($stmt, $this->_tableAliases, $hydrationMode);
} }
return $array; return $array;
} }
/**
* getCachedForm
* returns the cached form of this query for given resultSet
*
* @param array $resultSet
* @return string serialized string representation of this query
*/
public function getCachedForm(array $resultSet)
{
$map = array();
foreach ($this->getAliasMap() as $k => $v) {
if ( ! isset($v['parent'])) {
$map[$k][] = $v['table']->getComponentName();
} else {
$map[$k][] = $v['parent'] . '.' . $v['relation']->getAlias();
}
if (isset($v['agg'])) {
$map[$k][] = $v['agg'];
}
}
return serialize(array($resultSet, $map, $this->getTableAliases()));
}
/** /**
* addSelect * addSelect

2
tests/HydrateTestCase.php
View File

@ -98,7 +98,7 @@ class Doctrine_Hydrate_Mock extends Doctrine_Hydrator_Abstract
$this->data = $data; $this->data = $data;
} }
public function hydrateResultSet($stmt, $aliasMap, $tableAliases, $hydrationMode = null) public function hydrateResultSet($stmt, $tableAliases, $hydrationMode = null)
{ {
return true; return true;
} }