Skip to content

D
doctrine-dbal
Commit d4c12c35 authored by zYne's avatar zYne
Browse files
Options

new DQL Hydration algorithm !

parent 881788f3
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 230 deletions
lib/Doctrine/Db/Statement.php
View file @ d4c12c35
...@@ -201,7 +201,7 @@ class Doctrine_Db_Statement implements Doctrine_Adapter_Statement_Interface ...@@ -201,7 +201,7 @@ class Doctrine_Db_Statement implements Doctrine_Adapter_Statement_Interface
public function execute($params = null) public function execute($params = null)
{ {
$event = new Doctrine_Db_Event($this, Doctrine_Db_Event::EXECUTE, $this->stmt->queryString, $params); $event = new Doctrine_Db_Event($this, Doctrine_Db_Event::EXECUTE, $this->stmt->queryString, $params);
//print $this->stmt->queryString . print_r($params, true) . "<br>"; // print $this->stmt->queryString . print_r($params, true) . "<br>";
$skip = $this->adapter->getListener()->onPreExecute($event); $skip = $this->adapter->getListener()->onPreExecute($event);
if ( ! $skip) { if ( ! $skip) {
......
lib/Doctrine/Hydrate.php
View file @ d4c12c35
...@@ -581,7 +581,11 @@ class Doctrine_Hydrate implements Serializable ...@@ -581,7 +581,11 @@ class Doctrine_Hydrate implements Serializable
if (isset($this->_aliasMap[$alias]['agg'][$index])) { if (isset($this->_aliasMap[$alias]['agg'][$index])) {
$agg = $this->_aliasMap[$alias]['agg'][$index]; $agg = $this->_aliasMap[$alias]['agg'][$index];
} }
$record->mapValue($agg, $value); if (is_array($record)) {
$record[$agg] = $value;
} else {
$record->mapValue($agg, $value);
}
$found = true; $found = true;
} }
} }
...@@ -647,7 +651,7 @@ class Doctrine_Hydrate implements Serializable ...@@ -647,7 +651,7 @@ class Doctrine_Hydrate implements Serializable
if ($cached === null) { if ($cached === null) {
// cache miss // cache miss
$stmt = $this->_execute($params, $return); $stmt = $this->_execute($params, $return);
$array = $this->parseData($stmt); $array = $this->parseData2($stmt);
$cached = $this->getCachedForm($array); $cached = $this->getCachedForm($array);
...@@ -675,150 +679,12 @@ class Doctrine_Hydrate implements Serializable ...@@ -675,150 +679,12 @@ class Doctrine_Hydrate implements Serializable
} }
} else { } else {
$stmt = $this->_execute($params, $return); $stmt = $this->_execute($params, $return);
if ($return === Doctrine::FETCH_ARRAY) {
return $this->parseData2($stmt);
} else {
$array = $this->parseData($stmt);
}
}
if (empty($this->_aliasMap)) { $array = $this->parseData2($stmt, $return);
throw new Doctrine_Hydrate_Exception("Couldn't execute query. Component alias map was empty.");
} }
// initialize some variables used within the main loop return $array;
reset($this->_aliasMap);
$rootMap = current($this->_aliasMap);
$rootAlias = key($this->_aliasMap);
$coll = new Doctrine_Collection($rootMap['table']);
$prev[$rootAlias] = $coll;
// we keep track of all the collections
$colls = array();
$colls[] = $coll;
$prevRow = array();
/**
* iterate over the fetched data
* here $data is a two dimensional array
*/
foreach ($array as $data) {
/**
* remove duplicated data rows and map data into objects
*/
foreach ($data as $tableAlias => $row) {
// skip empty rows (not mappable)
if (empty($row)) {
continue;
}
$alias = $this->getComponentAlias($tableAlias);
$map = $this->_aliasMap[$alias];
// initialize previous row array if not set
if ( ! isset($prevRow[$tableAlias])) {
$prevRow[$tableAlias] = array();
}
// don't map duplicate rows
if ($prevRow[$tableAlias] !== $row) {
$identifiable = $this->isIdentifiable($row, $map['table']->getIdentifier());
if ($identifiable) {
// set internal data
$map['table']->setData($row);
}
// initialize a new record
$record = $map['table']->getRecord();
// map aggregate values (if any)
if($this->mapAggregateValues($record, $row, $alias)) {
$identifiable = true;
}
if ($alias == $rootAlias) {
// add record into root collection
if ($identifiable) {
$coll->add($record);
unset($prevRow);
}
} else {
$relation = $map['relation'];
$parentAlias = $map['parent'];
$parentMap = $this->_aliasMap[$parentAlias];
$parent = $prev[$parentAlias]->getLast();
// check the type of the relation
if ($relation->isOneToOne()) {
if ( ! $identifiable) {
continue;
}
$prev[$alias] = $record;
} else {
// one-to-many relation or many-to-many relation
if ( ! $prev[$parentAlias]->getLast()->hasReference($relation->getAlias())) {
// initialize a new collection
$prev[$alias] = new Doctrine_Collection($map['table']);
$prev[$alias]->setReference($parent, $relation);
} else {
// previous entry found from memory
$prev[$alias] = $prev[$parentAlias]->getLast()->get($relation->getAlias());
}
$colls[] = $prev[$alias];
// add record to the current collection
if ($identifiable) {
$prev[$alias]->add($record);
}
}
// initialize the relation from parent to the current collection/record
$parent->set($relation->getAlias(), $prev[$alias]);
}
// following statement is needed to ensure that mappings
// are being done properly when the result set doesn't
// contain the rows in 'right order'
if ($prev[$alias] !== $record) {
$prev[$alias] = $record;
}
}
$prevRow[$tableAlias] = $row;
}
}
// take snapshots from all initialized collections
foreach(array_unique($colls) as $c) {
$c->takeSnapshot();
}
return $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 mixed $primaryKeys
* @return boolean
*/
public function isIdentifiable(array $row, $primaryKeys)
{
if (is_array($primaryKeys)) {
foreach ($primaryKeys as $id) {
if ($row[$id] == null) {
return false;
}
}
} else {
if ( ! isset($row[$primaryKeys])) {
return false;
}
}
return true;
} }
/** /**
* getType * getType
* *
...@@ -901,19 +767,28 @@ class Doctrine_Hydrate implements Serializable ...@@ -901,19 +767,28 @@ class Doctrine_Hydrate implements Serializable
* @param mixed $stmt * @param mixed $stmt
* @return array * @return array
*/ */
public function parseData2($stmt) public function parseData2($stmt, $return)
{ {
$array = array();
$cache = array(); $cache = array();
$rootMap = reset($this->_aliasMap); $rootMap = reset($this->_aliasMap);
$rootAlias = key($this->_aliasMap); $rootAlias = key($this->_aliasMap);
$componentName = $rootMap['table']->getComponentName();
$index = 0; $index = 0;
$incr = true; $incr = true;
$lastAlias = ''; $lastAlias = '';
$currData = array(); $currData = array();
if ($return === Doctrine::FETCH_ARRAY) {
$driver = new Doctrine_Hydrate_Array();
} else {
$driver = new Doctrine_Hydrate_Record();
}
$array = $driver->getElementCollection($componentName);
while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
$parse = true;
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
if ( ! isset($cache[$key])) { if ( ! isset($cache[$key])) {
$e = explode('__', $key); $e = explode('__', $key);
...@@ -934,115 +809,136 @@ class Doctrine_Hydrate implements Serializable ...@@ -934,115 +809,136 @@ class Doctrine_Hydrate implements Serializable
$tmp = array(); $tmp = array();
$alias = $cache[$key]['alias']; $alias = $cache[$key]['alias'];
$component = $cache[$key]['component']; $component = $cache[$key]['component'];
$componentName = $this->_aliasMap[$cache[$key]['alias']]['table']->getComponentName();
$table = $this->_aliasMap[$cache[$key]['alias']]['table'];
if ( ! isset($currData[$alias])) { if ( ! isset($currData[$alias])) {
$currData[$alias] = array(); $currData[$alias] = array();
} }
if ( ! isset($prevData[$alias])) {
$prevData[$alias] = array();
}
if ( ! isset($prevElement[$alias])) {
$prevElement[$alias] = array();
}
if ( ! isset($prev[$alias])) { if ( ! isset($prev[$alias])) {
$prev[$alias] = array(); $prev[$alias] = array();
} }
if ($alias !== $lastAlias || $parse) {
if ($lastAlias !== $alias) {
// component changed // component changed
$identifiable = $driver->isIdentifiable($currData[$alias], $table);
if ($alias === $rootAlias) { $element = $driver->getElement($currData[$alias], $componentName);
// dealing with root component
// map aggregate values (if any)
if ( ! isset($prevData[$alias]) || $currData[$alias] !== $prevData[$alias]) { if ($this->mapAggregateValues($element, $currData[$alias], $alias)) {
if ( ! empty($currData[$alias])) { $identifiable = true;
}
if ($currData[$alias] !== $prevData[$alias] || $element !== $prevElement[$alias]) {
if ($identifiable) {
if ($alias === $rootAlias) {
// dealing with root component
$array[$index] = $element;
$prev[$alias] =& $array[$index];
$array[$index] = $currData[$alias]; $index++;
$prev[$alias] =& $array[$index]; } else {
$index++; $parent = $cache[$key]['parent'];
$relation = $this->_aliasMap[$cache[$key]['alias']]['relation'];
// check the type of the relation
if ( ! $relation->isOneToOne()) {
if ($prev[$parent][$component] instanceof Doctrine_Record) {
throw new Exception();
}
$prev[$parent][$component][] = $element;
$driver->registerCollection($prev[$parent][$component]);
} else {
$prev[$parent][$component] = $element;
}
if (is_array($prev[$parent][$component])) {
$prev[$alias] = end($prev[$parent][$component]);
} else {
$prev[$alias] = $prev[$parent][$component]->getLast();
}
} }
} if (isset($currData[$alias])) {
} else { $prevData[$alias] = $currData[$alias];
$parent = $cache[$key]['parent'];
$relation = $this->_aliasMap[$cache[$key]['alias']]['relation'];
if ( ! isset($prevData[$alias]) || $currData[$alias] !== $prevData[$alias]) {
if ($relation->getType() >= Doctrine_Relation::MANY) {
$prev[$parent][$component][] = $currData[$alias];
} else { } else {
$prev[$parent][$component] = $currData[$alias]; $prevData[$alias] = array();
} }
$currData[$alias] = array();
$prevElement[$alias] = $element;
} }
} }
if (isset($currData[$alias])) {
$prevData[$alias] = $currData[$alias];
} else {
$prevData[$alias] = array();
}
} else {
$field = $cache[$key]['field'];
$currData[$alias][$field] = $value;
} }
$field = $cache[$key]['field'];
$currData[$alias][$field] = $value;
//print_r($currData[$alias]);
$lastAlias = $alias; $lastAlias = $alias;
$parse = false;
} }
} }
foreach ($currData as $alias => $data) { foreach ($currData as $alias => $data) {
if ($alias === $rootAlias) { $componentName = $this->_aliasMap[$alias]['table']->getComponentName();
// dealing with root component // component changed
$identifiable = $driver->isIdentifiable($currData[$alias], $table);
$element = $driver->getElement($currData[$alias], $componentName, $identifiable);
if ( ! isset($prevData[$alias]) || $currData[$alias] !== $prevData[$alias]) { // map aggregate values (if any)
if ( ! empty($currData[$alias])) { if($this->mapAggregateValues($element, $currData[$alias], $alias)) {
$identifiable = true;
}
$array[$index] = $currData[$alias]; if ( ! isset($prevData[$alias]) || (isset($currData[$alias]) && $currData[$alias] !== $prevData[$alias]) || $element !== $prevElement[$alias]) {
if ($identifiable) {
if ($alias === $rootAlias) {
// dealing with root component
$array[$index] = $element;
$prev[$alias] =& $array[$index]; $prev[$alias] =& $array[$index];
$index++; $index++;
}
}
} else {
$parent = $cache[$key]['parent'];
$relation = $this->_aliasMap[$cache[$key]['alias']]['relation'];
if ( ! isset($prevData[$alias]) || $currData[$alias] !== $prevData[$alias]) {
if ($relation->getType() >= Doctrine_Relation::MANY) {
$prev[$parent][$component][] = $currData[$alias];
} else { } else {
$prev[$parent][$component] = $currData[$alias]; $parent = $this->_aliasMap[$alias]['parent'];
$relation = $this->_aliasMap[$alias]['relation'];
$componentAlias = $relation->getAlias();
// check the type of the relation
if ( ! $relation->isOneToOne()) {
$prev[$parent][$componentAlias][] = $element;
$driver->registerCollection($prev[$parent][$componentAlias]);
} else {
$prev[$parent][$componentAlias] = $element;
}
} }
} }
} }
if (isset($currData[$alias])) {
$prevData[$alias] = $currData[$alias];
} else {
$prevData[$alias] = array();
}
$currData[$alias] = array();
$prevElement[$alias] = $element;
} }
$driver->flush();
$stmt->closeCursor(); $stmt->closeCursor();
unset($cache);
return $array;
}
/**
* parseData
* parses the data returned by statement object
*
* @param mixed $stmt
* @return array
*/
public function parseData($stmt)
{
$array = array();
$cache = array();
while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) {
foreach ($data as $key => $value) {
if ( ! isset($cache[$key])) {
$e = explode('__', $key);
$cache[$key]['field'] = strtolower(array_pop($e));
$cache[$key]['component'] = strtolower(implode('__', $e));
}
$data[$cache[$key]['component']][$cache[$key]['field']] = $value;
unset($data[$key]);
}
$array[] = $data;
}
$stmt->closeCursor();
return $array; return $array;
} }
/** /**
...@@ -1052,4 +948,4 @@ class Doctrine_Hydrate implements Serializable ...@@ -1052,4 +948,4 @@ class Doctrine_Hydrate implements Serializable
{ {
return Doctrine_Lib::formatSql($this->getQuery()); return Doctrine_Lib::formatSql($this->getQuery());
} }
} }
lib/Doctrine/Hydrate/Array.php
View file @ d4c12c35
...@@ -43,7 +43,7 @@ class Doctrine_Hydrate_Array ...@@ -43,7 +43,7 @@ class Doctrine_Hydrate_Array
} }
public function isIdentifiable(array $data, Doctrine_Table $table) public function isIdentifiable(array $data, Doctrine_Table $table)
{ {
return true; return (! empty($data));
} }
public function registerCollection($coll) public function registerCollection($coll)
{ {
......
lib/Doctrine/Hydrate/Record.php
View file @ d4c12c35
...@@ -46,7 +46,7 @@ class Doctrine_Hydrate_Record ...@@ -46,7 +46,7 @@ class Doctrine_Hydrate_Record
return $coll; return $coll;
} }
public function registerCollection($coll) public function registerCollection(Doctrine_Collection $coll)
{ {
$this->_collections[] = $coll; $this->_collections[] = $coll;
} }
...@@ -76,18 +76,16 @@ class Doctrine_Hydrate_Record ...@@ -76,18 +76,16 @@ class Doctrine_Hydrate_Record
} }
return true; return true;
} }
public function getElement(array $data, $component) public function getElement(array $data, $component)
{ {
if ( ! isset($this->_tables[$component])) { if ( ! isset($this->_tables[$component])) {
$this->_tables[$component] = Doctrine_Manager::getInstance()->getTable($component); $this->_tables[$component] = Doctrine_Manager::getInstance()->getTable($component);
$this->_tables[$component]->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
} }
$this->_tables[$component]->setData($data); $this->_tables[$component]->setData($data);
$record = $this->_tables[$component]->getRecord(); $record = $this->_tables[$component]->getRecord();
$this->_records[] = $record; $this->_records[] = $record;
$this->_tables[$component]->setAttribute(Doctrine::ATTR_LOAD_REFERENCES, false);
return $record; return $record;
} }
......
lib/Doctrine/Query.php
View file @ d4c12c35
...@@ -233,7 +233,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable ...@@ -233,7 +233,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
* @return Doctrine_Query this object * @return Doctrine_Query this object
*/ */
public function parseQueryPart($queryPartName, $queryPart, $append = false) public function parseQueryPart($queryPartName, $queryPart, $append = false)
{ {
// sanity check // sanity check
if ($queryPart === '' || $queryPart === null) { if ($queryPart === '' || $queryPart === null) {
throw new Doctrine_Query_Exception('Empty ' . $queryPartName . ' part given.'); throw new Doctrine_Query_Exception('Empty ' . $queryPartName . ' part given.');
......
lib/Doctrine/Query/Abstract.php
View file @ d4c12c35
...@@ -288,4 +288,17 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate ...@@ -288,4 +288,17 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
{ {
return $this->parseQueryPart('offset', $offset); return $this->parseQueryPart('offset', $offset);
} }
/**
* parseQueryPart
* parses given DQL query part
*
* @param string $queryPartName the name of the query part
* @param string $queryPart query part to be parsed
* @param boolean $append whether or not to append the query part to its stack
* if false is given, this method will overwrite
* the given query part stack with $queryPart
* @return Doctrine_Query this object
*/
abstract public function parseQueryPart($queryPartName, $queryPart, $append = false);
} }
lib/Doctrine/Record.php
View file @ d4c12c35
...@@ -229,6 +229,15 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite ...@@ -229,6 +229,15 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
{ {
return self::$_null; return self::$_null;
} }
/**
* _index
*
* @return integer
*/
public static function _index()
{
return self::$_index;
}
/** /**
* setUp * setUp
* this method is used for setting up relations and attributes * this method is used for setting up relations and attributes
......
lib/Doctrine/Table.php
View file @ d4c12c35
...@@ -857,13 +857,26 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable ...@@ -857,13 +857,26 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$key = array($key); $key = array($key);
} }
$found = false;
foreach ($key as $k) { foreach ($key as $k) {
if ( ! isset($this->data[$k])) { if ( ! isset($this->data[$k])) {
throw new Doctrine_Table_Exception("Primary key value for $k wasn't found"); // primary key column not found return new record
$found = true;
break;
} }
$id[] = $this->data[$k]; $id[] = $this->data[$k];
} }
if ($found) {
$this->data = array();
$recordName = $this->getClassnameToReturn();
$record = new $recordName($this, true);
return $record;
}
$id = implode(' ', $id); $id = implode(' ', $id);
if (isset($this->identityMap[$id])) { if (isset($this->identityMap[$id])) {
......
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