Move the queries to the Grammar classes and show the driver name

Author: GromNaN

src/Illuminate/Database/Connection.php

@@ -1347,24 +1347,6 @@ public function getDriverName()
         return $this->getConfig('driver');
     }
 
-    /**
-     * Get a human-readable name for the given connection.
-     */
-    public function getConnectionName(): string
-    {
-        return $this->getName().'('.$this->getDriverName().')';
-    }
-
-    /**
-     * Get the number of open connections for a database.
-     *
-     * @return int|null
-     */
-    public function getConnectionCount(): ?int
-    {
-        return null;
-    }
-
     /**
      * Get the query grammar used by the connection.
      *

src/Illuminate/Database/Console/DatabaseInspectionCommand.php

@@ -4,6 +4,11 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\MariaDbConnection;
+use Illuminate\Database\MySqlConnection;
+use Illuminate\Database\PostgresConnection;
+use Illuminate\Database\SQLiteConnection;
+use Illuminate\Database\SqlServerConnection;
 use Illuminate\Support\Arr;
 
 abstract class DatabaseInspectionCommand extends Command
@@ -14,10 +19,20 @@ abstract class DatabaseInspectionCommand extends Command
      * @param  \Illuminate\Database\ConnectionInterface  $connection
      * @param  string  $database
      * @return string
+     *
+     * @deprecated Use $connection->getName() instead.
      */
     protected function getConnectionName(ConnectionInterface $connection, $database)
     {
-        return method_exists($connection, 'getConnectionName') ? $connection->getConnectionName() : $database;
+        return match (true) {
+            $connection instanceof MariaDbConnection => 'MariaDB',
+            $connection instanceof MySqlConnection && $connection->isMaria() => 'MariaDB',
+            $connection instanceof MySqlConnection => 'MySQL',
+            $connection instanceof PostgresConnection => 'PostgreSQL',
+            $connection instanceof SQLiteConnection => 'SQLite',
+            $connection instanceof SqlServerConnection => 'SQL Server',
+            default => $database,
+        };
     }
 
     /**
@@ -28,7 +43,7 @@ protected function getConnectionName(ConnectionInterface $connection, $database)
      */
     protected function getConnectionCount(ConnectionInterface $connection)
     {
-        return method_exists($connection, 'getConnectionCount') ? $connection->getConnectionCount() : null;
+        return $connection->getQueryGrammar()->getConnectionCount();
     }
 
     /**

src/Illuminate/Database/Console/ShowCommand.php

@@ -45,7 +45,8 @@ public function handle(ConnectionResolverInterface $connections)
         $data = [
             'platform' => [
                 'config' => $this->getConfigFromDatabase($database),
-                'name' => $this->getConnectionName($connection, $database),
+                'name' => $connection->getName(),
+                'driver' => method_exists($connection, 'getDriverName') ? $connection->getDriverName() : $connection::class,
                 'version' => $connection->getServerVersion(),
                 'open_connections' => $this->getConnectionCount($connection),
             ],
@@ -159,6 +160,7 @@ protected function displayForCli(array $data)
         $this->newLine();
 
         $this->components->twoColumnDetail('<fg=green;options=bold>'.$platform['name'].'</>', $platform['version']);
+        $this->components->twoColumnDetail('Driver', Arr::get($platform['config'], 'driver'));
         $this->components->twoColumnDetail('Database', Arr::get($platform['config'], 'database'));
         $this->components->twoColumnDetail('Host', Arr::get($platform['config'], 'host'));
         $this->components->twoColumnDetail('Port', Arr::get($platform['config'], 'port'));

src/Illuminate/Database/MariaDbConnection.php

@@ -32,11 +32,6 @@ public function getServerVersion(): string
         return Str::between(parent::getServerVersion(), '5.5.5-', '-MariaDB');
     }
 
-    public function getConnectionName(): string
-    {
-        return $this->getName().' (MariaDB)';
-    }
-
     /**
      * Get the default query grammar instance.
      *

src/Illuminate/Database/MySqlConnection.php

@@ -48,22 +48,6 @@ public function isMaria()
         return str_contains($this->getPdo()->getAttribute(PDO::ATTR_SERVER_VERSION), 'MariaDB');
     }
 
-    public function getConnectionName(): string
-    {
-        return $this->getName().' ('.($this->isMaria() ? 'MariaDB' : 'MySQL').')';
-    }
-
-    public function getConnectionCount(): ?int
-    {
-        $result = $this->selectOne('show status where variable_name = "threads_connected"');
-
-        if (! $result) {
-            return null;
-        }
-
-        return (int) $result['Value'];
-    }
-
     /**
      * Get the server version for the connection.
      *

src/Illuminate/Database/PostgresConnection.php

@@ -12,22 +12,6 @@
 
 class PostgresConnection extends Connection
 {
-    public function getConnectionName(): string
-    {
-        return $this->getName().' (PostgreSQL)';
-    }
-
-    public function getConnectionCount(): ?int
-    {
-        $result = $this->selectOne('select count(*) as "Value" from pg_stat_activity');
-
-        if (! $result) {
-            return null;
-        }
-
-        return (int) $result['Value'];
-    }
-
     /**
      * Escape a binary value for safe SQL embedding.
      *

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -1564,4 +1564,14 @@ public function getBitwiseOperators()
     {
         return $this->bitwiseOperators;
     }
+
+    /**
+     * Get the number of open connections for a database.
+     *
+     * @return int|null
+     */
+    public function getConnectionCount(): ?int
+    {
+        return null;
+    }
 }

src/Illuminate/Database/Query/Grammars/MySqlGrammar.php

@@ -514,4 +514,15 @@ protected function wrapJsonBooleanSelector($value)
 
         return 'json_extract('.$field.$path.')';
     }
+
+    public function getConnectionCount(): ?int
+    {
+        $result = $this->connection->selectOne('show status where variable_name = "threads_connected"');
+
+        if (! $result) {
+            return null;
+        }
+
+        return (int) $result['Value'];
+    }
 }

src/Illuminate/Database/Query/Grammars/PostgresGrammar.php

@@ -762,4 +762,15 @@ public function substituteBindingsIntoRawSql($sql, $bindings)
 
         return $query;
     }
+
+    public function getConnectionCount(): ?int
+    {
+        $result = $this->connection->selectOne('select count(*) as "Value" from pg_stat_activity');
+
+        if (! $result) {
+            return null;
+        }
+
+        return (int) $result['Value'];
+    }
 }

src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php

@@ -571,4 +571,15 @@ protected function wrapTableValuedFunction($table)
 
         return $table;
     }
+
+    public function getConnectionCount(): ?int
+    {
+        $result = $this->connection->selectOne('select count(*) Value from sys.dm_exec_sessions where status = ?', ['running']);
+
+        if (! $result) {
+            return null;
+        }
+
+        return (int) $result['Value'];
+    }
 }

src/Illuminate/Database/SQLiteConnection.php

@@ -31,11 +31,6 @@ public function __construct($pdo, $database = '', $tablePrefix = '', array $conf
         $this->configureSynchronous();
     }
 
-    public function getConnectionName(): string
-    {
-        return $this->getName().' (SQLite)';
-    }
-
     /**
      * Enable or disable foreign key constraints if configured.
      *

src/Illuminate/Database/SqlServerConnection.php

@@ -90,22 +90,6 @@ protected function getDefaultQueryGrammar()
         return $this->withTablePrefix($grammar);
     }
 
-    public function getConnectionName(): string
-    {
-        return $this->getName().' (SQL Server)';
-    }
-
-    public function getConnectionCount(): ?int
-    {
-        $result = $this->selectOne('select count(*) Value from sys.dm_exec_sessions where status = ?', ['running']);
-
-        if (! $result) {
-            return null;
-        }
-
-        return (int) $result['Value'];
-    }
-
     /**
      * Get a schema builder instance for the connection.
      *