Cache created decorated connection (cakephp#2191)

Author: MasterOdin

src/Phinx/Db/Adapter/MysqlAdapter.php

@@ -7,7 +7,6 @@
 
 namespace Phinx\Db\Adapter;
 
-use Cake\Database\Connection;
 use Cake\Database\Driver\Mysql as MysqlDriver;
 use InvalidArgumentException;
 use PDO;
@@ -1531,7 +1530,7 @@ public function getColumnTypes(): array
     /**
      * @inheritDoc
      */
-    public function getDecoratedConnection(): Connection
+    protected function getDecoratedConnectionConfig(): array
     {
         $options = $this->getOptions();
         $options = [
@@ -1541,9 +1540,6 @@ public function getDecoratedConnection(): Connection
             'quoteIdentifiers' => true,
         ] + $options;
 
-        $driver = new MysqlDriver($options);
-        $driver->setConnection($this->connection);
-
-        return new Connection(['driver' => $driver] + $options);
+        return ['driver' => new MysqlDriver($options)] + $options;
     }
 }

src/Phinx/Db/Adapter/PdoAdapter.php

@@ -49,6 +49,11 @@ abstract class PdoAdapter extends AbstractAdapter implements DirectActionInterfa
      */
     protected $connection;
 
+    /**
+     * @var \Cake\Database\Connection|null
+     */
+    protected $decoratedConnection;
+
     /**
      * Writes a message to stdout if verbose output is on
      *
@@ -198,13 +203,34 @@ public function execute(string $sql, array $params = []): int
         return $result ? $stmt->rowCount() : $result;
     }
 
+    /**
+     * Returns the config for a new decorated connection.
+     *
+     * @return array
+     */
+    abstract protected function getDecoratedConnectionConfig(): array;
+
     /**
      * Returns the Cake\Database connection object using the same underlying
      * PDO object as this connection.
      *
      * @return \Cake\Database\Connection
      */
-    abstract public function getDecoratedConnection(): Connection;
+    public function getDecoratedConnection(): Connection
+    {
+        if (isset($this->decoratedConnection)) {
+            return $this->decoratedConnection;
+        }
+
+        $config = $this->getDecoratedConnectionConfig();
+        if (!isset($config['driver'])) {
+            throw new RuntimeException('Decorated connection config is missing the driver.');
+        }
+
+        $config['driver']->setConnection($this->connection);
+
+        return $this->decoratedConnection = new Connection($config);
+    }
 
     /**
      * @inheritDoc

src/Phinx/Db/Adapter/PostgresAdapter.php

@@ -7,7 +7,6 @@
 
 namespace Phinx\Db\Adapter;
 
-use Cake\Database\Connection;
 use Cake\Database\Driver\Postgres as PostgresDriver;
 use InvalidArgumentException;
 use PDO;
@@ -1566,7 +1565,7 @@ public function castToBool($value)
     /**
      * @inheritDoc
      */
-    public function getDecoratedConnection(): Connection
+    protected function getDecoratedConnectionConfig(): array
     {
         $options = $this->getOptions();
         $options = [
@@ -1576,11 +1575,7 @@ public function getDecoratedConnection(): Connection
             'quoteIdentifiers' => true,
         ] + $options;
 
-        $driver = new PostgresDriver($options);
-
-        $driver->setConnection($this->connection);
-
-        return new Connection(['driver' => $driver] + $options);
+        return ['driver' => new PostgresDriver($options)] + $options;
     }
 
     /**

src/Phinx/Db/Adapter/SQLiteAdapter.php

@@ -8,7 +8,6 @@
 namespace Phinx\Db\Adapter;
 
 use BadMethodCallException;
-use Cake\Database\Connection;
 use Cake\Database\Driver\Sqlite as SqliteDriver;
 use InvalidArgumentException;
 use PDO;
@@ -1932,7 +1931,7 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
     /**
      * @inheritDoc
      */
-    public function getDecoratedConnection(): Connection
+    protected function getDecoratedConnectionConfig(): array
     {
         $options = $this->getOptions();
         $options['quoteIdentifiers'] = true;
@@ -1949,9 +1948,6 @@ public function getDecoratedConnection(): Connection
             throw new RuntimeException('You need to connect first.');
         }
 
-        $driver = new SqliteDriver($options);
-        $driver->setConnection($this->connection);
-
-        return new Connection(['driver' => $driver] + $options);
+        return ['driver' => new SqliteDriver($options)] + $options;
     }
 }

src/Phinx/Db/Adapter/SqlServerAdapter.php

@@ -8,7 +8,6 @@
 namespace Phinx\Db\Adapter;
 
 use BadMethodCallException;
-use Cake\Database\Connection;
 use Cake\Database\Driver\Sqlserver as SqlServerDriver;
 use InvalidArgumentException;
 use PDO;
@@ -1359,7 +1358,7 @@ public function migrated(MigrationInterface $migration, string $direction, strin
     /**
      * @inheritDoc
      */
-    public function getDecoratedConnection(): Connection
+    protected function getDecoratedConnectionConfig(): array
     {
         $options = $this->getOptions();
         $options = [
@@ -1369,9 +1368,6 @@ public function getDecoratedConnection(): Connection
             'quoteIdentifiers' => true,
         ] + $options;
 
-        $driver = new SqlServerDriver($options);
-        $driver->setConnection($this->connection);
-
-        return new Connection(['driver' => $driver] + $options);
+        return ['driver' => new SqlServerDriver($options)] + $options;
     }
 }