DataSources: Added DISTINCT to suggestion SELECT [Closed #100]

o5 · Mar 25, 2014 · 41e1626 · 41e1626
1 parent 84b51b3
commit 41e1626
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/Grido/DataSources/DibiFluent.php b/Grido/DataSources/DibiFluent.php
@@ -142,6 +142,8 @@ public function sort(array $sorting)
     public function suggest($column, array $conditions, $limit)
     {
         $fluent = clone $this->fluent;
+        is_string($column) && $fluent->removeClause('SELECT')->select("DISTINCT $column");
+
         foreach ($conditions as $condition) {
             $this->makeWhere($condition, $fluent);
         }

diff --git a/Grido/DataSources/Doctrine.php b/Grido/DataSources/Doctrine.php
@@ -237,6 +237,14 @@ public function suggest($column, array $conditions, $limit)
         $qb = clone $this->qb;
         $qb->setMaxResults($limit);
 
+        if (is_string($column)) {
+            $mapping = isset($this->filterMapping[$column])
+                ? $this->filterMapping[$column]
+                : $qb->getRootAlias() . '.' . $column;
+
+            $qb->select($mapping)->distinct();
+        }
+
         foreach ($conditions as $condition) {
             $this->makeWhere($condition, $qb);
         }
@@ -245,11 +253,7 @@ public function suggest($column, array $conditions, $limit)
         $data = $qb->getQuery()->getScalarResult();
         foreach ($data as $row) {
             if (is_string($column)) {
-                $mapping = isset($this->filterMapping[$column])
-                    ? str_replace('.', '_', $this->filterMapping[$column])
-                    : $qb->getRootAlias() . '_' . $column;
-
-                $value = (string) $row[$mapping];
+                $value = (string) current($row);
                 $items[$value] = $value;
             } elseif (is_callable($column)) {
                 $value = (string) $column($row);

diff --git a/Grido/DataSources/NetteDatabase.php b/Grido/DataSources/NetteDatabase.php
@@ -116,6 +116,7 @@ public function sort(array $sorting)
     public function suggest($column, array $conditions, $limit)
     {
         $selection = clone $this->selection;
+        is_string($column) && $selection->select("DISTINCT $column");
         $selection->limit($limit);
 
         foreach ($conditions as $condition) {

diff --git a/tests/Grido/DataSources/DibiFluent.phpt b/tests/Grido/DataSources/DibiFluent.phpt
@@ -46,7 +46,8 @@ class DibiFluentTest extends DataSourceTestCase
             $grid->addColumnText('country', 'Country')
                 ->setSortable()
                 ->setFilterText()
-                    ->setSuggestion();
+                    ->setColumn('c.title')
+                    ->setSuggestion('title');
 
             $grid->addFilterCheck('male', 'Only male')
                 ->setCondition(array(