RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Fix DDC-795 (subtask of DDC-117) and integrated a test for cascade (that only works with sequence id generators).

Browse source
This commit is contained in:
Benjamin Eberlei 2010-12-28 19:05:46 +01:00
parent e7b4dca611
commit 337e2fa043
2 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View file

@ -913,7 +913,22 @@ class BasicEntityPersister
$columnList .= $this->_getSelectColumnSQL($field, $this->_class); $columnList .= $this->_getSelectColumnSQL($field, $this->_class);
} }
$this->_selectColumnListSql = $columnList . $this->_getSelectJoinColumnsSQL($this->_class); foreach ($this->_class->associationMappings as $assoc) {
if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
if ($columnList) $columnList .= ', ';
$columnAlias = $srcColumn . $this->_sqlAliasCounter++;
$columnList .= $this->_getSQLTableAlias($this->_class->name) . ".$srcColumn AS $columnAlias";
$resultColumnName = $this->_platform->getSQLResultCasing($columnAlias);
if ( ! isset($this->_resultColumnNames[$resultColumnName])) {
$this->_resultColumnNames[$resultColumnName] = $srcColumn;
}
}
}
}
$this->_selectColumnListSql = $columnList;
return $this->_selectColumnListSql; return $this->_selectColumnListSql;
} }
@ -1026,33 +1041,6 @@ class BasicEntityPersister
return "$sql AS $columnAlias"; return "$sql AS $columnAlias";
} }
/**
* Gets the SQL snippet for all join columns of the given class that are to be
* placed in an SQL SELECT statement.
*
* @param $class
* @return string
* @todo Not reused... inline?
*/
private function _getSelectJoinColumnsSQL(ClassMetadata $class)
{
$sql = '';
foreach ($class->associationMappings as $assoc) {
if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
$columnAlias = $srcColumn . $this->_sqlAliasCounter++;
$sql .= ', ' . $this->_getSQLTableAlias($this->_class->name) . ".$srcColumn AS $columnAlias";
$resultColumnName = $this->_platform->getSQLResultCasing($columnAlias);
if ( ! isset($this->_resultColumnNames[$resultColumnName])) {
$this->_resultColumnNames[$resultColumnName] = $srcColumn;
}
}
}
}
return $sql;
}
/** /**
* Gets the SQL table alias for the given class name. * Gets the SQL table alias for the given class name.
* *

19
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
View file

@ -234,6 +234,23 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
$article = $this->_em->find(get_class($this->article1), $this->article1->id()); $article = $this->_em->find(get_class($this->article1), $this->article1->id());
$this->assertEquals('not so very long text!', $article->getText()); $this->assertEquals('not so very long text!', $article->getText());
} }
/**
* @group DDC-117
*/
public function testOneToOneCascadePersist()
{
if (!$this->_em->getConnection()->getDatabasePlatform()->prefersSequences()) {
$this->markTestSkipped('Test only works with databases that prefer sequences as ID strategy.');
}
$this->article1 = new DDC117Article("Foo");
$this->articleDetails = new DDC117ArticleDetails($this->article1, "Very long text");
$this->_em->persist($this->article1);
$this->_em->flush();
}
} }
/** /**
@ -252,7 +269,7 @@ class DDC117Article
private $references; private $references;
/** /**
* @OneToOne(targetEntity="DDC117ArticleDetails", mappedBy="article") * @OneToOne(targetEntity="DDC117ArticleDetails", mappedBy="article", cascade={"persist"})
*/ */
private $details; private $details;