Merge pull request #5083 from cakephp/3.0-fix-comparison

3.0 fix comparison
cakephp · Nov 5, 2014 · fc18336 · fc18336
2 parents 135921a + be0866f
commit fc18336
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -483,7 +483,11 @@ protected function _addConditions(array $conditions, array $types) {
 				continue;
 			}
 
-			if ($c instanceof self && count($c) > 0) {
+			if ($c instanceof self && count($c) === 0) {
+				continue;
+			}
+
+			if ($numericKey && $c instanceof ExpressionInterface) {
 				$this->_conditions[] = $c;
 				continue;
 			}

diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -502,4 +502,24 @@ public function testContainNoEmptyAssociatedObjects() {
 		$this->assertNull($result->user, 'No record should be null.');
 	}
 
+/**
+ * Tests that using a comparison expression inside an OR condition works
+ *
+ * @see https://github.com/cakephp/cakephp/issues/5081
+ * @return void
+ */
+	public function testOrConditionsWithExpression() {
+		$table = TableRegistry::get('Articles');
+		$query = $table->find();
+		$query->where([
+			'OR' => [
+				new \Cake\Database\Expression\Comparison('id', 1, 'integer', '>'),
+				new \Cake\Database\Expression\Comparison('id', 3, 'integer', '<')
+			]
+		]);
+
+		$results = $query->toArray();
+		$this->assertCount(3, $results);
+	}
+
 }