Merge pull request #10751 from KorsaR-ZN/issues-10749

[2.0.x] [NFR] \Mvc\Model\Criteria - fromImput #10749
phalcon · Aug 3, 2015 · 64ef70b · ogarbe · Aug 4, 2015 · ovr
2 parents 1629efc + b8244b9
commit 64ef70b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - Fixed Session\Bag::remove()
 - Session\Bag::destroy() eliminates any temporary data in the variables bag
 - afterCreate/afterUpdate are only called if saving related records was successful
+- Added parameter the changing concatenation conditions in method `Mvc\Model\Criteria::fromImput()` [#10749](https://github.com/phalcon/cphalcon/issues/10749)
 
 # [2.0.6](https://github.com/phalcon/cphalcon/releases/tag/phalcon-v2.0.6) (2015-07-21)
 - Builds in TravisCI now uses Docker to perform faster builds

diff --git a/phalcon/mvc/model/criteria.zep b/phalcon/mvc/model/criteria.zep
@@ -685,7 +685,7 @@ class Criteria implements CriteriaInterface, InjectionAwareInterface
 	/**
 	 * Builds a Phalcon\Mvc\Model\Criteria based on an input array like _POST
 	 */
-	public static function fromInput(<DiInterface> dependencyInjector, string! modelName, array! data) -> <Criteria>
+	public static function fromInput(<DiInterface> dependencyInjector, string! modelName, array! data, string! operator = "AND") -> <Criteria>
 	{
 		var attribute, conditions, field, value, type, metaData,
 			model, dataTypes, bind, criteria, columnMap;
@@ -736,7 +736,7 @@ class Criteria implements CriteriaInterface, InjectionAwareInterface
 		 */
 		let criteria = new self();
 		if count(conditions) {
-			criteria->where(join(" AND ", conditions));
+			criteria->where(join(" " . operator . " ", conditions));
 			criteria->bind(bind);
 		}
 

diff --git a/phalcon/mvc/model/criteriainterface.zep b/phalcon/mvc/model/criteriainterface.zep
@@ -192,7 +192,7 @@ interface CriteriaInterface
 	/**
 	 * Builds a Phalcon\Mvc\Model\Criteria based on an input array like _POST
 	 */
-	public static function fromInput(<DiInterface> dependencyInjector, string! modelName, array! data) -> <CriteriaInterface>;
+	public static function fromInput(<DiInterface> dependencyInjector, string! modelName, array! data, string! operator = "AND") -> <CriteriaInterface>;
 
 	/**
 	 * Executes a find using the parameters built with the criteria