From f244db80fbe2b973a0bc3f2a12e34f8755ed3975 Mon Sep 17 00:00:00 2001 From: molchanoviv Date: Thu, 26 Feb 2015 16:08:03 +0300 Subject: [PATCH 1/6] Allow to join non-public schema tables --- lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php index eb5b85065..e69f6f6b2 100644 --- a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php +++ b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php @@ -96,9 +96,16 @@ class DefaultQuoteStrategy implements QuoteStrategy */ public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform) { - return isset($association['joinTable']['quoted']) - ? $platform->quoteIdentifier($association['joinTable']['name']) - : $association['joinTable']['name']; + $schema = ''; + if (isset($association['joinTable']['schema']) && null !== $association['joinTable']['schema']) { + $schema = $association['joinTable']['schema'] . '.'; + } + $tableName = $association['joinTable']['name']; + if (isset($association['joinTable']['quoted'])) { + $tableName = $platform->quoteIdentifier($tableName); + } + + return $schema . $tableName; } /** From ab740abe96de0a7b8b098f7e8c480674939c4da0 Mon Sep 17 00:00:00 2001 From: molchanoviv Date: Thu, 26 Feb 2015 17:11:42 +0300 Subject: [PATCH 2/6] Add DefaultQuoteStrategyTest::testGetJoinTableName() test --- .../Models/NonPublicSchemaJoins/User.php | 79 +++++++++++++++++++ .../ORM/Mapping/DefaultQuoteStrategyTest.php | 27 +++++++ 2 files changed, 106 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php create mode 100644 tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php diff --git a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php new file mode 100644 index 000000000..39b78adca --- /dev/null +++ b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php @@ -0,0 +1,79 @@ +id = $id; + } + + /** + * @return User[] + */ + public function getReaders() + { + return $this->readers; + } + + /** + * @param User[] $readers + * @return User + */ + public function setReaders($readers) + { + $this->readers = $readers; + + return $this; + } + + /** + * @return User[] + */ + public function getAuthors() + { + return $this->authors; + } + + /** + * @param User[] $authors + * @return User + */ + public function setAuthors($authors) + { + $this->authors = $authors; + + return $this; + } +} diff --git a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php new file mode 100644 index 000000000..8408eb996 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php @@ -0,0 +1,27 @@ + + */ +class DefaultQuoteStrategyTest extends OrmTestCase +{ + const TEST_ENTITY = 'Doctrine\Tests\Models\NonPublicSchemaJoins\User'; + + public function testGetJoinTableName() + { + $em = $this->_getTestEntityManager(); + $metadata = $em->getClassMetadata(self::TEST_ENTITY); + $platform = $em->getConnection()->getDatabasePlatform(); + $strategy = new DefaultQuoteStrategy(); + $tableName = $strategy->getJoinTableName($metadata->associationMappings['readers'], $metadata, $platform); + $this->assertEquals($tableName, 'readers.author_reader'); + } +} From bfd628e1531bf59ed6abb6b439950539a2f8751b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 17 Mar 2015 23:14:13 +0000 Subject: [PATCH 3/6] #1316 - refactoring test code to reduce the number of actual involved systems (quote strategy) --- .../ORM/Mapping/DefaultQuoteStrategyTest.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php index 8408eb996..39cbc3c65 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php @@ -4,6 +4,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\DefaultQuoteStrategy; +use Doctrine\Tests\Models\NonPublicSchemaJoins\User; use Doctrine\Tests\OrmTestCase; /** @@ -13,15 +14,17 @@ use Doctrine\Tests\OrmTestCase; */ class DefaultQuoteStrategyTest extends OrmTestCase { - const TEST_ENTITY = 'Doctrine\Tests\Models\NonPublicSchemaJoins\User'; - public function testGetJoinTableName() { - $em = $this->_getTestEntityManager(); - $metadata = $em->getClassMetadata(self::TEST_ENTITY); - $platform = $em->getConnection()->getDatabasePlatform(); + $em = $this->_getTestEntityManager(); + $metadata = $em->getClassMetadata(User::CLASSNAME); + /* @var $platform \Doctrine\DBAL\Platforms\AbstractPlatform */ $strategy = new DefaultQuoteStrategy(); - $tableName = $strategy->getJoinTableName($metadata->associationMappings['readers'], $metadata, $platform); - $this->assertEquals($tableName, 'readers.author_reader'); + $platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform'); + + $this->assertSame( + 'readers.author_reader', + $strategy->getJoinTableName($metadata->associationMappings['readers'], $metadata, $platform) + ); } } From 0c0d3a1a7c1d4d54dca8b80951aa948ec7784126 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 17 Mar 2015 23:14:29 +0000 Subject: [PATCH 4/6] #1316 - removing unused API from stub class --- .../Models/NonPublicSchemaJoins/User.php | 55 +++---------------- 1 file changed, 8 insertions(+), 47 deletions(-) diff --git a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php index 39b78adca..1c40a5e43 100644 --- a/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php +++ b/tests/Doctrine/Tests/Models/NonPublicSchemaJoins/User.php @@ -10,70 +10,31 @@ namespace Doctrine\Tests\Models\NonPublicSchemaJoins; */ class User { + const CLASSNAME = __CLASS__; + /** * @Column(type="integer") * @Id */ - private $id; + public $id; /** * @ManyToMany(targetEntity="Doctrine\Tests\Models\NonPublicSchemaJoins\User", inversedBy="authors") - * @JoinTable(name="author_reader", schema="readers", + * @JoinTable( + * name="author_reader", + * schema="readers", * joinColumns={@JoinColumn(name="author_id", referencedColumnName="id")}, * inverseJoinColumns={@JoinColumn(name="reader_id", referencedColumnName="id")} * ) * * @var User[] */ - private $readers; + public $readers; /** * @ManyToMany(targetEntity="Doctrine\Tests\Models\NonPublicSchemaJoins\User", mappedBy="readers") * * @var User[] */ - private $authors; - - public function setId($id) - { - $this->id = $id; - } - - /** - * @return User[] - */ - public function getReaders() - { - return $this->readers; - } - - /** - * @param User[] $readers - * @return User - */ - public function setReaders($readers) - { - $this->readers = $readers; - - return $this; - } - - /** - * @return User[] - */ - public function getAuthors() - { - return $this->authors; - } - - /** - * @param User[] $authors - * @return User - */ - public function setAuthors($authors) - { - $this->authors = $authors; - - return $this; - } + public $authors; } From 4095bbaa92ce82b892fa96ec388da8fc0d118608 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 17 Mar 2015 23:15:07 +0000 Subject: [PATCH 5/6] #1316 - adding `@group` annotation to newly introduced tests --- tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php index 39cbc3c65..6dafaf39c 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/DefaultQuoteStrategyTest.php @@ -14,6 +14,10 @@ use Doctrine\Tests\OrmTestCase; */ class DefaultQuoteStrategyTest extends OrmTestCase { + /** + * @group DDC-3590 + * @group 1316 + */ public function testGetJoinTableName() { $em = $this->_getTestEntityManager(); From 648fde89147b71b614315128f0131d8cfb6fa827 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 17 Mar 2015 23:16:16 +0000 Subject: [PATCH 6/6] #1316 - removing useless `null` check (redundant with `isset()`), cs cleanups --- lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php index e69f6f6b2..dfbded8a4 100644 --- a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php +++ b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php @@ -97,10 +97,13 @@ class DefaultQuoteStrategy implements QuoteStrategy public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform) { $schema = ''; - if (isset($association['joinTable']['schema']) && null !== $association['joinTable']['schema']) { + + if (isset($association['joinTable']['schema'])) { $schema = $association['joinTable']['schema'] . '.'; } + $tableName = $association['joinTable']['name']; + if (isset($association['joinTable']['quoted'])) { $tableName = $platform->quoteIdentifier($tableName); }