refactor

recca0120 · Jun 9, 2021 · 74a9731 · 74a9731
1 parent bf96b8d
commit 74a9731
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 44 deletions.
diff --git a/src/Converter.php b/src/Converter.php
@@ -50,6 +50,6 @@ public function handle($binding)
             return $binding ? 1 : 0;
         }
 
-        return $binding ?? 'NULL';
+        return $binding ?: 'NULL';
     }
 }
diff --git a/src/Dumper.php b/src/Dumper.php
@@ -67,7 +67,7 @@ public function setGrammar($grammar)
      */
     public function dump($sql, $bindings, $format = true)
     {
-        $raw = vsprintf($this->toSql($sql), $this->toBindings($bindings));
+        $raw = $this->bindValues($sql, $bindings);
 
         return $format ? $this->format($raw) : $raw;
     }
@@ -76,26 +76,21 @@ public function dump($sql, $bindings, $format = true)
      * @param string $sql
      * @return string
      */
-    protected function format($sql)
+    private function format($sql)
     {
         return Formatter::format($sql);
     }
 
     /**
      * @param string $sql
-     * @return string
-     */
-    private function toSql($sql)
-    {
-        return str_replace(['%', '?'], ['%%', '%s'], $this->grammar->columnize($sql));
-    }
-
-    /**
      * @param array $bindings
-     * @return array|string[]
+     * @return string
      */
-    private function toBindings($bindings)
+    private function bindValues($sql, $bindings)
     {
-        return array_map([$this->converter, 'handle'], $bindings);
+        return vsprintf(
+            str_replace(['%', '?'], ['%%', '%s'], $this->grammar->columnize($sql)),
+            array_map([$this->converter, 'handle'], $bindings)
+        );
     }
 }
diff --git a/src/EloquentDumperServiceProvider.php b/src/EloquentDumperServiceProvider.php
@@ -3,8 +3,8 @@
 namespace Recca0120\EloquentDumper;
 
 use Closure;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Arr;
 use Illuminate\Support\ServiceProvider;
 
@@ -27,10 +27,13 @@ public function register()
 
         $this->app->singleton(EloquentHelper::class, EloquentHelper::class);
 
-        Builder::macro('sql', self::sql());
-        QueryBuilder::macro('sql', self::sql());
-        Builder::macro('dumpSql', self::dump());
-        QueryBuilder::macro('dumpSql', self::dump());
+        $this->registerBuilderMicro('toRawSql', function () {
+            return app(EloquentHelper::class)->toRawSql($this);
+        });
+
+        $this->registerBuilderMicro('dumpSql', function () {
+            return app(EloquentHelper::class)->dumpSql($this);
+        });
     }
 
     /**
@@ -47,23 +50,9 @@ public function boot()
         }
     }
 
-    /**
-     * @return Closure
-     */
-    private static function sql()
-    {
-        return function () {
-            return app(EloquentHelper::class)->sql($this);
-        };
-    }
-
-    /**
-     * @return Closure
-     */
-    private static function dump()
+    private function registerBuilderMicro(string $method, Closure $closure)
     {
-        return function () {
-            return app(EloquentHelper::class)->dump($this);
-        };
+        Builder::macro($method, $closure);
+        EloquentBuilder::macro($method, $closure);
     }
 }
diff --git a/src/EloquentHelper.php b/src/EloquentHelper.php
@@ -32,20 +32,20 @@ public function __construct(Application $app)
      * @param QueryBuilder|Builder $query
      * @return string
      */
-    public function sql($query)
+    public function toRawSql($query, $format = false)
     {
         $this->dumper->setPdo($query->getConnection()->getPdo());
 
-        return $this->dumper->dump($query->toSql(), $query->getBindings());
+        return $this->dumper->dump($query->toSql(), $query->getBindings(), $format);
     }
 
     /**
      * @param QueryBuilder|Builder $query
      * @return Builder|QueryBuilder
      */
-    public function dump($query)
+    public function dumpSql($query)
     {
-        $sql = $this->sql($query);
+        $sql = $this->toRawSql($query, true);
 
         if ($this->app->runningInConsole()) {
             echo "\n".$sql."\n";
@@ -61,9 +61,10 @@ function_exists('dump') ? dump($sql) : var_dump($sql);
     public function getRawQueryLog($logs = [])
     {
         return array_map(function ($log) {
-            $log['query'] = $this->dumper->dump($log['query'], $log['bindings'], false);
-
-            return $log;
+            return [
+                'query' => $this->dumper->dump($log['query'], $log['bindings'], false),
+                'time' => $log['time'],
+            ];
         }, empty($logs) ? DB::getQueryLog() : $logs);
     }
 }