From f244db80fbe2b973a0bc3f2a12e34f8755ed3975 Mon Sep 17 00:00:00 2001 From: molchanoviv Date: Thu, 26 Feb 2015 16:08:03 +0300 Subject: [PATCH] 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; } /**