Do not rely on DB::connection() to get information in query collector (#1779)

Instead directly use the query's own connection object.

This makes it possible to log queries for custom non-sql connections
into debugbar relatively easily.

Related: ed37d1a
This commit introduced the usage of DB::connection().

Resolves: #1778

Author: cweiske

src/DataCollector/QueryCollector.php

@@ -196,7 +196,7 @@ public function addQuery($query)
             'time' => $time,
             'memory' => $this->lastMemoryUsage ? memory_get_usage(false) - $this->lastMemoryUsage : 0,
             'source' => $source,
-            'connection' => $query->connection->getName(),
+            'connection' => $query->connection,
             'driver' => $query->connection->getConfig('driver'),
             'hints' => ($this->showHints && !$limited) ? $hints : null,
             'show_copy' => $this->showCopyButton,
@@ -459,7 +459,7 @@ public function collectTransactionEvent($event, $connection)
             'time' => 0,
             'memory' => 0,
             'source' => $source,
-            'connection' => $connection->getName(),
+            'connection' => $connection,
             'driver' => $connection->getConfig('driver'),
             'hints' => null,
             'show_copy' => false,
@@ -496,7 +496,7 @@ public function collect()
             $totalTime += $query['time'];
             $totalMemory += $query['memory'];
 
-            $connectionName = DB::connection($query['connection'])->getDatabaseName();
+            $connectionName = $query['connection']->getDatabaseName();
             if (str_ends_with($connectionName, '.sqlite')) {
                 $connectionName = $this->normalizeFilePath($connectionName);
             }
@@ -526,9 +526,9 @@ public function collect()
                 'explain' => $this->explainQuery && $canExplainQuery ? [
                     'url' => route('debugbar.queries.explain'),
                     'driver' => $query['driver'],
-                    'connection' => $query['connection'],
+                    'connection' => $query['connection']->getName(),
                     'query' => $query['query'],
-                    'hash' => (new Explain())->hash($query['connection'], $query['query'], $query['bindings']),
+                    'hash' => (new Explain())->hash($query['connection']->getName(), $query['query'], $query['bindings']),
                 ] : null,
             ];
         }
@@ -630,9 +630,9 @@ public function getWidgets()
     private function getSqlQueryToDisplay(array $query): string
     {
         $sql = $query['query'];
-        if ($query['type'] === 'query' && $this->renderSqlWithParams && DB::connection($query['connection'])->getQueryGrammar() instanceof \Illuminate\Database\Query\Grammars\Grammar && method_exists(DB::connection($query['connection'])->getQueryGrammar(), 'substituteBindingsIntoRawSql')) {
+        if ($query['type'] === 'query' && $this->renderSqlWithParams && $query['connection']->getQueryGrammar() instanceof \Illuminate\Database\Query\Grammars\Grammar && method_exists($query['connection']->getQueryGrammar(), 'substituteBindingsIntoRawSql')) {
             try {
-                $sql = DB::connection($query['connection'])->getQueryGrammar()->substituteBindingsIntoRawSql($sql, $query['bindings'] ?? []);
+                $sql = $query['connection']->getQueryGrammar()->substituteBindingsIntoRawSql($sql, $query['bindings'] ?? []);
                 return $this->getDataFormatter()->formatSql($sql);
             } catch (\Throwable $e) {
                 // Continue using the old substitute