Merge branch 'pr6663' into 8.x

Author: taylorotwell

src/Illuminate/Database/Connection.php

@@ -49,6 +49,13 @@ class Connection implements ConnectionInterface
      */
     protected $database;
 
+    /**
+     * The type of the connection.
+     *
+     * @var string|null
+     */
+    protected $type;
+
     /**
      * The table prefix for the connection.
      *
@@ -1045,6 +1052,16 @@ public function getName()
         return $this->getConfig('name');
     }
 
+    /**
+     * Get the database connection full name.
+     *
+     * @return string|null
+     */
+    public function getNameWithReadWriteType()
+    {
+        return $this->getName().($this->readWriteType ? '::'.$this->readWriteType : '');
+    }
+
     /**
      * Get an option from the configuration options.
      *
@@ -1274,6 +1291,19 @@ public function setDatabaseName($database)
         return $this;
     }
 
+    /**
+     * Set the read / write type of the connection.
+     *
+     * @param  string|null  $readWriteType
+     * @return $this
+     */
+    public function setReadWriteType($readWriteType)
+    {
+        $this->readWriteType = $readWriteType;
+
+        return $this;
+    }
+
     /**
      * Get the table prefix for the connection.
      *

src/Illuminate/Database/DatabaseManager.php

@@ -62,7 +62,7 @@ public function __construct($app, ConnectionFactory $factory)
         $this->factory = $factory;
 
         $this->reconnector = function ($connection) {
-            $this->reconnect($connection->getName());
+            $this->reconnect($connection->getNameWithReadWriteType());
         };
     }
 
@@ -165,7 +165,7 @@ protected function configuration($name)
      */
     protected function configure(Connection $connection, $type)
     {
-        $connection = $this->setPdoForType($connection, $type);
+        $connection = $this->setPdoForType($connection, $type)->setReadWriteType($type);
 
         // First we'll set the fetch mode and a few other dependencies of the database
         // connection. This method basically just configures and prepares it to get
@@ -275,11 +275,15 @@ public function usingConnection($name, callable $callback)
      */
     protected function refreshPdoConnections($name)
     {
-        $fresh = $this->makeConnection($name);
+        [$database, $type] = $this->parseConnectionName($name);
+
+        $fresh = $this->configure(
+            $this->makeConnection($database), $type
+        );
 
         return $this->connections[$name]
-                                ->setPdo($fresh->getRawPdo())
-                                ->setReadPdo($fresh->getRawReadPdo());
+                    ->setPdo($fresh->getRawPdo())
+                    ->setReadPdo($fresh->getRawReadPdo());
     }
 
     /**