Skip to content

Commit 3136fad

Browse files
authored
refactor query builder (norbybaru#4)
1 parent 81ae228 commit 3136fad

File tree

5 files changed

+30
-26
lines changed

5 files changed

+30
-26
lines changed

src/Builder/QueryBuilder.php

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
namespace NorbyBaru\AwsTimestream\Builder;
4+
5+
final class TimestreamQueryBuilder extends Builder
6+
{
7+
public function __construct()
8+
{
9+
$this->builder();
10+
}
11+
12+
/**
13+
* Build SQL query
14+
*
15+
* @return void
16+
*/
17+
protected function builder(): void
18+
{}
19+
20+
public static function query(): self
21+
{
22+
return new self();
23+
}
24+
}

src/TimestreamBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Illuminate\Support\Carbon;
66
use NorbyBaru\AwsTimestream\Builder\PayloadBuilder;
7-
use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
7+
use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
88
use NorbyBaru\AwsTimestream\Contract\PayloadBuilderContract;
99
use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
1010

@@ -42,6 +42,6 @@ public static function commonAttributes(array $attributes): array
4242

4343
public static function query(): QueryBuilderContract
4444
{
45-
return QueryBuilder::query();
45+
return TimestreamQueryBuilder::query();
4646
}
4747
}

src/TimestreamServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Illuminate\Support\ServiceProvider;
66
use NorbyBaru\AwsTimestream\Builder\PayloadBuilder;
7-
use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
7+
use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
88
use NorbyBaru\AwsTimestream\Contract\PayloadBuilderContract;
99
use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
1010

@@ -19,7 +19,7 @@ public function register()
1919
{
2020
$this->mergeConfigFrom($this->configPath(), 'timestream');
2121

22-
$this->app->bind(QueryBuilderContract::class, QueryBuilder::class);
22+
$this->app->bind(QueryBuilderContract::class, TimestreamQueryBuilder::class);
2323
$this->app->bind(PayloadBuilderContract::class, PayloadBuilder::class);
2424

2525
$this->app->singleton(TimestreamManager::class, function ($app) {

tests/Unit/QueryBuilderUnitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace NorbyBaru\AwsTimestream\Tests\Unit;
44

5-
use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
5+
use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
66
use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
77
use NorbyBaru\AwsTimestream\Tests\TestCase;
88
use NorbyBaru\AwsTimestream\TimestreamBuilder;
@@ -74,7 +74,7 @@ public function test_it_can_build_where_in_query()
7474
$this->validateSql("WHERE state IN ('open','draft','published')", $query);
7575
}
7676

77-
private function validateSql(string $expected, QueryBuilder $builder)
77+
private function validateSql(string $expected, TimestreamQueryBuilder $builder)
7878
{
7979
$this->assertEquals($expected, trim($builder->getSql()));
8080
}

0 commit comments

Comments
 (0)