Move Schema::getConnectionsCount to Connection::getThreadsCount

Author: GromNaN

src/Illuminate/Database/Connection.php

@@ -1084,6 +1084,18 @@ public function raw($value)
         return new Expression($value);
     }
 
+    /**
+     * Get the number of open connections for a database.
+     *
+     * @return int|null
+     */
+    public function getThreadsCount()
+    {
+        $query = $this->getQueryGrammar()->compileThreadsCount();
+
+        return $query ? $this->scalar($query) : null;
+    }
+
     /**
      * Escape a value for safe SQL embedding.
      *

src/Illuminate/Database/Console/DatabaseInspectionCommand.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Console;
 
 use Illuminate\Console\Command;
+use Illuminate\Database\Connection;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Support\Arr;
 
@@ -15,7 +16,7 @@ abstract class DatabaseInspectionCommand extends Command
      * @param  string  $database
      * @return string
      *
-     * @deprecated Use $connection->getDriverTitle() instead.
+     * @deprecated
      */
     protected function getConnectionName(ConnectionInterface $connection, $database)
     {
@@ -28,11 +29,11 @@ protected function getConnectionName(ConnectionInterface $connection, $database)
      * @param  \Illuminate\Database\ConnectionInterface  $connection
      * @return int|null
      *
-     * @deprecated Use Schema\Builder::getConnectionsCount() instead.
+     * @deprecated
      */
     protected function getConnectionCount(ConnectionInterface $connection)
     {
-        return $connection->getSchemaBuilder()->getConnectionsCount();
+        return $connection->getThreadsCount();
     }
 
     /**

src/Illuminate/Database/Console/MonitorCommand.php

@@ -84,7 +84,8 @@ protected function parseDatabases($databases)
             }
 
             $maxConnections = $this->option('max');
-            $connections = $this->connection->connection($database)->getSchemaBuilder()->getConnectionsCount();
+
+            $connections = $this->connection->connection($database)->getThreadsCount();
 
             return [
                 'database' => $database,

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->getConnectionsCount(),
+                'open_connections' => $connection->getThreadsCount(),
             ],
             'tables' => $this->tables($connection, $schema),
         ];

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 string|null
+     */
+    public function compileThreadsCount()
+    {
+        return null;
+    }
 }

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

@@ -43,4 +43,9 @@ public function useLegacyGroupLimit(Builder $query)
     {
         return false;
     }
+
+    public function compileThreadsCount()
+    {
+        return 'select variable_value as `Value` from information_schema.global_status where variable_name = \'THREADS_CONNECTED\'';
+    }
 }

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

@@ -514,4 +514,9 @@ protected function wrapJsonBooleanSelector($value)
 
         return 'json_extract('.$field.$path.')';
     }
+
+    public function compileThreadsCount()
+    {
+        return 'select variable_value as `Value` from performance_schema.session_status where variable_name = \'threads_connected\'';
+    }
 }

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

@@ -762,4 +762,9 @@ public function substituteBindingsIntoRawSql($sql, $bindings)
 
         return $query;
     }
+
+    public function compileThreadsCount()
+    {
+        return 'select count(*) as "Value" from pg_stat_activity';
+    }
 }

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

@@ -497,6 +497,11 @@ public function compileSavepointRollBack($name)
         return 'ROLLBACK TRANSACTION '.$name;
     }
 
+    public function compileThreadsCount()
+    {
+        return 'select count(*) Value from sys.dm_exec_sessions where status = N\'running\'';
+    }
+
     /**
      * Get the format for database stored dates.
      *

src/Illuminate/Database/Schema/Builder.php

@@ -607,18 +607,6 @@ public function setConnection(Connection $connection)
         return $this;
     }
 
-    /**
-     * Get the number of open connections for a database.
-     *
-     * @return int|null
-     */
-    public function getConnectionsCount()
-    {
-        $query = $this->grammar->compileConnectionsCount();
-
-        return $query ? $this->connection->scalar($query) : null;
-    }
-
     /**
      * Set the Schema Blueprint resolver callback.
      *

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

@@ -382,14 +382,4 @@ public function supportsSchemaTransactions()
     {
         return $this->transactions;
     }
-
-    /**
-     * Get the number of open connections for a database.
-     *
-     * @return string|null
-     */
-    public function compileConnectionsCount()
-    {
-        return null;
-    }
 }

src/Illuminate/Database/Schema/Grammars/MariaDbGrammar.php

@@ -55,9 +55,4 @@ protected function typeGeometry(Fluent $column)
             $column->srid ? ' ref_system_id='.$column->srid : ''
         );
     }
-
-    public function compileConnectionsCount()
-    {
-        return 'select variable_value as `Value` from information_schema.global_status where variable_name = \'THREADS_CONNECTED\'';
-    }
 }

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

@@ -1337,9 +1337,4 @@ protected function wrapJsonSelector($value)
 
         return 'json_unquote(json_extract('.$field.$path.'))';
     }
-
-    public function compileConnectionsCount()
-    {
-        return 'select variable_value as `Value` from performance_schema.session_status where variable_name = \'threads_connected\'';
-    }
 }

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

@@ -1201,9 +1201,4 @@ protected function modifyGeneratedAs(Blueprint $blueprint, Fluent $column)
 
         return $sql;
     }
-
-    public function compileConnectionsCount()
-    {
-        return 'select count(*) as "Value" from pg_stat_activity';
-    }
 }

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

@@ -1054,9 +1054,4 @@ public function quoteString($value)
 
         return "N'$value'";
     }
-
-    public function compileConnectionsCount()
-    {
-        return 'select count(*) Value from sys.dm_exec_sessions where status = N\'running\'';
-    }
 }

src/Illuminate/Support/Facades/Schema.php

@@ -45,7 +45,6 @@
  * @method static void mixin(object $mixin, bool $replace = true)
  * @method static bool hasMacro(string $name)
  * @method static void flushMacros()
- * @method static int|null getConnectionsCount()
  *
  * @see \Illuminate\Database\Schema\Builder
  */

tests/Integration/Database/ConnectionThreadsCountTest.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Database;
+
+use Illuminate\Support\Facades\DB;
+
+class ConnectionThreadsCountTest extends DatabaseTestCase
+{
+    public function testGetThreadsCount()
+    {
+        $count = DB::connection()->getThreadsCount();
+        if ($this->driver === 'sqlite') {
+            $this->assertNull($count, 'SQLite does not support connection count');
+        } else {
+            $this->assertGreaterThanOrEqual(1, $count);
+        }
+    }
+}

tests/Integration/Database/SchemaBuilderTest.php

@@ -874,14 +874,4 @@ public function testAddingMacros()
         $this->assertTrue(Schema::hasForeignKeyForColumn('question_id', 'answers', 'questions'));
         $this->assertFalse(Schema::hasForeignKeyForColumn('body', 'answers', 'questions'));
     }
-
-    public function testGetConnectionsCount()
-    {
-        $count = Schema::getConnectionsCount();
-        if ($this->driver === 'sqlite') {
-            $this->assertNull($count, 'SQLite does not support connection count');
-        } else {
-            $this->assertGreaterThanOrEqual(1, $count);
-        }
-    }
 }