Fix using schema option with connection option (#2316)

cakephp · Oct 3, 2024 · 31d837c · 31d837c
1 parent 0ef61fc
commit 31d837c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Phinx/Db/Adapter/PostgresAdapter.php b/src/Phinx/Db/Adapter/PostgresAdapter.php
@@ -70,12 +70,12 @@ class PostgresAdapter extends PdoAdapter
      */
     public function setOptions(array $options): AdapterInterface
     {
-        parent::setOptions($options);
-
         if (!empty($options['schema'])) {
             $this->schema = $options['schema'];
         }
 
+        parent::setOptions($options);
+
         return $this;
     }
 

diff --git a/tests/Phinx/Db/Adapter/PostgresAdapterTest.php b/tests/Phinx/Db/Adapter/PostgresAdapterTest.php
@@ -148,6 +148,21 @@ public function testConnectionWithSchema()
         $this->assertTrue($adapter->hasTable('foo.' . $adapter->getSchemaTableName()));
     }
 
+    public function testConnectionWithSchemaAndConnection()
+    {
+        $this->adapter->connect();
+        $this->adapter->createSchema('foo');
+
+        $options = [
+            'schema' => 'foo',
+            'connection' => $this->adapter->getConnection(),
+            'name' => PGSQL_DB_CONFIG['name'],
+        ];
+        $adapter = new PostgresAdapter($options, new ArrayInput([]), new NullOutput());
+        $adapter->connect();
+        $this->assertTrue($adapter->hasTable('foo.' . $adapter->getSchemaTableName()));
+    }
+
     public function testCreatingTheSchemaTableOnConnect()
     {
         $this->adapter->connect();