Merge pull request propelorm#854 from stevleibelt/master

Fixed bug introduced by fix [0] and discussed [1].
mybuilder · Mar 31, 2014 · e914de6 · e914de6
2 parents 10180f9 + 475e666
commit e914de6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/runtime/lib/query/Join.php b/runtime/lib/query/Join.php
@@ -563,10 +563,14 @@ public function getClause(&$params)
      */
     public function equals($join)
     {
+        $parametersOfThisClauses = array();
+        $parametersOfJoinClauses = array();
+
         return $join !== null
                 && $join instanceof Join
                 && $this->getJoinType() == $join->getJoinType()
-                && $this->getConditions() == $join->getConditions();
+                && $this->getConditions() == $join->getConditions()
+                && $this->getClause($parametersOfThisClauses) == $join->getClause($parametersOfJoinClauses);
     }
 
     /**

diff --git a/test/testsuite/runtime/query/JoinTest.php b/test/testsuite/runtime/query/JoinTest.php
@@ -186,6 +186,10 @@ public function testEquality()
         $j7 = new Join('foo', 'bar', 'INNER JOIN');
         $this->assertTrue($j5->equals($j7), 'Join without specified join type should be equal
                                                 to INNER JOIN, as it fallback to default join type');
+
+        $j8 = new Join('foo', 'bar', 'INNER JOIN');
+        $j8->addCondition('baz.foo', 'baz.bar');
+        $this->assertFalse($j5->equals($j8));
     }
 
   public function testCountConditions()