SQL server PDO driver not supports persistent connections

cakephp · May 10, 2022 · 2b86062 · 2b86062
1 parent 7a49fa2
commit 2b86062
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/src/Phinx/Db/Adapter/MysqlAdapter.php b/src/Phinx/Db/Adapter/MysqlAdapter.php
@@ -132,6 +132,11 @@ public function connect()
                 $driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
             }
 
+            // pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
+            if (isset($options['attr_persistent'])) {
+                $driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
+            }
+
             // support arbitrary \PDO::MYSQL_ATTR_* driver options and pass them to PDO
             // http://php.net/manual/en/ref.pdo-mysql.php#pdo-mysql.constants
             foreach ($options as $key => $option) {

diff --git a/src/Phinx/Db/Adapter/PdoAdapter.php b/src/Phinx/Db/Adapter/PdoAdapter.php
@@ -80,12 +80,6 @@ protected function createPdoConnection($dsn, $username = null, $password = null,
             'attr_errmode' => PDO::ERRMODE_EXCEPTION,
         ];
 
-        // pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
-        if (isset($adapterOptions['attr_persistent'])) {
-            $options[PDO::ATTR_PERSISTENT] = $adapterOptions['attr_persistent'];
-            unset($adapterOptions['attr_persistent']);
-        }
-
         try {
             $db = new PDO($dsn, $username, $password, $options);
 

diff --git a/src/Phinx/Db/Adapter/PostgresAdapter.php b/src/Phinx/Db/Adapter/PostgresAdapter.php
@@ -80,6 +80,11 @@ public function connect()
                 $driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
             }
 
+            // pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
+            if (isset($options['attr_persistent'])) {
+                $driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
+            }
+
             $db = $this->createPdoConnection($dsn, $options['user'] ?? null, $options['pass'] ?? null, $driverOptions);
 
             try {

diff --git a/src/Phinx/Db/Adapter/SQLiteAdapter.php b/src/Phinx/Db/Adapter/SQLiteAdapter.php
@@ -184,6 +184,11 @@ public function connect()
                 $driverOptions[PDO::ATTR_DEFAULT_FETCH_MODE] = constant('\PDO::FETCH_' . strtoupper($options['fetch_mode']));
             }
 
+            // pass \PDO::ATTR_PERSISTENT to driver options instead of useless setting it after instantiation
+            if (isset($options['attr_persistent'])) {
+                $driverOptions[PDO::ATTR_PERSISTENT] = $options['attr_persistent'];
+            }
+
             $db = $this->createPdoConnection($dsn, null, null, $driverOptions);
 
             $this->setConnection($db);

diff --git a/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php b/tests/Phinx/Db/Adapter/SqlServerAdapterTest.php
@@ -1139,16 +1139,10 @@ public function testInvalidPdoAttribute($attribute)
         $adapter->connect();
     }
 
-    public function testPdoPersistentConnection()
+    public function testPdoSqlSrvNotSupportingPersistentConnections()
     {
         $adapter = new SqlServerAdapter(SQLSRV_DB_CONFIG + ['attr_persistent' => true]);
-        $this->assertEquals(true, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
-    }
-
-    public function testPdoNotPersistentConnection()
-    {
-        $adapter = new SqlServerAdapter(SQLSRV_DB_CONFIG);
-        $this->assertEquals(false, $adapter->getConnection()->getAttribute(\PDO::ATTR_PERSISTENT));
+        $this->expectException(\InvalidArgumentException::class);
+        $adapter->connect();
     }
-
 }