RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7093 from lcobucci/patch-association-identifier-not-quoted

Browse Source 
Fix updating entities with quoted identifier association
This commit is contained in:
Luís Cobucci 2018-02-25 20:28:33 +01:00 committed by GitHub
commit ffb7d4c79c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,9 +451,14 @@ class BasicEntityPersister implements EntityPersister
continue;
}
$params[] = $identifier[$idField];
$where[] = $this->class->associationMappings[$idField]['joinColumns'][0]['name'];
$targetMapping = $this->em->getClassMetadata($this->class->associationMappings[$idField]['targetEntity']);
$params[] = $identifier[$idField];
$where[] = $this->quoteStrategy->getJoinColumnName(
$this->class->associationMappings[$idField]['joinColumns'][0],
$this->class,
$this->platform
);
$targetMapping = $this->em->getClassMetadata($this->class->associationMappings[$idField]['targetEntity']);
switch (true) {
case (isset($targetMapping->fieldMappings[$targetMapping->identifier[0]])):

82
tests/Doctrine/Tests/ORM/Functional/Ticket/GH7012Test.php Normal file
View File

@ -0,0 +1,82 @@
<?php
declare(strict_types=1);
namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\Tests\Models\Quote\User as QuotedUser;
use Doctrine\Tests\OrmFunctionalTestCase;
final class GH7012Test extends OrmFunctionalTestCase
{
protected function setUp() : void
{
$this->useModelSet('quote');
parent::setUp();
$this->setUpEntitySchema([GH7012UserData::class]);
}
/**
* @group 7012
*/
public function testUpdateEntityWithIdentifierAssociationWithQuotedJoinColumn() : void
{
$user = new QuotedUser();
$user->name = 'John Doe';
$this->_em->persist($user);
$this->_em->flush();
$userData = new GH7012UserData($user, '123456789');
$this->_em->persist($userData);
$this->_em->flush();
$userData->name = '4321';
$this->_em->flush();
$platform = $this->_em->getConnection()->getDatabasePlatform();
$quotedTableName = $platform->quoteIdentifier('quote-user-data');
$quotedColumn = $platform->quoteIdentifier('name');
$quotedIdentifier = $platform->quoteIdentifier('user-id');
self::assertNotEquals('quote-user-data', $quotedTableName);
self::assertNotEquals('name', $quotedColumn);
self::assertNotEquals('user-id', $quotedIdentifier);
$queries = $this->_sqlLoggerStack->queries;
$this->assertSQLEquals(
sprintf('UPDATE %s SET %s = ? WHERE %s = ?', $quotedTableName, $quotedColumn, $quotedIdentifier),
$queries[$this->_sqlLoggerStack->currentQuery - 1]['sql']
);
}
}
/**
* @Entity
* @Table(name="`quote-user-data`")
*/
class GH7012UserData
{
/**
* @Id
* @OneToOne(targetEntity=Doctrine\Tests\Models\Quote\User::class)
* @JoinColumn(name="`user-id`", referencedColumnName="`user-id`", onDelete="CASCADE")
*/
public $user;
/**
* @Column(type="string", name="`name`")
*/
public $name;
public function __construct(QuotedUser $user, string $name)
{
$this->user = $user;
$this->name = $name;
}
}