fix distinct problems in paginator.

2012-02-06 15:28:03 -06:00
parent e89082e3ba
commit cd17761f72
2 changed files with 10 additions and 13 deletions
--- a/laravel/database/query/grammars/grammar.php
+++ b/laravel/database/query/grammars/grammar.php
@@ -93,7 +93,9 @@ class Grammar extends \Laravel\Database\Grammar {
 	 */
 	protected function aggregate(Query $query)
 	{
-		$column = $this->wrap($query->aggregate['column']);
+		$column = $this->columnize($query->aggregate['columns']);
+
+		if ($query->distinct and $column !== '*') $column = 'DISTINCT '.$column;

 		return 'SELECT '.$query->aggregate['aggregator'].'('.$column.')';
 	}