Merge pull request #15 from kuchy/disable-split-word-search-support

Support for exactSearch/splitWordsSearch properties in FilterText.

Author: paveljanda

src/NetteDatabaseDataSource.php

@@ -293,16 +293,24 @@ public function applyFilterText(Filter\FilterText $filter)
 		$big_or = '(';
 		$big_or_args = [];
 		$condition = $filter->getCondition();
+		$isSeachExact = $filter->isExactSearch();
+		$operator = $isSeachExact ? '=' : 'LIKE';
 
 		foreach ($condition as $column => $value) {
-			$words = explode(' ', $value);
 
 			$like = '(';
 			$args = [];
 
-			foreach ($words as $word) {
-				$like .= "$column LIKE ? OR ";
-				$args[] = "%$word%";
+			if ($filter->hasSplitWordsSearch() === FALSE) {
+				$like .= "$column $operator ? OR ";
+				$args[] = $isSeachExact ? $value :"%$value%";
+			}else{
+				$words = explode(' ', $value);
+
+				foreach ($words as $word) {
+					$like .= "$column $operator ? OR ";
+					$args[] = $isSeachExact ? $word : "%$word%";
+				}
 			}
 
 			$like = substr($like, 0, strlen($like) - 4).')';

tests/Cases/NetteDatabaseDataSourceTest.phpt

@@ -85,6 +85,81 @@ final class NetteDatabaseDataSourceTest extends TestCase
 		Assert::same([1], $q[1]);
 	}
 
+	public function testApplyFilterText()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name', ['name']);
+		$filter->setValue('text');
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE (name LIKE ?)', $q[0]);
+		Assert::same(['%text%'], $q[1]);
+	}
+
+	public function testApplyFilterTextDouble()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
+		$filter->setValue('text');
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE ((name LIKE ?) OR (id LIKE ?))', $q[0]);
+		Assert::same(['%text%', '%text%'], $q[1]);
+	}
+
+	public function testApplyFilterTextSplitWordsSearch()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
+		$filter->setValue('text alternative');
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE ((name LIKE ? OR name LIKE ?) OR (id LIKE ? OR id LIKE ?))', $q[0]);
+		Assert::same(['%text%', '%alternative%', '%text%', '%alternative%'], $q[1]);
+	}
+
+	public function testApplyFilterTextSplitWordsSearchDisabled()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
+		$filter->setValue('text alternative');
+		$filter->setSplitWordsSearch(False);
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE ((name LIKE ?) OR (id LIKE ?))', $q[0]);
+		Assert::same(['%text alternative%', '%text alternative%'], $q[1]);
+	}
+
+	public function testApplyFilterTextExactSearch()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
+		$filter->setValue('text');
+		$filter->setExactSearch();
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE ((name = ?) OR (id = ?))', $q[0]);
+		Assert::same(['text', 'text'], $q[1]);
+	}
+
+	public function testApplyFilterTextSplitWordsSearchDisabledExact()
+	{
+		$s = new NetteDatabaseDataSource($this->db, 'SELECT * FROM user');
+		$filter = new FilterText($this->grid, 'name', 'Name or id', ['name', 'id']);
+		$filter->setValue('text with space');
+		$filter->setSplitWordsSearch(False);
+		$filter->setExactSearch();
+		$s->applyFilterText($filter);
+		$q = $s->getQuery();
+
+		Assert::same('SELECT * FROM user WHERE ((name = ?) OR (id = ?))', $q[0]);
+		Assert::same(['text with space', 'text with space'], $q[1]);
+	}
 
 	public function testComplexQuery()
 	{