修复重连后auth db不正确问题

walkor · Aug 1, 2024 · 4e910d4 · 4e910d4
1 parent 542f10c
commit 4e910d4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -336,12 +336,12 @@ public function connect()
                 Timer::del($this->_reconnectTimer);
                 $this->_reconnectTimer = null;
             }
-
-            if ($this->_db) {
+          
+            if ($this->_db && ($this->_queue[0][0][0] ?? '') !== 'SELECT' && ($this->_queue[0][0][0] ?? '') !== 'AUTH' && ($this->_queue[1][0][0] ?? '') !== 'SELECT') {
                 $this->_queue = \array_merge([[['SELECT', $this->_db], time(), null]], $this->_queue);
             }
 
-            if ($this->_auth) {
+            if ($this->_auth && ($this->_queue[0][0][0] ?? '') !== 'AUTH') {
                 $this->_queue = \array_merge([[['AUTH', $this->_auth], time(), null]],  $this->_queue);
             }
 
@@ -541,6 +541,8 @@ public function select($db, $cb = null)
         if ($need_suspend) {
             [$suspension, $cb] = $this->suspenstion();
         }
+        $cb = $cb ?: function () {
+        };
         $this->_queue[] = [['SELECT', $db], time(), $cb, $format];
         $this->process();
         if ($need_suspend) {
@@ -566,6 +568,8 @@ public function auth($auth, $cb = null)
         if ($need_suspend) {
             [$suspension, $cb] = $this->suspenstion();
         }
+        $cb = $cb ?: function () {
+        };
         $this->_queue[] = [['AUTH', $auth], time(), $cb, $format];
         $this->process();
         if ($need_suspend) {