Add try/catch for the substituteBindings (#1690)

barryvdh · Oct 18, 2024 · 6a79909 · 6a79909
1 parent b705c56
commit 6a79909
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/DataCollector/QueryCollector.php b/src/DataCollector/QueryCollector.php
@@ -623,8 +623,15 @@ private function getSqlQueryToDisplay(array $query): string
     {
         $sql = $query['query'];
         if ($query['type'] === 'query' && $this->renderSqlWithParams && method_exists(DB::connection($query['connection'])->getQueryGrammar(), 'substituteBindingsIntoRawSql')) {
-            $sql = DB::connection($query['connection'])->getQueryGrammar()->substituteBindingsIntoRawSql($sql, $query['bindings'] ?? []);
-        } elseif ($query['type'] === 'query' && $this->renderSqlWithParams) {
+            try {
+                $sql = DB::connection($query['connection'])->getQueryGrammar()->substituteBindingsIntoRawSql($sql, $query['bindings'] ?? []);
+                return $this->getDataFormatter()->formatSql($sql);
+            } catch (\Throwable $e) {
+                // Continue using the old substitute
+            }
+        }
+
+        if ($query['type'] === 'query' && $this->renderSqlWithParams) {
             $bindings = $this->getDataFormatter()->checkBindings($query['bindings']);
             if (!empty($bindings)) {
                 $pdo = null;