Adding support for a single ExpressionInterface as the value for

a TupleComparison
cakephp · Jan 12, 2014 · c2ddf76 · c2ddf76
1 parent 9b92cc8
commit c2ddf76
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Cake/Database/Expression/TupleComparison.php b/Cake/Database/Expression/TupleComparison.php
@@ -66,7 +66,13 @@ public function sql(ValueBinder $generator) {
  */
 	protected function _stringifyValues($generator) {
 		$values = [];
-		foreach ($this->getValue() as $i => $value) {
+		$parts = $this->getValue();
+
+		if ($parts instanceof ExpressionInterface) {
+			return $parts->sql($generator);
+		}
+
+		foreach ($parts as $i => $value) {
 			if ($value instanceof ExpressionInterface) {
 				$values[] = $value->sql($generator);
 				continue;

diff --git a/Test/TestCase/Database/Expression/TupleComparisonTest.php b/Test/TestCase/Database/Expression/TupleComparisonTest.php
@@ -123,4 +123,17 @@ public function testTraverse() {
 		$this->assertSame($value1, $expressions[2]);
 	}
 
+/**
+ * Tests that a single ExpressionInteface can be used as the value for
+ * comparison
+ *
+ * @return void
+ */
+	public function testValueAsSingleExpression() {
+		$value = new QueryExpression('SELECT 1, 1');
+		$f = new TupleComparison(['field1', 'field2'], $value);
+		$binder = new ValueBinder;
+		$this->assertEquals('(field1, field2) = (SELECT 1, 1)', $f->sql($binder));
+	}
+
 }