fix: preg_replace evaluate double backslash for mysql driver and keep…

… only one backslash instead of keep both backslash
barryvdh · Oct 20, 2023 · 8868e83 · 8868e83
1 parent b736241
commit 8868e83
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/src/DataCollector/QueryCollector.php b/src/DataCollector/QueryCollector.php
@@ -161,6 +161,9 @@ public function addQuery($query, $bindings, $time, $connection)
                     if ($pdo) {
                         try {
                             $binding = $pdo->quote((string) $binding);
+
+                            // Double escape backslashes because preg_replace evaluate backslashes
+                            $binding = addcslashes($binding, "\\");
                         } catch (\Exception $e) {
                             $binding = $this->emulateQuote($binding);
                         }

diff --git a/tests/DataCollector/QueryCollectorTest.php b/tests/DataCollector/QueryCollectorTest.php
@@ -2,7 +2,10 @@
 
 namespace Barryvdh\Debugbar\Tests\DataCollector;
 
+use Barryvdh\Debugbar\Tests\Models\Person;
+use Barryvdh\Debugbar\Tests\Models\User;
 use Barryvdh\Debugbar\Tests\TestCase;
+use Illuminate\Database\DatabaseManager;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Arr;
 
@@ -58,4 +61,52 @@ public function testDollarBindingsArePresentedCorrectly()
             );
         });
     }
+
+    public function testModelBindingsArePresentedCorrectlyWithSqliteDriver()
+    {
+        // Default connection "testing" running on sqlite pdo driver
+
+        debugbar()->boot();
+
+        /** @var \Barryvdh\Debugbar\DataCollector\QueryCollector $collector */
+        $collector = debugbar()->getCollector('queries');
+        $collector->addQuery(
+            "SELECT a FROM b WHERE c = ? AND d = ? AND e = :user",
+            [User::class, Person::class, 'user' => User::class],
+            0,
+            $this->app['db']->connection()
+        );
+
+        tap(Arr::first($collector->collect()['statements']), function (array $statement) {
+            $this->assertEquals(<<<SQL
+                SELECT a FROM b WHERE c = 'Barryvdh\Debugbar\Tests\Models\User' AND d = 'Barryvdh\Debugbar\Tests\Models\Person' AND e = 'Barryvdh\Debugbar\Tests\Models\User'
+                SQL,
+                $statement['sql']
+            );
+        });
+    }
+
+    public function testModelBindingsArePresentedCorrectlyWithMysqlDriver()
+    {
+        $this->markTestSkipped('Unknown how to run only MySQL driver test (I dont know how to use pdo_mysql driver)');
+
+        debugbar()->boot();
+
+        /** @var \Barryvdh\Debugbar\DataCollector\QueryCollector $collector */
+        $collector = debugbar()->getCollector('queries');
+        $collector->addQuery(
+            "SELECT a FROM b WHERE c = ? AND d = ? AND e = :user",
+            [User::class, Person::class, 'user' => User::class],
+            0,
+            $this->app['db']->connection()
+        );
+
+        tap(Arr::first($collector->collect()['statements']), function (array $statement) {
+            $this->assertEquals(<<<SQL
+                SELECT a FROM b WHERE c = 'Barryvdh\\\\Debugbar\\\\Tests\\\\Models\\\\User' AND d = 'Barryvdh\\\\Debugbar\\\\Tests\\\\Models\\\\Person' AND e = 'Barryvdh\\\\Debugbar\\\\Tests\\\\Models\\\\User'
+                SQL,
+                $statement['sql']
+            );
+        });
+    }
 }