API CHANGE Introduced DataQuery::whereAny() and SQLQuery::whereAny()

model/DataList.php

@@ -292,7 +292,7 @@ class DataList extends ViewableData implements SS_List {
 				$SQL_Statements[] = ('"'.$fieldName.'" != \''.Convert::raw2sql($value).'\'');
 			}
 		}
-		$this->dataQuery->where(implode(' OR ', $SQL_Statements));
+		$this->dataQuery->whereAny($SQL_Statements);
 		return $this;
 	}
 	

model/DataQuery.php

@@ -337,6 +337,23 @@ class DataQuery {
 			return $this;
 		}
 	}
+
+	/**
+	 * Set a WHERE with OR
+	 *
+	 * @param array $filter
+	 * @return DataQuery
+	 * @example $dataQuery->whereAny(array("Monkey = 'Chimp'", "Color = 'Brown'"));
+	 */
+	function whereAny($filter) {
+		if($filter) {
+			$clone = $this;
+			$clone->query->whereAny($filter);
+			return $clone;
+		} else {
+			return $this;
+		}
+	}
 	
 	/**
 	 * Set the ORDER BY clause of this query

model/SQLQuery.php

@@ -405,7 +405,16 @@ class SQLQuery {
 		
 		return $this;
 	}
-	
+
+	/**
+	 *
+	 */
+	function whereAny($filters) {
+		if(is_string($filters)) $filters = func_get_args();
+		$clause = implode(" OR ", $filters);
+		return $this->where($clause);
+	}
+		
 	/**
 	 * Use the disjunctive operator 'OR' to join filter expressions in the WHERE clause.
 	 */

tests/model/SQLQueryTest.php

@@ -234,6 +234,15 @@ class SQLQueryTest extends SapphireTest {
 			$query->sql()
 		);
 	}
+
+
+	public function testWhereAny() {
+		$query = new SQLQuery();
+		$query->from( 'MyTable' );
+
+		$query->whereAny(array("Monkey = 'Chimp'", "Color = 'Brown'"));
+		$this->assertEquals("SELECT * FROM MyTable WHERE (Monkey = 'Chimp' OR Color = 'Brown')",$query->sql());
+	}
 }
 
 class SQLQueryTest_DO extends DataObject implements TestOnly {