refactor query builder (#4)

norbybaru · Jul 8, 2022 · 3136fad · 3136fad
1 parent 81ae228
commit 3136fad
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/src/Builder/QueryBuilder.php b/src/Builder/QueryBuilder.php
diff --git a/src/Builder/TimestreamQueryBuilder.php b/src/Builder/TimestreamQueryBuilder.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace NorbyBaru\AwsTimestream\Builder;
+
+final class TimestreamQueryBuilder extends Builder
+{
+    public function __construct()
+    {
+        $this->builder();
+    }
+
+    /**
+     * Build SQL query
+     *
+     * @return void
+     */
+    protected function builder(): void
+    {}
+
+    public static function query(): self
+    {
+        return new self();
+    }
+}
diff --git a/src/TimestreamBuilder.php b/src/TimestreamBuilder.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Carbon;
 use NorbyBaru\AwsTimestream\Builder\PayloadBuilder;
-use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
+use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
 use NorbyBaru\AwsTimestream\Contract\PayloadBuilderContract;
 use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
 
@@ -42,6 +42,6 @@ public static function commonAttributes(array $attributes): array
 
     public static function query(): QueryBuilderContract
     {
-        return QueryBuilder::query();
+        return TimestreamQueryBuilder::query();
     }
 }
diff --git a/src/TimestreamServiceProvider.php b/src/TimestreamServiceProvider.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use NorbyBaru\AwsTimestream\Builder\PayloadBuilder;
-use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
+use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
 use NorbyBaru\AwsTimestream\Contract\PayloadBuilderContract;
 use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
 
@@ -19,7 +19,7 @@ public function register()
     {
         $this->mergeConfigFrom($this->configPath(), 'timestream');
 
-        $this->app->bind(QueryBuilderContract::class, QueryBuilder::class);
+        $this->app->bind(QueryBuilderContract::class, TimestreamQueryBuilder::class);
         $this->app->bind(PayloadBuilderContract::class, PayloadBuilder::class);
 
         $this->app->singleton(TimestreamManager::class, function ($app) {

diff --git a/tests/Unit/QueryBuilderUnitTest.php b/tests/Unit/QueryBuilderUnitTest.php
@@ -2,7 +2,7 @@
 
 namespace NorbyBaru\AwsTimestream\Tests\Unit;
 
-use NorbyBaru\AwsTimestream\Builder\QueryBuilder;
+use NorbyBaru\AwsTimestream\Builder\TimestreamQueryBuilder;
 use NorbyBaru\AwsTimestream\Contract\QueryBuilderContract;
 use NorbyBaru\AwsTimestream\Tests\TestCase;
 use NorbyBaru\AwsTimestream\TimestreamBuilder;
@@ -74,7 +74,7 @@ public function test_it_can_build_where_in_query()
         $this->validateSql("WHERE state IN ('open','draft','published')", $query);
     }
 
-    private function validateSql(string $expected, QueryBuilder $builder)
+    private function validateSql(string $expected, TimestreamQueryBuilder $builder)
     {
         $this->assertEquals($expected, trim($builder->getSql()));
     }