From f192c32d02aff2d00069905ee6bfef252ce7bcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Tue, 23 Jul 2024 23:56:30 +0200
Subject: [PATCH] Pluralize ConnectionsCount

---
 src/Illuminate/Database/Console/DatabaseInspectionCommand.php | 2 +-
 src/Illuminate/Database/Console/MonitorCommand.php            | 2 +-
 src/Illuminate/Database/Console/ShowCommand.php               | 2 +-
 src/Illuminate/Database/Schema/Builder.php                    | 4 ++--
 src/Illuminate/Database/Schema/Grammars/Grammar.php           | 2 +-
 src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php    | 4 ++--
 src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php      | 2 +-
 src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php   | 2 +-
 src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php  | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Illuminate/Database/Console/DatabaseInspectionCommand.php b/src/Illuminate/Database/Console/DatabaseInspectionCommand.php
index 347e8930bb34..69c912739aa5 100644
--- a/src/Illuminate/Database/Console/DatabaseInspectionCommand.php
+++ b/src/Illuminate/Database/Console/DatabaseInspectionCommand.php
@@ -32,7 +32,7 @@ protected function getConnectionName(ConnectionInterface $connection, $database)
      */
     protected function getConnectionCount(ConnectionInterface $connection)
     {
-        return $connection->getSchemaBuilder()->getConnectionCount();
+        return $connection->getSchemaBuilder()->getConnectionsCount();
     }
 
     /**
diff --git a/src/Illuminate/Database/Console/MonitorCommand.php b/src/Illuminate/Database/Console/MonitorCommand.php
index a710489d3bb2..ed8826ac1e9e 100644
--- a/src/Illuminate/Database/Console/MonitorCommand.php
+++ b/src/Illuminate/Database/Console/MonitorCommand.php
@@ -84,7 +84,7 @@ protected function parseDatabases($databases)
             }
 
             $maxConnections = $this->option('max');
-            $connections = $this->connection->connection($database)->getSchemaBuilder()->getConnectionCount();
+            $connections = $this->connection->connection($database)->getSchemaBuilder()->getConnectionsCount();
 
             return [
                 'database' => $database,
diff --git a/src/Illuminate/Database/Console/ShowCommand.php b/src/Illuminate/Database/Console/ShowCommand.php
index 505f0ad10084..0ecdd1bd0f28 100644
--- a/src/Illuminate/Database/Console/ShowCommand.php
+++ b/src/Illuminate/Database/Console/ShowCommand.php
@@ -48,7 +48,7 @@ public function handle(ConnectionResolverInterface $connections)
                 'name' => $connection->getDriverTitle(),
                 'connection' => $connection->getName(),
                 'version' => $connection->getServerVersion(),
-                'open_connections' => $schema->getConnectionCount(),
+                'open_connections' => $schema->getConnectionsCount(),
             ],
             'tables' => $this->tables($connection, $schema),
         ];
diff --git a/src/Illuminate/Database/Schema/Builder.php b/src/Illuminate/Database/Schema/Builder.php
index 98be40cd677b..d926335f0fa5 100755
--- a/src/Illuminate/Database/Schema/Builder.php
+++ b/src/Illuminate/Database/Schema/Builder.php
@@ -612,9 +612,9 @@ public function setConnection(Connection $connection)
      *
      * @return int|null
      */
-    public function getConnectionCount()
+    public function getConnectionsCount()
     {
-        $query = $this->grammar->compileConnectionCount();
+        $query = $this->grammar->compileConnectionsCount();
 
         return $query ? $this->connection->scalar($query) : null;
     }
diff --git a/src/Illuminate/Database/Schema/Grammars/Grammar.php b/src/Illuminate/Database/Schema/Grammars/Grammar.php
index 080fcb15e90b..3c0e4a0e772d 100755
--- a/src/Illuminate/Database/Schema/Grammars/Grammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/Grammar.php
@@ -388,7 +388,7 @@ public function supportsSchemaTransactions()
      *
      * @return string|null
      */
-    public function compileConnectionCount()
+    public function compileConnectionsCount()
     {
         return null;
     }
diff --git a/src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php b/src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php
index 1a9750342f20..a574edb3179c 100755
--- a/src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php
@@ -56,8 +56,8 @@ protected function typeGeometry(Fluent $column)
         );
     }
 
-    public function compileConnectionCount()
+    public function compileConnectionsCount()
     {
-        return 'select variable_value as `Value` from information_schema.global_status where variable_name = \'Threads_connected\'';
+        return 'select variable_value as `Value` from information_schema.global_status where variable_name = \'THREADS_CONNECTED\'';
     }
 }
diff --git a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
index a642ebd39502..6c29372e74a2 100755
--- a/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php
@@ -1338,7 +1338,7 @@ protected function wrapJsonSelector($value)
         return 'json_unquote(json_extract('.$field.$path.'))';
     }
 
-    public function compileConnectionCount()
+    public function compileConnectionsCount()
     {
         return 'select variable_value as `Value` from performance_schema.session_status where variable_name = \'threads_connected\'';
     }
diff --git a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
index e26282e0c624..8ba43e703b50 100755
--- a/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php
@@ -1202,7 +1202,7 @@ protected function modifyGeneratedAs(Blueprint $blueprint, Fluent $column)
         return $sql;
     }
 
-    public function compileConnectionCount()
+    public function compileConnectionsCount()
     {
         return 'select count(*) as "Value" from pg_stat_activity';
     }
diff --git a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
index 9ac981be2019..c56e97d9ecd7 100755
--- a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -1055,7 +1055,7 @@ public function quoteString($value)
         return "N'$value'";
     }
 
-    public function compileConnectionCount()
+    public function compileConnectionsCount()
     {
         return 'select count(*) Value from sys.dm_exec_sessions where status = N\'running\'';
     }