Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"require-dev": {
"ext-sqlite3": "*",
"fakerphp/faker": "^1.18",
"phpunit/phpunit": "^6.0|^8.0|^9.0|^10.0|^11.0"
"phpunit/phpunit": "^6.0|^8.0|^9.0|^10.0|^11.0|^12.0"
},
"autoload": {
"psr-4": {
Expand Down
35 changes: 34 additions & 1 deletion src/Compoships.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
namespace Awobaz\Compoships;

use Awobaz\Compoships\Database\Eloquent\Concerns\HasRelationships;
use Awobaz\Compoships\Database\Grammar\MariaDbGrammar;
use Awobaz\Compoships\Database\Grammar\MySqlGrammar;
use Awobaz\Compoships\Database\Grammar\PostgresGrammar;
use Awobaz\Compoships\Database\Grammar\SQLiteGrammar;
use Awobaz\Compoships\Database\Grammar\SqlServerGrammar;
use Awobaz\Compoships\Database\Query\Builder as QueryBuilder;
use Illuminate\Support\Str;

Expand Down Expand Up @@ -45,6 +50,34 @@ protected function newBaseQueryBuilder()
{
$connection = $this->getConnection();

return new QueryBuilder($connection, $connection->getQueryGrammar(), $connection->getPostProcessor());
switch ($connection->getDriverName()) {
case 'mysql':
$grammar = new MySqlGrammar($connection);
break;
case 'pgsql':
$grammar = new PostgresGrammar($connection);
break;
case 'sqlite':
$grammar = new SqliteGrammar($connection);
break;
case 'sqlsrv':
$grammar = new SqlServerGrammar($connection);
break;
case 'mariadb':
$grammar = new MariaDbGrammar($connection);
break;
default:
$grammar = $connection->getQueryGrammar();
}

if (method_exists($grammar, 'setConnection')) {
$grammar->setConnection($connection);
}

if (method_exists($grammar, 'withTablePrefix')) {
$grammar = $connection->withTablePrefix($grammar);
}

return new QueryBuilder($connection, $grammar, $connection->getPostProcessor());
}
}
21 changes: 21 additions & 0 deletions src/Database/Grammar/Concerns/CompileRowNumber.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace Awobaz\Compoships\Database\Grammar\Concerns;

trait CompileRowNumber
{
protected function compileRowNumber($partition, $orders)
{
if (!is_array($partition)) {
return parent::compileRowNumber($partition, $orders);
}

$columns = implode(', ', array_map(function ($p) {
return $this->wrap($p);
}, $partition));

$over = trim('partition by '.$columns.' '.$orders);

return ', row_number() over ('.$over.') as '.$this->wrap('laravel_row');
}
}
11 changes: 11 additions & 0 deletions src/Database/Grammar/MariaDbGrammar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Awobaz\Compoships\Database\Grammar;

use Awobaz\Compoships\Database\Grammar\Concerns\CompileRowNumber;
use Illuminate\Database\Query\Grammars\MariaDbGrammar as BaseMySqlGrammar;

class MariaDbGrammar extends BaseMySqlGrammar
{
use CompileRowNumber;
}
11 changes: 11 additions & 0 deletions src/Database/Grammar/MySqlGrammar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Awobaz\Compoships\Database\Grammar;

use Awobaz\Compoships\Database\Grammar\Concerns\CompileRowNumber;
use Illuminate\Database\Query\Grammars\MySqlGrammar as BaseMySqlGrammar;

class MySqlGrammar extends BaseMySqlGrammar
{
use CompileRowNumber;
}
11 changes: 11 additions & 0 deletions src/Database/Grammar/PostgresGrammar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Awobaz\Compoships\Database\Grammar;

use Awobaz\Compoships\Database\Grammar\Concerns\CompileRowNumber;
use Illuminate\Database\Query\Grammars\PostgresGrammar as BasePostgresGrammar;

class PostgresGrammar extends BasePostgresGrammar
{
use CompileRowNumber;
}
11 changes: 11 additions & 0 deletions src/Database/Grammar/SQLiteGrammar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Awobaz\Compoships\Database\Grammar;

use Awobaz\Compoships\Database\Grammar\Concerns\CompileRowNumber;
use Illuminate\Database\Query\Grammars\SQLiteGrammar as BaseSQLiteGrammar;

class SQLiteGrammar extends BaseSQLiteGrammar
{
use CompileRowNumber;
}
11 changes: 11 additions & 0 deletions src/Database/Grammar/SqlServerGrammar.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Awobaz\Compoships\Database\Grammar;

use Awobaz\Compoships\Database\Grammar\Concerns\CompileRowNumber;
use Illuminate\Database\Query\Grammars\SqlServerGrammar as BaseSqlServerGrammar;

class SqlServerGrammar extends BaseSqlServerGrammar
{
use CompileRowNumber;
}
51 changes: 51 additions & 0 deletions tests/Unit/LimitTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?php

namespace Awobaz\Compoships\Tests\Unit;

use Awobaz\Compoships\Tests\Models\User;
use Awobaz\Compoships\Tests\TestCase\TestCase;
use Illuminate\Database\Eloquent\Model;

class LimitTest extends TestCase
{
/**
* @covers \Awobaz\Compoships\Database\Grammar\MySqlGrammar
*/
public function test_relation_limit()
{
if (getLaravelVersion() < 11.0) {
$this->markTestIncomplete('This test will not work on laravel 10.x or earlier.');
}

Model::unguard();

$user = User::create([
'booking_id' => '123',
]);

for ($i = 0; $i < 5; $i++) {
$user->allocations()->create([
'booking_id' => '123',
]);
}

$allocations = $user->allocations()->get();
$this->assertCount(5, $allocations);

$user = $user->fresh();
$user->load([
'allocations' => function ($query) {
$query->limit(4);
},
]);
$this->assertCount(4, $user->allocations);

$user = $user->fresh();
$user->load([
'allocations' => function ($query) {
$query->limit(2);
},
]);
$this->assertCount(2, $user->allocations);
}
}
2 changes: 2 additions & 0 deletions tests/Unit/RelationWithEnumTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public function setUp(): void
$this->markTestSkipped('This test requires PHP 8.1 or higher');
}

parent::setUp();

Model::unguard();

$user = new User();
Expand Down