Merge pull request #30998 from themsaid/pr/16983

[6.x] Prevent making actual pdo connections while reconnecting
laravel · Jan 2, 2020 · a47cd1b · a47cd1b
2 parents 0b748bc + 6714637
commit a47cd1b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Connection.php b/src/Illuminate/Database/Connection.php
@@ -927,6 +927,16 @@ public function getPdo()
         return $this->pdo;
     }
 
+    /**
+     * Get the raw current PDO connection parameter.
+     *
+     * @return \PDO|\Closure|null
+     */
+    public function getRawPdo()
+    {
+        return $this->pdo;
+    }
+
     /**
      * Get the current PDO connection used for reading.
      *
@@ -949,6 +959,16 @@ public function getReadPdo()
         return $this->readPdo ?: $this->getPdo();
     }
 
+    /**
+     * Get the raw current read PDO connection parameter.
+     *
+     * @return \PDO|\Closure|null
+     */
+    public function getRawReadPdo()
+    {
+        return $this->readPdo;
+    }
+
     /**
      * Set the PDO connection.
      *

diff --git a/src/Illuminate/Database/DatabaseManager.php b/src/Illuminate/Database/DatabaseManager.php
@@ -256,8 +256,8 @@ protected function refreshPdoConnections($name)
         $fresh = $this->makeConnection($name);
 
         return $this->connections[$name]
-                                ->setPdo($fresh->getPdo())
-                                ->setReadPdo($fresh->getReadPdo());
+                                ->setPdo($fresh->getRawPdo())
+                                ->setReadPdo($fresh->getRawReadPdo());
     }
 
     /**