Merge branch '4.x' into 4.next

src/AbstractMigration.php

@@ -29,6 +29,19 @@ class AbstractMigration extends BaseAbstractMigration
      */
     public bool $autoId = true;
 
+    /**
+     * Hook method to decide if this migration should use transactions
+     *
+     * By default if your driver supports transactions, a transaction will be opened
+     * before the migration begins, and commit when the migration completes.
+     *
+     * @return bool
+     */
+    public function useTransactions(): bool
+    {
+        return $this->getAdapter()->hasTransactions();
+    }
+
     /**
      * Returns an instance of the Table class.
      *

src/Db/Adapter/MysqlAdapter.php

@@ -522,7 +522,16 @@ protected function getRenameColumnInstructions(string $tableName, string $column
             if (strcasecmp($row['Field'], $columnName) === 0) {
                 $null = $row['Null'] === 'NO' ? 'NOT NULL' : 'NULL';
                 $comment = isset($row['Comment']) ? ' COMMENT ' . '\'' . addslashes($row['Comment']) . '\'' : '';
-                $extra = ' ' . strtoupper($row['Extra']);
+
+                // create the extra string by also filtering out the DEFAULT_GENERATED option (MySQL 8 fix)
+                $extras = array_filter(
+                    explode(' ', strtoupper($row['Extra'])),
+                    static function ($value) {
+                        return $value !== 'DEFAULT_GENERATED';
+                    },
+                );
+                $extra = ' ' . implode(' ', $extras);
+
                 if (($row['Default'] !== null)) {
                     $extra .= $this->getDefaultValueDefinition($row['Default']);
                 }

src/Db/Adapter/PostgresAdapter.php

@@ -1631,4 +1631,18 @@ public function bulkinsert(Table $table, array $rows): void
             $this->getConnection()->execute($sql, $vals);
         }
     }
+
+    /**
+     * Get the adapter type name
+     *
+     * @return string
+     */
+    public function getAdapterType(): string
+    {
+        // Hardcoded because the parent implementation
+        // reads an option that is based off of Database\Driver
+        // names which is postgres, but pgsql is required for
+        // compatibility.
+        return 'pgsql';
+    }
 }

src/Db/Adapter/SqliteAdapter.php

@@ -1046,15 +1046,7 @@ 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/Migration/Environment.php

@@ -85,8 +85,12 @@ public function executeMigration(MigrationInterface $migration, string $directio
             $migration->{MigrationInterface::INIT}();
         }
 
+        $atomic = $adapter->hasTransactions();
+        if (method_exists($migration, 'useTransactions')) {
+            $atomic = $migration->useTransactions();
+        }
         // begin the transaction if the adapter supports it
-        if ($adapter->hasTransactions()) {
+        if ($atomic) {
             $adapter->beginTransaction();
         }
 
@@ -124,7 +128,7 @@ public function executeMigration(MigrationInterface $migration, string $directio
         $adapter->migrated($migration, $direction, date('Y-m-d H:i:s', $startTime), date('Y-m-d H:i:s', time()));
 
         // commit the transaction if the adapter supports it
-        if ($adapter->hasTransactions()) {
+        if ($atomic) {
             $adapter->commitTransaction();
         }
 
@@ -144,9 +148,9 @@ public function executeSeed(SeedInterface $seed): void
         if (method_exists($seed, SeedInterface::INIT)) {
             $seed->{SeedInterface::INIT}();
         }
-
         // begin the transaction if the adapter supports it
-        if ($adapter->hasTransactions()) {
+        $atomic = $adapter->hasTransactions();
+        if ($atomic) {
             $adapter->beginTransaction();
         }
 
@@ -156,7 +160,7 @@ public function executeSeed(SeedInterface $seed): void
         }
 
         // commit the transaction if the adapter supports it
-        if ($adapter->hasTransactions()) {
+        if ($atomic) {
             $adapter->commitTransaction();
         }
     }

tests/TestCase/Db/Adapter/MysqlAdapterTest.php

@@ -857,6 +857,19 @@ public function testRenameColumnPreserveComment()
         $this->assertEquals('comment1', $columns[1]['Comment']);
     }
 
+    public function testRenameColumnWithDefaultGeneratedExtra()
+    {
+        $table = new Table('t', [], $this->adapter);
+        $table->save();
+        $this->assertFalse($table->hasColumn('last_changed'));
+        $table->addColumn('last_changed', 'datetime', ['default' => 'CURRENT_TIMESTAMP', 'null' => false])
+            ->save();
+        $this->assertTrue($table->hasColumn('last_changed'));
+        $table->renameColumn('last_changed', 'last_changed2')->save();
+        $this->assertFalse($this->adapter->hasColumn('t', 'last_changed'));
+        $this->assertTrue($this->adapter->hasColumn('t', 'last_changed2'));
+    }
+
     public function testRenamingANonExistentColumn()
     {
         $table = new Table('t', [], $this->adapter);

tests/TestCase/Db/Adapter/PostgresAdapterTest.php

@@ -104,6 +104,11 @@ private function usingPostgres10(): bool
         return version_compare($version, '10.0.0', '>=');
     }
 
+    public function testAdapterType()
+    {
+        $this->assertEquals('pgsql', $this->adapter->getAdapterType());
+    }
+
     public function testConnection()
     {
         $this->assertInstanceOf(Connection::class, $this->adapter->getConnection());

tests/TestCase/Migration/EnvironmentTest.php

@@ -174,7 +174,7 @@ public function testExecutingAMigrationWithTransactions()
         $adapterStub->expects($this->once())
                     ->method('commitTransaction');
 
-        $adapterStub->expects($this->exactly(2))
+        $adapterStub->expects($this->exactly(1))
                     ->method('hasTransactions')
                     ->willReturn(true);
 
@@ -194,6 +194,43 @@ public function up(): void
         $this->assertTrue($migration->executed);
     }
 
+    public function testExecutingAMigrationWithUseTransactions()
+    {
+        // stub adapter
+        $adapterStub = $this->getMockBuilder(PdoAdapter::class)
+            ->setConstructorArgs([[]])
+            ->getMock();
+        $adapterStub->expects($this->never())
+                    ->method('beginTransaction');
+
+        $adapterStub->expects($this->never())
+                    ->method('commitTransaction');
+
+        $adapterStub->expects($this->exactly(1))
+                    ->method('hasTransactions')
+                    ->willReturn(true);
+
+        $this->environment->setAdapter($adapterStub);
+
+        // migrate
+        $migration = new class ('mockenv', 20110301080000) extends AbstractMigration {
+            public bool $executed = false;
+
+            public function useTransactions(): bool
+            {
+                return false;
+            }
+
+            public function up(): void
+            {
+                $this->executed = true;
+            }
+        };
+
+        $this->environment->executeMigration($migration, MigrationInterface::UP);
+        $this->assertTrue($migration->executed);
+    }
+
     public function testExecutingAChangeMigrationUp()
     {
         // stub adapter