support query builder

Author: PyaeSoneAungRgn

README.md

@@ -23,6 +23,14 @@ User::where('votes', '>', 100)
 // "select * from `users` where `votes` > 100 or (`name` = 'Abigail' and `votes` > 50)"
 ```
 
+```php
+DB::table('users')
+   ->whereBetween('votes', [1, 100])
+   ->toRawSql();
+
+// "select * from `users` where `votes` between 1 and 100"
+```
+
 ## Why?
 `toSql()` doesn't bind values to it. Instead, it returns the raw SQL representation of the query as a string, including placeholders for any bound values.
 

src/Concerns/EloquentBuilderMacros.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace PyaeSoneAung\ToRawSql\Concerns;
+
+use Illuminate\Database\Eloquent\Builder;
+use PyaeSoneAung\ToRawSql\Services\BuilderToRawSqlService;
+
+trait EloquentBuilderMacros
+{
+    public function registerEloquentBuilderMacros()
+    {
+        Builder::macro('toRawSql', function (): string {
+            /**
+             * @var \Illuminate\Database\Eloquent\Builder $this
+             */
+            return (new BuilderToRawSqlService($this))->toRawSql();
+        });
+    }
+}

src/Concerns/QueryBuilderMacros.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace PyaeSoneAung\ToRawSql\Concerns;
+
+use Illuminate\Database\Query\Builder;
+use PyaeSoneAung\ToRawSql\Services\BuilderToRawSqlService;
+
+trait QueryBuilderMacros
+{
+    public function registerQueryBuilderMacros()
+    {
+        Builder::macro('toRawSql', function (): string {
+            /**
+             * @var \Illuminate\Database\Query\Builder $this
+             */
+            return (new BuilderToRawSqlService($this))->toRawSql();
+        });
+    }
+}

src/Services/BuilderToRawSqlService.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace PyaeSoneAung\ToRawSql\Services;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Support\Str;
+
+class BuilderToRawSqlService
+{
+    public function __construct(
+        public EloquentBuilder|QueryBuilder $builder
+    ) {
+    }
+
+    public function toRawSql(): string
+    {
+        $bindings = $this->builder->getBindings();
+        foreach ($bindings as $key => $value) {
+            if ($value instanceof DateTimeInterface) {
+                $bindings[$key] = "'{$value->format('Y-m-d H:i:s')}'";
+            } elseif (is_string($value)) {
+                $bindings[$key] = "'{$value}'";
+            } elseif (is_bool($value)) {
+                $bindings[$key] = (int) $value;
+            }
+        }
+
+        return Str::replaceArray('?', $bindings, $this->builder->toSql());
+    }
+}

src/ToRawSqlServiceProvider.php

@@ -2,33 +2,19 @@
 
 namespace PyaeSoneAung\ToRawSql;
 
-use DateTimeInterface;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Str;
+use PyaeSoneAung\ToRawSql\Concerns\EloquentBuilderMacros;
+use PyaeSoneAung\ToRawSql\Concerns\QueryBuilderMacros;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class ToRawSqlServiceProvider extends PackageServiceProvider
 {
+    use EloquentBuilderMacros, QueryBuilderMacros;
+
     public function boot(): void
     {
-        Builder::macro('toRawSql', function (): string {
-            /**
-             * @var \Illuminate\Database\Eloquent\Builder $this
-             */
-            $bindings = $this->getBindings();
-            foreach ($bindings as $key => $value) {
-                if ($value instanceof DateTimeInterface) {
-                    $bindings[$key] = "'{$value->format('Y-m-d H:i:s')}'";
-                } elseif (is_bool($value)) {
-                    $bindings[$key] = (int) $value;
-                } elseif (is_string($value)) {
-                    $bindings[$key] = "'{$value}'";
-                }
-            }
-
-            return Str::replaceArray('?', $bindings, $this->toSql());
-        });
+        $this->registerEloquentBuilderMacros();
+        $this->registerQueryBuilderMacros();
     }
 
     public function configurePackage(Package $package): void

tests/Pest.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use PyaeSoneAung\ToRawSql\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);
@@ -11,3 +12,8 @@ function users()
         protected $table = 'users';
     };
 }
+
+function usersTbl()
+{
+    return DB::table('users');
+}

tests/ToRawSqlTest.php

@@ -1,6 +1,6 @@
 <?php
 
-it('can execute toRawSql', function () {
+it('can execute toRawSql from eloquent builder', function () {
     expect(
         users()
             ->where('votes', '>', 100)
@@ -21,3 +21,25 @@
             ->toRawSql()
     )->toBe("select * from `users` where `votes` > 100 or (`name` = 'Abigail' and `votes` > 50) and `created_at` = '2023-02-10 13:22:38'");
 });
+
+it('can execute toRawSql from query builder', function () {
+    expect(
+        usersTbl()
+            ->where('votes', '>', 100)
+            ->orWhere(function ($query) {
+                $query->where('name', 'Abigail')
+                    ->where('votes', '>', 50);
+            })
+            ->where(
+                'created_at',
+                now()
+                    ->setYear(2023)
+                    ->setMonth(02)
+                    ->setDay(10)
+                    ->setHour(13)
+                    ->setMinute(22)
+                    ->setSecond(38)
+            )
+            ->toRawSql()
+    )->toBe("select * from `users` where `votes` > 100 or (`name` = 'Abigail' and `votes` > 50) and `created_at` = '2023-02-10 13:22:38'");
+});