RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-29 19:41:45 +03:00
Code Issues Projects Releases Wiki Activity

MAP keyword support !

Browse Source
This commit is contained in:
zYne 2007-09-01 22:22:54 +00:00
parent 66d6136a92
commit cb50a932fc
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Doctrine/Hydrate.php
View File

@ -91,6 +91,9 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
* parent the alias of the parent * parent the alias of the parent
* *
* agg the aggregates of this component * agg the aggregates of this component
*
* map the name of the column / aggregate value this
* component is mapped to a collection
*/ */
protected $_aliasMap = array(); protected $_aliasMap = array();
/** /**
@ -1034,7 +1037,20 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$index = $driver->search($element, $array); $index = $driver->search($element, $array);
if ($index === false) { if ($index === false) {
$array[] = $element; $key = $map['map'];
if (isset($key)) {
if (isset($array[$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping.");
}
if ( ! isset($element[$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key.");
}
$array[$element[$key]] = $element;
} else {
$array[] = $element;
}
} }
$this->_setLastElement($prev, $array, $index, $rootAlias, $oneToOne); $this->_setLastElement($prev, $array, $index, $rootAlias, $oneToOne);
unset($currData[$rootAlias]); unset($currData[$rootAlias]);
@ -1050,7 +1066,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$relation = $map['relation']; $relation = $map['relation'];
$componentAlias = $map['relation']->getAlias(); $componentAlias = $map['relation']->getAlias();
if (!isset($prev[$parent])) { if ( ! isset($prev[$parent])) {
break; break;
} }
@ -1065,7 +1081,19 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
$index = $driver->search($element, $prev[$parent][$componentAlias]); $index = $driver->search($element, $prev[$parent][$componentAlias]);
if ($index === false) { if ($index === false) {
$prev[$parent][$componentAlias][] = $element; $key = $map['map'];
if (isset($key)) {
if (isset($prev[$parent][$componentAlias][$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found non-unique key mapping.");
}
if ( ! isset($element[$key])) {
throw new Doctrine_Hydrate_Exception("Couldn't hydrate. Found a non-existent key.");
}
$prev[$parent][$componentAlias][$element[$key]] = $element;
} else {
$prev[$parent][$componentAlias][] = $element;
}
} }
} }
// register collection for later snapshots // register collection for later snapshots

23
lib/Doctrine/Query.php
View File

@ -1217,6 +1217,15 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
public function load($path, $loadFields = true) public function load($path, $loadFields = true)
{ {
$e = Doctrine_Tokenizer::quoteExplode($path, ' MAP ');
$mapWith = null;
if (count($e) > 1) {
$mapWith = trim($e[1]);
$path = $e[0];
}
// parse custom join conditions // parse custom join conditions
$e = explode(' ON ', $path); $e = explode(' ON ', $path);
@ -1286,7 +1295,8 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$table = $relation->getTable(); $table = $relation->getTable();
$this->_aliasMap[$componentAlias] = array('table' => $table, $this->_aliasMap[$componentAlias] = array('table' => $table,
'parent' => $parent, 'parent' => $parent,
'relation' => $relation); 'relation' => $relation,
'map' => null);
if ( ! $relation->isOneToOne()) { if ( ! $relation->isOneToOne()) {
$this->needsSubquery = true; $this->needsSubquery = true;
} }
@ -1405,7 +1415,16 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
} }
$parent = $prevPath; $parent = $prevPath;
} }
if (isset($mapWith)) {
$e = explode('.', $mapWith);
$table = $this->_aliasMap[$componentAlias]['table'];
if ( ! $table->hasColumn($e[1])) {
throw new Doctrine_Query_Exception("Couldn't use key mapping. Column " . $e[1] . " does not exist.");
}
$this->_aliasMap[$componentAlias]['map'] = $table->getColumnName($e[1]);
}
return $this->_aliasMap[$componentAlias]; return $this->_aliasMap[$componentAlias];
} }
@ -1435,7 +1454,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
$this->parts['from'][] = $queryPart; $this->parts['from'][] = $queryPart;
$this->tableAliases[$tableAlias] = $componentAlias; $this->tableAliases[$tableAlias] = $componentAlias;
$this->_aliasMap[$componentAlias] = array('table' => $table); $this->_aliasMap[$componentAlias] = array('table' => $table, 'map' => null);
return $table; return $table;
} }