Merge pull request #1 from reactphp-x/2.0.0

2.0.0

Author: wpjscc

README.md

@@ -41,7 +41,7 @@ $db->addConnection([
         'max_connections' => 10, // max 10 connection
         'max_wait_queue' => 110, // how many sql in queue
         'wait_timeout' => 5,// wait time include response time
-        'keep_alive' => 10, // 
+        'idle' => 60, // 
     ]
 ]);
 

composer.json

@@ -11,13 +11,15 @@
     ],
     "require": {
         "php": "^8.1",
-        "reactphp-x/mysql-pool": "^1.0",
         "react/async": "^4 || ^3 || ^2",
-        "illuminate/database": "^11.19"
+        "illuminate/database": "^11.19",
+        "reactphp-x/mysql-pool": "^2.0@dev"
     },
     "autoload": {
         "psr-4": {
             "ReactphpX\\Orm\\": "src"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

examples/01.php

@@ -31,7 +31,7 @@
 });
 
 print_r(DB::getQueryLog());
-DB::disconnect();
+// DB::disconnect();
 
 
 

examples/04.php

@@ -22,8 +22,8 @@
 // true
 var_dump(DB::table('test_users')->where('name', 'test-failed')->count() === 0);
 
-echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
-echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
+// echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
+// echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
 
 // success
 DB::table('test_users')->where('name', 'test-success')->delete();
@@ -40,8 +40,8 @@
 // true
 var_dump(DB::table('test_users')->where('name', 'test-success')->count() === 1);
 
-echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
-echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
+// echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
+// echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
 
 
 DB::disconnect();

examples/base.php

@@ -30,7 +30,7 @@
         'max_connections' => 10, // max 10 connection
         'max_wait_queue' => 110, // how many sql in queue
         'wait_timeout' => 5,// wait time include response time
-        'keep_alive' => 10, // 
+        'idle' => 60, // 
     ]
 ]);
 
@@ -186,8 +186,8 @@ public function posts()
 
 \React\EventLoop\Loop::addPeriodicTimer(1, function () {
     if (DB::getPdo()) {
-        echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
-        echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
+        // echo 'pool_count:'. DB::getPdo()->getPoolCount() . PHP_EOL;
+        // echo 'idleConnectionCount:'. DB::getPdo()->idleConnectionCount() . PHP_EOL;
     } else {
         var_dump('pool closed');
         \React\EventLoop\Loop::stop();

src/AsyncMysqlConnection.php

@@ -339,7 +339,7 @@ public function beginTransaction()
             throw new Exception("had in transaction");
         }
 
-        $connection = \React\Async\await($this->getPdo()->getIdleConnection());
+        $connection = \React\Async\await($this->getPdo()->getConnection());
         \React\Async\await($connection->query('BEGIN'));
         $db = clone $this;
         $db->setPdo($connection);

src/AsyncMysqlConnector.php

@@ -28,8 +28,11 @@ public function connect($config)
         $database = $config['database'];
 
         return static::$pool = new Pool(
-            $username . ':' . $password . '@' . $host . '/' . $database . '?charset=' . $charset,
-            $config['pool'] ?? []
+            $username . ':' . $password . '@' . $host . '/' . $database . '?charset=' . $charset.'&idle='.($config['idle'] ?? 30),
+            $config['pool']['min_connections'] ?? 1,
+            $config['pool']['max_connections'] ?? 10,
+            $config['pool']['max_wait_queue'] ?? 500,
+            $config['pool']['wait_timeout'] ?? 0,
         );
     }
 }