Merge branch 'hotfix/5392'

Close #5392
zendframework · Apr 11, 2014 · 8e42e86 · 8e42e86
2 parents a50c36c + 4cdb133
commit 8e42e86
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/library/Zend/Db/Sql/AbstractSql.php b/library/Zend/Db/Sql/AbstractSql.php
@@ -13,6 +13,7 @@
 use Zend\Db\Adapter\ParameterContainer;
 use Zend\Db\Adapter\Platform\PlatformInterface;
 use Zend\Db\Adapter\StatementContainer;
+use Zend\Db\Sql\Platform\PlatformDecoratorInterface;
 
 abstract class AbstractSql
 {
@@ -173,7 +174,14 @@ protected function processSubSelect(Select $subselect, PlatformInterface $platfo
             $subselect->processInfo['paramPrefix'] = 'subselect' . $subselect->processInfo['subselectCount'];
 
             // call subselect
-            $subselect->prepareStatement(new \Zend\Db\Adapter\Adapter($driver, $platform), $stmtContainer);
+            if ($this instanceof PlatformDecoratorInterface) {
+                /** @var Select|PlatformDecoratorInterface $subselectDecorator */
+                $subselectDecorator = clone $this;
+                $subselectDecorator->setSubject($subselect);
+                $subselectDecorator->prepareStatement(new \Zend\Db\Adapter\Adapter($driver, $platform), $stmtContainer);
+            } else {
+                $subselect->prepareStatement(new \Zend\Db\Adapter\Adapter($driver, $platform), $stmtContainer);
+            }
 
             // copy count
             $this->processInfo['subselectCount'] = $subselect->processInfo['subselectCount'];

diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
@@ -745,7 +745,7 @@ protected function processJoins(PlatformInterface $platform, DriverInterface $dr
                 $joinName = ($joinName[1] ? $platform->quoteIdentifier($joinName[1]) . $platform->getIdentifierSeparator() : '') . $platform->quoteIdentifier($joinName[0]);
             } else {
                 if ($joinName instanceof Select) {
-                    $joinName = '(' . $joinName->processSubSelect($joinName, $platform, $driver, $parameterContainer) . ')';
+                    $joinName = '(' . $this->processSubSelect($joinName, $platform, $driver, $parameterContainer) . ')';
                 } else {
                     $joinName = $platform->quoteIdentifier($joinName);
                 }