Merge branch 'hotfix/2420'

Close zendframework#2420 Close zendframework#2416
akandels · Sep 25, 2012 · 7a69c34 · 7a69c34
2 parents 2b55e08 + ef52956
commit 7a69c34
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/library/Zend/Db/Sql/Select.php b/library/Zend/Db/Sql/Select.php
@@ -619,8 +619,9 @@ protected function processJoins(PlatformInterface $platform, Adapter $adapter =
                 ? $platform->quoteIdentifier(current($join['name'])) . ' AS ' . $platform->quoteIdentifier(key($join['name']))
                 : $platform->quoteIdentifier($join['name']);
             // on expression
+            // note: for Expression objects, pass them to processExpression with a prefix specific to each join (used for named parameters)
             $joinSpecArgArray[$j][] = ($join['on'] instanceof ExpressionInterface)
-                ? $this->processExpression($join['on'], $platform, $adapter, $this->processInfo['paramPrefix'] . 'join')
+                ? $this->processExpression($join['on'], $platform, $adapter, $this->processInfo['paramPrefix'] . 'join' . ($j+1) . 'part')
                 : $platform->quoteIdentifierInFragment($join['on'], array('=', 'AND', 'OR', '(', ')', 'BETWEEN')); // on
             if ($joinSpecArgArray[$j][2] instanceof StatementContainerInterface) {
                 if ($parameterContainer) {

diff --git a/tests/ZendTest/Db/Sql/SelectTest.php b/tests/ZendTest/Db/Sql/SelectTest.php
@@ -13,6 +13,7 @@
 use Zend\Db\Sql\Select;
 use Zend\Db\Sql\Expression;
 use Zend\Db\Sql\Where;
+use Zend\Db\Sql\Predicate;
 use Zend\Db\Sql\TableIdentifier;
 use Zend\Db\Adapter\ParameterContainer;
 use Zend\Db\Adapter\Platform\Sql92;
@@ -377,10 +378,12 @@ public function testReset()
      * @covers Zend\Db\Sql\Select::prepareStatement
      * @dataProvider providerData
      */
-    public function testPrepareStatement(Select $select, $expectedSqlString, $expectedParameters)
+    public function testPrepareStatement(Select $select, $expectedSqlString, $expectedParameters, $unused1, $unused2, $useNamedParameters = false)
     {
         $mockDriver = $this->getMock('Zend\Db\Adapter\Driver\DriverInterface');
-        $mockDriver->expects($this->any())->method('formatParameterName')->will($this->returnValue('?'));
+        $mockDriver->expects($this->any())->method('formatParameterName')->will($this->returnCallback(
+            function ($name) use ($useNamedParameters) { return (($useNamedParameters) ? ':' . $name : '?'); }
+        ));
         $mockAdapter = $this->getMock('Zend\Db\Adapter\Adapter', null, array($mockDriver));
 
         $parameterContainer = new ParameterContainer();
@@ -834,6 +837,25 @@ public function providerData()
             'processJoins'   => array(array(array('INNER', '"bar"', '"m" = "n"')))
         );
 
+        // multiple joins with expressions
+        // reported by @jdolieslager
+        $select36 = new Select;
+        $select36->from('foo')
+            ->join('tableA', new Predicate\Operator('id', '=', 1))
+            ->join('tableB', new Predicate\Operator('id', '=', 2))
+            ->join('tableC', new Predicate\PredicateSet(array(
+                new Predicate\Operator('id', '=', 3),
+                new Predicate\Operator('number', '>', 20)
+            )));
+        $sqlPrep36 = 'SELECT "foo".*, "tableA".*, "tableB".*, "tableC".* FROM "foo"'
+            . ' INNER JOIN "tableA" ON "id" = :join1part1 INNER JOIN "tableB" ON "id" = :join2part1 '
+            . 'INNER JOIN "tableC" ON "id" = :join3part1 AND "number" > :join3part2';
+        $sqlStr36 = 'SELECT "foo".*, "tableA".*, "tableB".*, "tableC".* FROM "foo" '
+            . 'INNER JOIN "tableA" ON "id" = \'1\' INNER JOIN "tableB" ON "id" = \'2\' '
+            . 'INNER JOIN "tableC" ON "id" = \'3\' AND "number" > \'20\'';
+        $internalTests36 = array();
+        $useNamedParams36 = true;
+
         /**
          * $select = the select object
          * $sqlPrep = the sql as a result of preparation
@@ -842,7 +864,7 @@ public function providerData()
          * $internalTests what the internal functions should return (safe-guarding extension)
          */
         return array(
-            //    $select    $sqlPrep    $params     $sqlStr    $internalTests
+            //    $select    $sqlPrep    $params     $sqlStr    $internalTests    // use named param
             array($select0,  $sqlPrep0,  array(),    $sqlStr0,  $internalTests0),
             array($select1,  $sqlPrep1,  array(),    $sqlStr1,  $internalTests1),
             array($select2,  $sqlPrep2,  array(),    $sqlStr2,  $internalTests2),
@@ -879,6 +901,7 @@ public function providerData()
             array($select33, $sqlPrep33, array(),    $sqlStr33, $internalTests33),
             array($select34, $sqlPrep34, array(),    $sqlStr34, $internalTests34),
             array($select35, $sqlPrep35, array(),    $sqlStr35, $internalTests35),
+            array($select36, $sqlPrep36, array(),    $sqlStr36, $internalTests36,  $useNamedParams36),
         );
     }