Init optimization

Author: walkor

composer.json

@@ -5,6 +5,7 @@
   "description": "Webman database",
   "require": {
     "workerman/webman-framework": "^2.0 || dev-master",
+    "workerman/webman": "^2.0",
     "webman/coroutine": "^1.0 || dev-main",
     "illuminate/database": "^10.0",
     "laravel/serializable-closure": "^2.0"

src/DatabaseManager.php

@@ -7,6 +7,9 @@
 use Webman\Context;
 use Webman\Coroutine\Pool;
 
+/**
+ * Class DatabaseManager
+ */
 class DatabaseManager extends BaseDatabaseManager
 {
 
@@ -37,10 +40,10 @@ public function connection($name = null)
                     return $this->configure($this->makeConnection($database), $type);
                 });
                 $pool->setConnectionCloser(function ($connection) {
-                    $connection->disconnect();
+                    $this->closeAndFreeConnection($connection);
                 });
                 $pool->setHeartbeatChecker(function ($connection) {
-                    return $connection->select('select 1');
+                    $connection->select('select 1');
                 });
                 static::$pools[$name] = $pool;
             }
@@ -60,4 +63,19 @@ public function connection($name = null)
         return $connection;
     }
 
+    /**
+     * Close connection.
+     *
+     * @param $connection
+     * @return void
+     */
+    protected function closeAndFreeConnection($connection): void
+    {
+        $connection->disconnect();
+        $clearProperties = function () {
+            $this->queryGrammar = null;
+        };
+        $clearProperties->call($connection);
+    }
+
 }

src/Initializer.php

@@ -24,6 +24,9 @@
 use MongoDB\Laravel\Connection as LaravelMongodbConnection;
 use support\Container;
 
+/**
+ * Class Initializer
+ */
 class Initializer
 {
 
@@ -96,3 +99,5 @@ public static function init($config): void
     }
 
 }
+
+Initializer::init(config('database', []));

src/Manager.php

@@ -2,9 +2,11 @@
 
 namespace Webman\Database;
 
-use Illuminate\Database\Connection;
 use Illuminate\Database\Connectors\ConnectionFactory;
 
+/**
+ * Class Manager
+ */
 class Manager extends \Illuminate\Database\Capsule\Manager
 {
     /**
@@ -16,8 +18,5 @@ protected function setupManager()
     {
         $factory = new ConnectionFactory($this->container);
         $this->manager = new DatabaseManager($this->container, $factory);
-        Connection::resolverFor('mysql', function ($connection, $database, $prefix, $config) {
-            return new MySqlConnection($connection, $database, $prefix, $config);
-        });
     }
 }

src/MysqlConnection.php

@@ -15,8 +15,9 @@
 namespace support;
 
 use Closure;
-use Illuminate\Database\Capsule\Manager;
-use Illuminate\Database\Connection;
+use Webman\Database\Manager;
+
+require_once __DIR__ . '/../Initializer.php';
 
 /**
  * Class Db
@@ -33,20 +34,5 @@
  */
 class Db extends Manager
 {
-    /**
-     * @return Manager
-     */
-    public static function getInstance(): Manager
-    {
-        return static::$instance;
-    }
-
-    /**
-     * @return Connection[]
-     */
-    public static function getConnections(): array
-    {
-        return static::$instance->getDatabaseManager()->getConnections();
-    }
 
 }