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

Merge pull request #6416 from lcobucci/fix-quote-on-inheritance

Browse Source 
Fix quoting when using inheritance as well
This commit is contained in:
Marco Pivetta 2017-05-02 09:42:03 +02:00 committed by GitHub
commit 2c1ebc4ef1
11 changed files with 143 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -2303,6 +2303,10 @@ class ClassMetadataInfo implements ClassMetadata
$this->table['name'] = $table['name'];
}
if (isset($table['quoted'])) {
$this->table['quoted'] = $table['quoted'];
}
if (isset($table['schema'])) {
$this->table['schema'] = $table['schema'];
}

6
lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php
View File

@ -82,16 +82,18 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister
/**
* @param string $tableAlias
* @param string $joinColumnName
* @param string $quotedColumnName
*
* @param string $type
*
* @return string
*/
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type)
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $quotedColumnName, $type)
{
$columnAlias = $this->getSQLColumnAlias($joinColumnName);
$this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type);
return $tableAlias . '.' . $joinColumnName . ' AS ' . $columnAlias;
return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
}
}

30
lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
View File

@ -462,21 +462,14 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
? $this->getSQLTableAlias($mapping['inherited'])
: $baseTableAlias;
foreach ($mapping['targetToSourceKeyColumns'] as $srcColumn) {
$className = isset($mapping['inherited'])
? $mapping['inherited']
: $this->class->name;
$targetClass = $this->em->getClassMetadata($mapping['targetEntity']);
foreach ($mapping['joinColumns'] as $joinColumn) {
$columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias,
$srcColumn,
PersisterHelper::getTypeOfColumn(
$mapping['sourceToTargetKeyColumns'][$srcColumn],
$targetClass,
$this->em
)
$joinColumn['name'],
$this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform),
PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em)
);
}
}
@ -510,21 +503,14 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
continue;
}
foreach ($mapping['targetToSourceKeyColumns'] as $srcColumn) {
$className = isset($mapping['inherited'])
? $mapping['inherited']
: $subClass->name;
$targetClass = $this->em->getClassMetadata($mapping['targetEntity']);
foreach ($mapping['joinColumns'] as $joinColumn) {
$columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias,
$srcColumn,
PersisterHelper::getTypeOfColumn(
$mapping['sourceToTargetKeyColumns'][$srcColumn],
$targetClass,
$this->em
)
$joinColumn['name'],
$this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform),
PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em)
);
}
}

11
lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php
View File

@ -89,15 +89,12 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
$targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
foreach ($assoc['joinColumns'] as $joinColumn) {
$columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias,
$srcColumn,
PersisterHelper::getTypeOfColumn(
$assoc['sourceToTargetKeyColumns'][$srcColumn],
$targetClass,
$this->em
)
$joinColumn['name'],
$this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform),
PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em)
);
}
}

3
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -793,7 +793,8 @@ class SqlWalker implements TreeWalker
$columnAlias = $this->getSQLColumnAlias($columnName);
$columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
$sqlSelectExpressions[] = $sqlTableAlias . '.' . $columnName . ' AS ' . $columnAlias;
$quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform);
$sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias;
$this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $subClass->isIdentifier($columnName), $columnType);
}

3
tests/Doctrine/Tests/Models/Quote/Address.php
View File

@ -5,6 +5,9 @@ namespace Doctrine\Tests\Models\Quote;
/**
* @Entity
* @Table(name="`quote-address`")
* @InheritanceType("SINGLE_TABLE")
* @DiscriminatorColumn(name="type", type="string")
* @DiscriminatorMap({"simple" = Address::class, "full" = FullAddress::class})
*/
class Address
{

27
tests/Doctrine/Tests/Models/Quote/City.php Normal file
View File

@ -0,0 +1,27 @@
<?php
namespace Doctrine\Tests\Models\Quote;
/**
* @Entity
* @Table(name="`quote-city`")
*/
class City
{
/**
* @Id
* @GeneratedValue
* @Column(type="integer", name="`city-id`")
*/
public $id;
/**
* @Column(name="`city-name`")
*/
public $name;
public function __construct(string $name)
{
$this->name = $name;
}
}

17
tests/Doctrine/Tests/Models/Quote/FullAddress.php Normal file
View File

@ -0,0 +1,17 @@
<?php
namespace Doctrine\Tests\Models\Quote;
/**
* @Entity
*/
class FullAddress extends Address
{
/**
* @OneToOne(targetEntity=City::class, cascade={"persist"})
* @JoinColumn(name="`city-id`", referencedColumnName="`city-id`")
*
* @var City
*/
public $city;
}

64
tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php
View File

@ -3,6 +3,8 @@
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\Address;
use Doctrine\Tests\Models\Quote\City;
use Doctrine\Tests\Models\Quote\FullAddress;
use Doctrine\Tests\Models\Quote\Group;
use Doctrine\Tests\Models\Quote\Phone;
use Doctrine\Tests\Models\Quote\User;
@ -15,17 +17,9 @@ class GH6402Test extends OrmFunctionalTestCase
{
protected function setUp()
{
parent::setUp();
$this->useModelSet('quote');
try {
$this->setUpEntitySchema([
Address::class,
Group::class,
Phone::class,
User::class,
]);
} catch (\Exception $exception) {
}
parent::setUp();
}
public function testFind()
@ -40,8 +34,28 @@ class GH6402Test extends OrmFunctionalTestCase
{
$id = $this->createAddress();
$addresses = $this->_em->createQuery("SELECT a FROM " . Address::class . " a WHERE a.id = :id")
->setParameter("id", $id)
$addresses = $this->_em->createQuery('SELECT a FROM ' . Address::class . ' a WHERE a.id = :id')
->setParameter('id', $id)
->getResult();
self::assertCount(1, $addresses);
self::assertNotNull($addresses[0]->user);
}
public function testFindWithSubClass()
{
$id = $this->createFullAddress();
$address = $this->_em->find(FullAddress::class, $id);
self::assertNotNull($address->user);
}
public function testQueryWithSubClass()
{
$id = $this->createFullAddress();
$addresses = $this->_em->createQuery('SELECT a FROM ' . FullAddress::class . ' a WHERE a.id = :id')
->setParameter('id', $id)
->getResult();
self::assertCount(1, $addresses);
@ -49,18 +63,34 @@ class GH6402Test extends OrmFunctionalTestCase
}
private function createAddress()
{
$address = new Address();
$address->zip = 'bar';
$this->persistAddress($address);
return $address->id;
}
private function createFullAddress()
{
$address = new FullAddress();
$address->zip = 'bar';
$address->city = new City('London');
$this->persistAddress($address);
return $address->id;
}
private function persistAddress(Address $address)
{
$user = new User();
$user->name = "foo";
$address = new Address();
$address->zip = "bar";
$user->setAddress($address);
$this->_em->persist($user);
$this->_em->flush();
$this->_em->clear();
return $address->id;
}
}

12
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -39,8 +39,7 @@ class SelectSqlGenerationTest extends OrmTestCase
* @param array $queryHints
* @param array $queryParams
*/
public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = []
)
public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = [])
{
try {
$query = $this->_em->createQuery($dqlToBeTested);
@ -78,8 +77,7 @@ class SelectSqlGenerationTest extends OrmTestCase
* @param array $queryHints
* @param array $queryParams
*/
public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = []
)
public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = [])
{
$this->expectException($expectedException);
@ -892,7 +890,7 @@ class SelectSqlGenerationTest extends OrmTestCase
}
/**
* @expectedException Doctrine\ORM\Query\QueryException
* @expectedException \Doctrine\ORM\Query\QueryException
*/
public function testOrderBySupportsSingleValuedPathExpressionInverseSide()
{
@ -1991,7 +1989,7 @@ class SelectSqlGenerationTest extends OrmTestCase
{
$this->assertSqlGeneration(
'SELECT u, a FROM Doctrine\Tests\Models\Quote\User u JOIN u.address a',
'SELECT q0_."user-id" AS userid_0, q0_."user-name" AS username_1, q1_."address-id" AS addressid_2, q1_."address-zip" AS addresszip_3 FROM "quote-user" q0_ INNER JOIN "quote-address" q1_ ON q0_."address-id" = q1_."address-id"'
'SELECT q0_."user-id" AS userid_0, q0_."user-name" AS username_1, q1_."address-id" AS addressid_2, q1_."address-zip" AS addresszip_3, q1_.type AS type_4 FROM "quote-user" q0_ INNER JOIN "quote-address" q1_ ON q0_."address-id" = q1_."address-id" AND q1_.type IN (\'simple\', \'full\')'
);
$this->assertSqlGeneration(
@ -2006,7 +2004,7 @@ class SelectSqlGenerationTest extends OrmTestCase
$this->assertSqlGeneration(
'SELECT a, u FROM Doctrine\Tests\Models\Quote\Address a JOIN a.user u',
'SELECT q0_."address-id" AS addressid_0, q0_."address-zip" AS addresszip_1, q1_."user-id" AS userid_2, q1_."user-name" AS username_3 FROM "quote-address" q0_ INNER JOIN "quote-user" q1_ ON q0_."user-id" = q1_."user-id"'
'SELECT q0_."address-id" AS addressid_0, q0_."address-zip" AS addresszip_1, q1_."user-id" AS userid_2, q1_."user-name" AS username_3, q0_.type AS type_4 FROM "quote-address" q0_ INNER JOIN "quote-user" q1_ ON q0_."user-id" = q1_."user-id" WHERE q0_.type IN (\'simple\', \'full\')'
);
$this->assertSqlGeneration(

28
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View File

@ -225,6 +225,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
],
'quote' => [
Models\Quote\Address::class,
Models\Quote\City::class,
Models\Quote\FullAddress::class,
Models\Quote\Group::class,
Models\Quote\NumericEntity::class,
Models\Quote\Phone::class,
@ -480,10 +482,20 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
}
if (isset($this->_usedModelSets['quote'])) {
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone"));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
$conn->executeUpdate(
sprintf(
'UPDATE %s SET %s = NULL',
$platform->quoteIdentifier("quote-address"),
$platform->quoteIdentifier('user-id')
)
);
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group'));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone'));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user'));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address'));
$conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
}
if (isset($this->_usedModelSets['vct_onetoone'])) {
@ -616,14 +628,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
{
$this->setUpDBALTypes();
$forceCreateTables = false;
if ( ! isset(static::$_sharedConn)) {
static::$_sharedConn = TestUtil::getConnection();
if (static::$_sharedConn->getDriver() instanceof SqliteDriver) {
$forceCreateTables = true;
}
}
if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
@ -642,7 +648,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$classes = [];
foreach ($this->_usedModelSets as $setName => $bool) {
if ( ! isset(static::$_tablesCreated[$setName])/* || $forceCreateTables*/) {
if ( ! isset(static::$_tablesCreated[$setName])) {
foreach (static::$_modelSets[$setName] as $className) {
$classes[] = $this->_em->getClassMetadata($className);
}