Commit 497c0f30 authored by Jens Segers's avatar Jens Segers

Added skip to aggregation

parent 92754b8e
......@@ -121,6 +121,7 @@ class Builder extends \Illuminate\Database\Query\Builder {
// Apply order and limit
if ($this->orders) $pipeline[] = array('$sort' => $this->orders);
if ($this->offset) $pipeline[] = array('$skip' => $this->offset);
if ($this->limit) $pipeline[] = array('$limit' => $this->limit);
$results = $this->collection->aggregate($pipeline);
......
......@@ -105,14 +105,14 @@ class Connection extends \Illuminate\Database\Connection {
$dsn .= "{$username}:{$password}@";
}
$dsn.= "{$host}";
$dsn .= "{$host}";
if (isset($config['port']))
{
$dsn .= ":{$port}";
}
$dsn.= "/{$database}";
$dsn .= "/{$database}";
return $dsn;
}
......
......@@ -244,10 +244,20 @@ class ModelQueryTest extends PHPUnit_Framework_TestCase {
$users = User::groupBy('age')->get();
$this->assertEquals(6, count($users));
$users = User::groupBy('age')->skip(1)->get();
$this->assertEquals(5, count($users));
$users = User::groupBy('age')->take(2)->get();
$this->assertEquals(2, count($users));
$users = User::groupBy('age')->orderBy('age', 'desc')->get();
$this->assertEquals(37, $users[0]->age);
$this->assertEquals(35, $users[1]->age);
$this->assertEquals(33, $users[2]->age);
$users = User::groupBy('age')->skip(1)->take(2)->orderBy('age', 'desc')->get();
$this->assertEquals(35, $users[0]->age);
$this->assertEquals(33, $users[1]->age);
}
public function testSubquery()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment