merge 4.x => 4.next

src/Db/Adapter/PostgresAdapter.php

@@ -1507,8 +1507,9 @@ protected function getSchemaName(string $tableName): array
     protected function getGlobalSchemaName(): string
     {
         $options = $this->getOptions();
+        $config = $options['connection']->config() ?? [];
 
-        return empty($options['schema']) ? 'public' : $options['schema'];
+        return empty($config['schema']) ? 'public' : $config['schema'];
     }
 
     /**

src/Db/Adapter/SqliteAdapter.php

@@ -1046,7 +1046,15 @@ protected function copyAndDropTmpTable(AlterInstructions $instructions, string $
                 $state['selectColumns']
             );
 
+            $result = $this->fetchRow('PRAGMA foreign_keys');
+            $foreignKeysEnabled = $result ? (bool)$result['foreign_keys'] : false;
+            if ($foreignKeysEnabled) {
+                $this->execute('PRAGMA foreign_keys = OFF');
+            }
             $this->execute(sprintf('DROP TABLE %s', $this->quoteTableName($tableName)));
+            if ($foreignKeysEnabled) {
+                $this->execute('PRAGMA foreign_keys = ON');
+            }
             $this->execute(sprintf(
                 'ALTER TABLE %s RENAME TO %s',
                 $this->quoteTableName($state['tmpTableName']),

src/Db/Table/Table.php

@@ -12,6 +12,7 @@
 
 /**
  * @internal
+ * @TODO rename this to `TableMetadata` having two classes with very similar names is confusing for me.
  */
 class Table
 {

tests/TestCase/Db/Adapter/PostgresAdapterTest.php

@@ -133,6 +133,30 @@ public function testQuoteSchemaName()
         $this->assertEquals('"schema.schema"', $this->adapter->quoteSchemaName('schema.schema'));
     }
 
+    public function testGetGlobalSchemaName()
+    {
+        $config = ConnectionManager::getConfig('test');
+        $config['schema'] = 'test_schema';
+        ConnectionManager::setConfig('test-schema', $config);
+        // Emulate the results of Util::parseDsn()
+        $this->config = [
+            'adapter' => 'postgres',
+            'connection' => ConnectionManager::get('test-schema'),
+            'database' => $config['database'],
+        ];
+
+        $this->adapter = new PostgresAdapter($this->config, $this->getConsoleIo());
+
+        $this->adapter->dropAllSchemas();
+        $this->adapter->createSchema('test_schema');
+
+        $this->adapter->disconnect();
+
+        $this->assertEquals('"test_schema"."table"', $this->adapter->quoteTableName('table'));
+
+        ConnectionManager::drop('test-schema');
+    }
+
     public function testQuoteTableName()
     {
         $this->assertEquals('"public"."table"', $this->adapter->quoteTableName('table'));

tests/TestCase/Db/Adapter/SqliteAdapterTest.php

@@ -1601,6 +1601,32 @@ public function testAddColumnWithComment()
         $this->assertMatchesRegularExpression('/\/\* Comments from "column1" \*\//', $sql);
     }
 
+    public function testAddColumnTableWithConstraint()
+    {
+        $this->adapter->execute('PRAGMA foreign_keys = ON');
+        $roles = new Table('constraint_roles', [], $this->adapter);
+        $roles->addColumn('name', 'string')
+            ->save();
+        $users = new Table('constraint_users', [], $this->adapter);
+        $users->addColumn('username', 'string')
+            ->addColumn('role_id', 'integer', ['null' => false])
+            ->addForeignKey(['role_id'], $roles->getTable(), ['id'])
+            ->save();
+
+        $this->adapter->insert($roles->getTable(), ['name' => 'admin']);
+        $this->adapter->insert($users->getTable(), ['username' => 'test', 'role_id' => 1]);
+
+        $updatedRoles = new Table($roles->getName(), [], $this->adapter);
+        // This should fail, but passes locally :(
+        $updatedRoles
+            ->addColumn('description', 'string', ['default' => 'short desc'])
+            ->update();
+        $res = $this->adapter->fetchAll('select * from sqlite_master where type = \'table\'');
+        $res = $this->adapter->fetchRow('select * from constraint_roles LIMIT 1');
+        $this->assertArrayHasKey('description', $res, 'Should have new column in output');
+        $this->assertEquals('short desc', $res['description']);
+    }
+
     public function testPhinxTypeLiteral()
     {
         $this->assertEquals(