Fixing MongoDB conditions queries with multiple operators against a s…

…ingle field.
UnionOfRAD · Dec 6, 2010 · 552f9e5 · 552f9e5
1 parent d2f0f71
commit 552f9e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/libraries/lithium/data/source/MongoDb.php b/libraries/lithium/data/source/MongoDb.php
@@ -659,8 +659,9 @@ protected function _conditions($conditions, $model, $schema, $context) {
 					$operations = $result;
 					break;
 				}
+				$operations += $this->_operator($model, $key, $op, $val, $schema);
 			}
-			$conditions[$key] = $result;
+			$conditions[$key] = $operations;
 		}
 		return $conditions;
 	}

diff --git a/libraries/lithium/tests/cases/data/source/MongoDbTest.php b/libraries/lithium/tests/cases/data/source/MongoDbTest.php
@@ -622,6 +622,12 @@ public function testNestedObjectCasting() {
 		$this->assertIdentical(true, $result['notifications']->bar);
 		$this->assertIdentical(false, $result['notifications']->baz);
 	}
+
+	public function testMultiOperationConditions() {
+		$conditions = array('loc' => array('$near' => array(50, 50), '$maxDistance' => 5));
+		$result = $this->db->conditions($conditions, $this->query);
+		$this->assertEqual($conditions, $result);
+	}
 }
 
 ?>