Skip to content

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

Continued work on new hydration.

parent f92773fa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 423 additions and 65 deletions
lib/Doctrine/Hydrator.php
View file @ 0dd85678
......@@ -197,7 +197,7 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$oneToOne = false;
// append element
if (isset($nonemptyComponents[$dqlAlias])) {
$driver->initRelated($prev[$parent], $relationAlias);
$driver->initRelatedCollection($prev[$parent], $relationAlias);
if ( ! isset($identifierMap[$path][$id[$parent]][$id[$dqlAlias]])) {
$element = $driver->getElement($data, $componentName);
......@@ -225,6 +225,8 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
}
// register collection for later snapshots
//$driver->registerCollection($prev[$parent][$relationAlias]);
} else if ( ! isset($prev[$parent][$relationAlias])) {
$prev[$parent][$relationAlias] = $driver->getNullPointer();
}
} else {
// 1-1 relation
......@@ -236,10 +238,12 @@ class Doctrine_Hydrator extends Doctrine_Hydrator_Abstract
$prev[$parent][$relationAlias] = $element;
}
}
if ($prev[$parent][$relationAlias] !== null) {
$coll =& $prev[$parent][$relationAlias];
$this->_setLastElement($prev, $coll, $index, $dqlAlias, $oneToOne);
}
}
}
$stmt->closeCursor();
......
lib/Doctrine/Hydrator/ArrayDriver.php
View file @ 0dd85678
......@@ -66,7 +66,7 @@ class Doctrine_Hydrator_ArrayDriver
/**
*
*/
public function initRelated(array &$data, $name)
public function initRelatedCollection(array &$data, $name)
{
if ( ! isset($data[$name])) {
$data[$name] = array();
......
lib/Doctrine/Hydrator/RecordDriver.php
View file @ 0dd85678
......@@ -68,7 +68,7 @@ class Doctrine_Hydrator_RecordDriver
}
}
public function initRelated(Doctrine_Record $record, $name)
public function initRelatedCollection(Doctrine_Record $record, $name)
{
if ( ! isset($this->_initializedRelations[$record->getOid()][$name])) {
$relation = $record->getClassMetadata()->getRelation($name);
......
lib/Doctrine/HydratorNew.php
View file @ 0dd85678
......@@ -20,8 +20,27 @@
*/
/**
* The hydrator has the tedious task to construct object or array graphs out of
* a database result set.
* The hydrator has the tedious to process result sets returned by the database
* and turn them into useable structures.
*
* Runtime complexity: The following gives the overall number of iterations
* required to process a result set.
*
* <code>numRowsInResult * numColumnsInResult + numRowsInResult * numClassesInQuery</code>
*
* This comes down to:
*
* <code>(numRowsInResult * (numColumnsInResult + numClassesInQuery))</code>
*
* Note that this is only a crude definition of the complexity as it also heavily
* depends on the complexity of all the single operations that are performed in
* each iteration.
*
* As can be seen, the number of columns in the result has the most impact on
* the overall performance (apart from the row counr, of course), since numClassesInQuery
* is usually pretty low.
* That's why the performance of the gatherRowData() method which is responsible
* for the "numRowsInResult * numColumnsInResult" part is crucial to fast hydraton.
*
* @package Doctrine
* @subpackage Hydrator
......@@ -153,9 +172,9 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
// do we need to index by a custom field?
if ($field = $this->_getCustomIndexField($rootAlias)) {
if (isset($result[$field])) {
throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found non-unique key mapping.");
throw Doctrine_Hydrator_Exception::nonUniqueKeyMapping();
} else if ( ! isset($element[$field])) {
throw new Doctrine_Hydrator_Exception("Couldn't hydrate. Found a non-existent key.");
throw Doctrine_Hydrator_Exception::nonExistantFieldUsedAsIndex($field);
}
if ($this->_isResultMixed) {
$result[] = array($element[$field] => $element);
......@@ -169,7 +188,6 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
$result[] = $element;
}
}
$identifierMap[$rootAlias][$id[$rootAlias]] = $driver->getLastKey($result);
} else {
$index = $identifierMap[$rootAlias][$id[$rootAlias]];
......@@ -185,7 +203,7 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
unset($rowData['scalars']);
}
// $prev[$rootAlias] now points to the last element in $result.
// $resultPointers[$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
// (related) components.
foreach ($rowData as $dqlAlias => $data) {
......@@ -204,8 +222,10 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
$path = $parent . '.' . $dqlAlias;
// pick the right element that will get the associated element attached
if ($this->_isResultMixed && $parent == $rootAlias) {
$key = key(reset($resultPointers));
if ($this->_isResultMixed && $parent == $rootAlias && isset($resultPointers[$parent][$key])) {
// TODO: Exception if $key === null ?
$baseElement =& $resultPointers[$parent][$key];
} else if (isset($resultPointers[$parent])) {
$baseElement =& $resultPointers[$parent];
......@@ -218,7 +238,7 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
// x-many relation
$oneToOne = false;
if (isset($nonemptyComponents[$dqlAlias])) {
$driver->initRelated($baseElement, $relationAlias);
$driver->initRelatedCollection($baseElement, $relationAlias);
if ( ! isset($identifierMap[$path][$id[$parent]][$id[$dqlAlias]])) {
$element = $driver->getElement($data, $componentName);
......@@ -244,6 +264,8 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
} else {
$index = $identifierMap[$path][$id[$parent]][$id[$dqlAlias]];
}
} else if ( ! isset($baseElement[$relationAlias])) {
$baseElement[$relationAlias] = $driver->getNullPointer();
}
} else {
// x-1 relation
......@@ -254,9 +276,11 @@ class Doctrine_HydratorNew extends Doctrine_Hydrator_Abstract
$baseElement[$relationAlias] = $driver->getElement($data, $componentName);
}
}
if ($baseElement[$relationAlias] !== null) {
$coll =& $baseElement[$relationAlias];
$this->_setLastElement($resultPointers, $coll, $index, $dqlAlias, $oneToOne);
}
}
// append scalar values
if (isset($scalars)) {
......
lib/Doctrine/Mapper.php
View file @ 0dd85678
......@@ -615,7 +615,9 @@ class Doctrine_Mapper
public function saveAssociations(Doctrine_Record $record)
{
foreach ($record->getReferences() as $relationName => $relatedObject) {
if ($relatedObject === Doctrine_Null::$INSTANCE) {
continue;
}
$rel = $record->getTable()->getRelation($relationName);
if ($rel instanceof Doctrine_Relation_Association) {
......
lib/Doctrine/Record.php
View file @ 0dd85678
......@@ -928,6 +928,9 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
$rel = $this->_class->getRelation($fieldName);
$this->_references[$fieldName] = $rel->fetchRelatedFor($this);
}
if ($this->_references[$fieldName] === Doctrine_Null::$INSTANCE) {
return null;
}
return $this->_references[$fieldName];
} catch (Doctrine_Relation_Exception $e) {
//echo $e->getTraceAsString();
......@@ -1038,6 +1041,11 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
*/
private function _coreSetRelated($name, $value)
{
if ($value === Doctrine_Null::$INSTANCE) {
$this->_references[$name] = $value;
return;
}
$rel = $this->_class->getRelation($name);
// one-to-many or one-to-one relation
......@@ -1045,7 +1053,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
$rel instanceof Doctrine_Relation_LocalKey) {
if ( ! $rel->isOneToOne()) {
// one-to-many relation found
if ( ! ($value instanceof Doctrine_Collection)) {
if ( ! $value instanceof Doctrine_Collection) {
throw new Doctrine_Record_Exception("Couldn't call Doctrine::set(), second"
. " argument should be an instance of Doctrine_Collection when"
. " setting one-to-many references.");
......@@ -1067,7 +1075,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
. " or Doctrine_Null when setting one-to-one references.");
}
if ($rel instanceof Doctrine_Relation_LocalKey) {
$idFieldNames = (array)$value->getTable()->getIdentifier();
$idFieldNames = $value->getTable()->getIdentifier();
if ( ! empty($foreignFieldName) && $foreignFieldName != $idFieldNames[0]) {
$this->set($localFieldName, $value->rawGet($foreignFieldName), false);
} else {
......@@ -1097,6 +1105,9 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
public function contains($fieldName)
{
if (isset($this->_data[$fieldName])) {
if ($this->_data[$fieldName] === Doctrine_Null::$INSTANCE) {
return false;
}
return true;
}
if (isset($this->_id[$fieldName])) {
......
tests/Orm/Hydration/BasicHydrationTest.php
View file @ 0dd85678
This diff is collapsed.
tests/models/cms/CmsArticle.php
View file @ 0dd85678
......@@ -7,5 +7,7 @@ class CmsArticle extends Doctrine_Record
$class->mapColumn('topic', 'string', 255);
$class->mapColumn('text', 'string');
$class->mapColumn('user_id', 'integer', 4);
$class->hasMany('CmsComment as comments', array(
'local' => 'id', 'foreign' => 'article_id'));
}
}
tests/models/cms/CmsComment.php 0 → 100644
View file @ 0dd85678
<?php
class CmsComment extends Doctrine_Record
{
public static function initMetadata($class)
{
$class->mapColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
$class->mapColumn('topic', 'string', 255);
$class->mapColumn('text', 'string');
$class->mapColumn('article_id', 'integer', 4);
}
}
tests/models/forum/ForumBoard.php 0 → 100644
View file @ 0dd85678
<?php
class ForumBoard extends Doctrine_Record {
public static function initMetadata($class) {
$class->mapColumn('position', 'integer');
$class->mapColumn('category_id', 'integer');
$class->hasOne('ForumCategory as category',
array('local' => 'category_id', 'foreign' => 'id'));
}
}
tests/models/forum/ForumCategory.php 0 → 100644
View file @ 0dd85678
<?php
class ForumCategory extends Doctrine_Record {
public static function initMetadata($class) {
$class->mapColumn('position', 'integer');
$class->mapColumn('name', 'string', 255);
$class->hasMany('ForumBoard as boards', array(
'local' => 'id' , 'foreign' => 'category_id'));
}
}
tests_old/AccessTestCase.php
View file @ 0dd85678
......@@ -49,10 +49,10 @@ class Doctrine_Access_TestCase extends Doctrine_UnitTestCase
{
$user = new User();
$this->assertTrue(isset($user->name));
$this->assertTrue(!isset($user->name));
$this->assertFalse(isset($user->unknown));
$this->assertTrue(isset($user['name']));
$this->assertTrue(!isset($user['name']));
$this->assertFalse(isset($user['unknown']));
$coll = new Doctrine_Collection('User');
......
tests_old/CustomResultSetOrderTestCase.php
View file @ 0dd85678
......@@ -169,7 +169,7 @@ class Doctrine_CustomResultSetOrder_TestCase extends Doctrine_UnitTestCase {
case 'Third':
// The third has no boards as expected.
//print $category->Boards[0]->position;
$this->assertEqual(0, $category->Boards->count());
$this->assertTrue(!isset($category->Boards));
break;
}
......
tests_old/Record/SynchronizeTestCase.php
View file @ 0dd85678
......@@ -115,7 +115,7 @@ class Doctrine_Record_Synchronize_TestCase extends Doctrine_UnitTestCase
public function testSynchronizeAfterRemoveRecord()
{
$user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
$this->assertEqual($user->Phonenumber->count(), 0);
$this->assertTrue(!isset($user->Phonenumber));
$this->assertTrue(!isset($user->Email));
}
}
tests_old/RecordTestCase.php
View file @ 0dd85678
......@@ -113,9 +113,9 @@ class Doctrine_Record_TestCase extends Doctrine_UnitTestCase
$user = new User();
$this->assertTrue(isset($user->id));
$this->assertTrue(isset($user['id']));
$this->assertTrue($user->contains('id'));
$this->assertTrue(!isset($user->id));
$this->assertTrue(!isset($user['id']));
$this->assertTrue(!$user->contains('id'));
}
public function testNotNullConstraint()
......
tests_old/Relation/OneToOneTestCase.php
View file @ 0dd85678
......@@ -83,7 +83,7 @@ class Doctrine_Relation_OneToOne_TestCase extends Doctrine_UnitTestCase
$this->assertTrue($user->Email instanceOf Email);
$user->Email = Doctrine_Null::$INSTANCE;
$user->save();
$this->assertTrue($user->Email instanceOf Doctrine_Null);
$this->assertTrue($user->Email === null);
}
public function testSavingRelatedObjects()
......
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