use QueryExecuted@toRawSql

Author: rodrigopedra

src/QueryLogger/QueryLogger.php

@@ -1,20 +1,8 @@
 <?php
 
-/*
- * The regular expression used in the `prepareQuery()` method and
- * the quote emulation used in the `quote()` method where extracted
- * from the "barryvdh/laravel-debugbar" package available at:
- *
- * https://github.com/barryvdh/laravel-debugbar/tree/6420113d90bb746423fa70b9940e9e7c26ebc121
- *
- * "barryvdh/laravel-debugbar" is licensed under MIT. License is available at:
- *
- * https://github.com/barryvdh/laravel-debugbar/blob/6420113d90bb746423fa70b9940e9e7c26ebc121/LICENSE
- */
-
 namespace RodrigoPedra\QueryLogger;
 
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\Arr;
 use Psr\Log\LoggerInterface;
@@ -23,91 +11,21 @@
 {
     public function __construct(
         private LoggerInterface $logger,
-        private Repository $config,
+        private ConnectionResolverInterface $db,
     ) {}
 
     public function handle(QueryExecuted $event): void
     {
-        $pdo = \method_exists($event->connection, 'getPdo')
-            ? $event->connection->getPdo()
-            : null;
-
-        $dateFormat = $event->connection->getQueryGrammar()->getDateFormat();
-
-        $bindings = $event->connection->prepareBindings($event->bindings);
-        $bindings = \array_map(fn ($value) => $this->prepareValue($pdo, $dateFormat, $value), $bindings);
-
-        $query = $this->prepareQuery($event->sql, $bindings);
-
-        $this->logger->info($query, [
+        $this->logger->debug($event->toRawSql(), [
             'time' => $event->time,
             'connection' => $event->connectionName,
-            'database' => $this->config->get("database.connections.{$event->connectionName}.database"),
+            'database' => $this->db->connection($event->connectionName)->getDatabaseName(),
             'bindings' => $event->bindings,
             'callSpot' => $this->guessCallSpot(),
         ]);
     }
 
-    protected function prepareQuery(string $query, array $bindings): string
-    {
-        foreach ($bindings as $key => $value) {
-            $regex = \is_numeric($key)
-                ? "/(?<!\?)\?(?=(?:[^'\\\']*'[^'\\']*')*[^'\\\']*$)(?!\?)/"
-                : "/:$key(?=(?:[^'\\\']*'[^'\\\']*')*[^'\\\']*$)/";
-
-            $query = \preg_replace($regex, $value, $query, 1);
-        }
-
-        return $query;
-    }
-
-    protected function prepareValue(?\PDO $pdo, string $dateFormat, $value): string
-    {
-        if (\is_null($value)) {
-            return 'NULL';
-        }
-
-        if (\is_bool($value)) {
-            return $value ? '1' : '0';
-        }
-
-        if (\is_int($value) || \is_float($value)) {
-            return \strval($value);
-        }
-
-        if (\is_string($value) && ! \mb_check_encoding($value, 'UTF-8')) {
-            return $this->quote($pdo, '[BINARY DATA]');
-        }
-
-        if ($value instanceof \DateTimeInterface) {
-            $value = $value->format($dateFormat);
-        }
-
-        if ($value instanceof \Stringable) {
-            $value = \strval($value);
-        }
-
-        if (\is_object($value) && \method_exists($value, 'toString')) {
-            $value = $value->toString();
-        }
-
-        // objects not implementing __toString() or toString() will fail here
-        return $this->quote($pdo, \strval($value));
-    }
-
-    protected function quote(?\PDO $pdo, string $value): string
-    {
-        if ($pdo) {
-            return $pdo->quote($value);
-        }
-
-        $search = ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"];
-        $replace = ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"];
-
-        return "'" . \str_replace($search, $replace, $value) . "'";
-    }
-
-    protected function guessCallSpot(): array
+    private function guessCallSpot(): array
     {
         $stack = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS);
         $vendor = \DIRECTORY_SEPARATOR . 'vendor' . \DIRECTORY_SEPARATOR;

src/QueryLogger/QueryLoggerServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace RodrigoPedra\QueryLogger;
 
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\ServiceProvider;
@@ -13,9 +12,9 @@ class QueryLoggerServiceProvider extends ServiceProvider
         QueryLogger::class,
     ];
 
-    public function boot(Repository $config, Dispatcher $events): void
+    public function boot(Dispatcher $events): void
     {
-        if ($config->get('app.debug') === true) {
+        if ($this->app->hasDebugModeEnabled()) {
             $events->listen(QueryExecuted::class, QueryLogger::class);
         }
     }