Move getConnectionCount to Schema\Builder

Author: GromNaN

src/Illuminate/Database/Console/DatabaseInspectionCommand.php

@@ -27,12 +27,12 @@ protected function getConnectionName(ConnectionInterface $connection, $database)
      *
      * @param  \Illuminate\Database\ConnectionInterface  $connection
      * @return int|null
+     *
+     * @deprecated Use Schema\Builder::getConnectionCount() instead.
      */
     protected function getConnectionCount(ConnectionInterface $connection)
     {
-        $query = $connection->getSchemaGrammar()->compileConnectionCount();
-
-        return $query ? $connection->scalar($query) : null;
+        return $connection->getSchemaBuilder()->getConnectionCount();
     }
 
     /**

src/Illuminate/Database/Console/MonitorCommand.php

@@ -84,10 +84,11 @@ protected function parseDatabases($databases)
             }
 
             $maxConnections = $this->option('max');
+            $connections = $this->connection->connection($database)->getSchemaBuilder()->getConnectionCount();
 
             return [
                 'database' => $database,
-                'connections' => $connections = $this->getConnectionCount($this->connection->connection($database)),
+                'connections' => $connections,
                 'status' => $maxConnections && $connections >= $maxConnections ? '<fg=yellow;options=bold>ALERT</>' : '<fg=green;options=bold>OK</>',
             ];
         });

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

src/Illuminate/Database/Schema/Builder.php

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