Selection: added new method whereOr (#111)

Author: meridius

src/Database/Table/Selection.php

@@ -363,6 +363,40 @@ protected function condition($condition, array $params, $tableChain = NULL)
 	}
 
 
+	/**
+	 * Adds where condition using the OR operator between parameters.
+	 * More calls appends with AND.
+	 * @param  array ['column1' => 1, 'column2 > ?' => 2, 'full condition']
+	 * @return self
+	 * @throws \Nette\InvalidArgumentException
+	 */
+	public function whereOr(array $parameters)
+	{
+		if (count($parameters) < 2) {
+			return $this->where($parameters);
+		}
+		$columns = [];
+		$values = [];
+		foreach ($parameters as $key => $val) {
+			if (is_int($key)) { // whereOr(['full condition'])
+				$columns[] = $val;
+			} elseif (strpos($key, '?') === FALSE) { // whereOr(['column1' => 1])
+				$columns[] = $key . ' ?';
+				$values[] = $val;
+			} else { // whereOr(['column1 > ?' => 1])
+				$qNumber = substr_count($key, '?');
+				if ($qNumber > 1 && (!is_array($val) || $qNumber !== count($val))) {
+					throw new Nette\InvalidArgumentException('Argument count does not match placeholder count.');
+				}
+				$columns[] = $key;
+				$values = array_merge($values, $qNumber > 1 ? $val : [$val]);
+			}
+		}
+		$columnsString = '(' . implode(') OR (', $columns) . ')';
+		return $this->where($columnsString, $values);
+	}
+
+
 	/**
 	 * Adds order clause, more calls appends to the end.
 	 * @param  string for example 'column1, column2 DESC'

tests/Database/Table/Selection.whereOr().phpt

@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * Test: Nette\Database\Table: WhereOr operations
+ * @dataProvider? ../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/../connect.inc.php'; // create $connection
+
+Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../files/{$driverName}-nette_test1.sql");
+
+// without question mark
+test(function () use ($context) {
+	$count = $context->table('book')->whereOr([
+			'author_id' => 12,
+			'title' => 'JUSH',
+		])->count();
+	Assert::same(3, $count);
+});
+
+
+// full condition
+test(function () use ($context) {
+	$count = $context->table('book')->whereOr([
+			'translator_id IS NULL',
+			'title' => 'Dibi',
+		])->count();
+	Assert::same(2, $count);
+});
+
+
+// with question mark
+test(function () use ($context) {
+	$count = $context->table('book')->whereOr([
+			'id > ?' => 3,
+			'translator_id' => 11,
+		])->count();
+	Assert::same(2, $count);
+});
+
+
+// just one condition
+test(function () use ($context) {
+	$count = $context->table('book')->whereOr([
+			'id > ?' => 3,
+		])->count();
+	Assert::same(1, $count);
+});
+
+
+// with question mark
+test(function () use ($context) {
+	$count = $context->table('book')->whereOr([
+			'id ?' => [3, 4],
+			'translator_id' => 11,
+		])->count();
+	Assert::same(3, $count);
+});
+
+
+// multiple values for one key
+test(function () use ($context) {
+	$count = $context->table('author')->whereOr([
+			'id > ?' => 12,
+			'ROUND(id, ?) = ?' => [5, 3],
+		])->count();
+	Assert::same(1, $count);
+});
+
+
+// nested condition
+test(function () use ($context) {
+	$books = $context->table('book')->whereOr([
+			'id = ?' => 4,
+			'author_id = ? AND translator_id ?' => [11, null],
+	]);
+	Assert::same(2, $books->count());
+});
+
+
+// invalid param count
+test(function () use ($context) {
+	$f = function () use ($context) {
+		$context->table('author')->whereOr([
+				'id > ?' => 3,
+				'ROUND(id, ?) = ?' => [5],
+		])->count();
+	};
+	Assert::throws($f, '\Nette\InvalidArgumentException', 'Argument count does not match placeholder count.');
+});
+
+
+// invalid param count
+test(function () use ($context) {
+	$f = function () use ($context) {
+		$context->table('author')->whereOr([
+				'id > ?' => 3,
+				'ROUND(id, ?) = ?' => 5,
+		])->count();
+	};
+	Assert::throws($f, '\Nette\InvalidArgumentException', 'Argument count does not match placeholder count.');
+});