[10.x] Add getRawQueryLog() method (#47623)

* feature: add getRawQueryLog method

* feature: add @metohd annotation

* feature: add test

* fix typo

* feat use prepareBindings

* Update src/Illuminate/Support/Facades/DB.php

Co-authored-by: mpyw <[email protected]>

* Update src/Illuminate/Support/Facades/DB.php

Co-authored-by: Morten Harders <[email protected]>

* formatting

---------

Co-authored-by: mpyw <[email protected]>
Co-authored-by: Morten Harders <[email protected]>
Co-authored-by: Taylor Otwell <[email protected]>

Author: 4 people

src/Illuminate/Database/Connection.php

@@ -1548,6 +1548,22 @@ public function getQueryLog()
         return $this->queryLog;
     }
 
+    /**
+     * Get the connection query log with embedded bindings.
+     *
+     * @return array
+     */
+    public function getRawQueryLog()
+    {
+        return array_map(fn (array $log) => [
+            'raw_query' => $this->queryGrammar->substituteBindingsIntoRawSql(
+                $log['query'],
+                $this->prepareBindings($log['bindings'])
+            ),
+            'time' => $log['time'],
+        ], $this->getQueryLog());
+    }
+
     /**
      * Clear the query log.
      *

src/Illuminate/Support/Facades/DB.php

@@ -87,6 +87,7 @@
  * @method static void unsetTransactionManager()
  * @method static bool pretending()
  * @method static array getQueryLog()
+ * @method static array getRawQueryLog()
  * @method static void flushQueryLog()
  * @method static void enableQueryLog()
  * @method static void disableQueryLog()

tests/Database/DatabaseConnectionTest.php

@@ -502,6 +502,32 @@ public function testSchemaBuilderCanBeCreated()
         $this->assertSame($connection, $schema->getConnection());
     }
 
+    public function testGetRawQueryLog()
+    {
+        $mock = $this->getMockConnection(['getQueryLog']);
+        $mock->expects($this->once())->method('getQueryLog')->willReturn([
+            [
+                'query' => 'select * from tbl where col = ?',
+                'bindings' => [
+                    0 => 'foo',
+                ],
+                'time' => 1.23,
+            ]
+        ]);
+
+        $queryGrammar = $this->createMock(Grammar::class);
+        $queryGrammar->expects($this->once())
+            ->method('substituteBindingsIntoRawSql')
+            ->with('select * from tbl where col = ?', ['foo'])
+            ->willReturn("select * from tbl where col = 'foo'");
+        $mock->setQueryGrammar($queryGrammar);
+
+        $log = $mock->getRawQueryLog();
+
+        $this->assertEquals("select * from tbl where col = 'foo'", $log[0]['raw_query']);
+        $this->assertEquals(1.23, $log[0]['time']);
+    }
+
     protected function getMockConnection($methods = [], $pdo = null)
     {
         $pdo = $pdo ?: new DatabaseConnectionTestMockPDO;