Merge remote-tracking branch 'origin/5.x' into 5.next

# Conflicts:
#	src/Db/Adapter/MysqlAdapter.php
#	src/Db/Adapter/SqliteAdapter.php

Author: dereuromark

.gitignore

@@ -16,6 +16,7 @@ error.log
 /tests/test_app/config/TestsMigrations/schema-dump-test.lock
 /tests/test_app/Plugin/TestBlog/config/Migrations/*
 .phpunit.cache
+.phpcs.cache
 .ddev
 
 # IDE and editor specific files #

composer.json

@@ -68,8 +68,8 @@
             "@stan",
             "@test"
         ],
-        "cs-check": "phpcs --parallel=16 -p",
-        "cs-fix": "phpcbf --parallel=16 -p",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "phpstan": "tools/phpstan analyse",
         "stan": "@phpstan",
         "stan-baseline": "tools/phpstan --generate-baseline",

docs/en/upgrading.rst

@@ -130,6 +130,40 @@ insertOrSkip() for Seeds
 New ``insertOrSkip()`` method for seeds to insert records only if they don't already exist,
 making seeds more idempotent.
 
+Foreign Key Constraint Naming
+=============================
+
+Starting in 5.x, when you use ``addForeignKey()`` without providing an explicit constraint
+name, migrations will auto-generate a name using the pattern ``{table}_{columns}``.
+
+Previously, MySQL would auto-generate constraint names (like ``articles_ibfk_1``), while
+PostgreSQL and SQL Server used migrations-generated names. Now all adapters use the same
+consistent naming pattern.
+
+**Impact on existing migrations:**
+
+If you have existing migrations that use ``addForeignKey()`` without explicit names, and
+later migrations that reference those constraints by name (e.g., in ``dropForeignKey()``),
+the generated names may differ between old and new migrations. This could cause
+``dropForeignKey()`` to fail if it's looking for a name that doesn't exist.
+
+**Recommendations:**
+
+1. For new migrations, you can rely on auto-generated names or provide explicit names
+2. If you have rollback issues with existing migrations, you may need to update them
+   to use explicit constraint names
+3. The auto-generated names include conflict resolution - if ``{table}_{columns}`` already
+   exists, a counter suffix is added (``_2``, ``_3``, etc.)
+
+**Name length limits:**
+
+Auto-generated names are truncated to respect database limits:
+
+- MySQL: 61 characters (64 - 3 for counter suffix)
+- PostgreSQL: 60 characters (63 - 3)
+- SQL Server: 125 characters (128 - 3)
+- SQLite: No limit
+
 Migration File Compatibility
 ============================
 

phpcs.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <ruleset name="CakePHP Core">
-    <arg value="ns"/>
+    <arg value="nps"/>
+    <arg name="colors"/>
+    <arg name="parallel" value="4"/>
+    <arg name="cache" value=".phpcs.cache"/>
 
     <file>src/</file>
     <file>tests/</file>

src/Db/Adapter/MysqlAdapter.php

@@ -31,6 +31,11 @@
  */
 class MysqlAdapter extends AbstractAdapter
 {
+    /**
+     * Maximum length for identifiers (table names, column names, constraint names, etc.)
+     */
+    protected const IDENTIFIER_MAX_LENGTH = 64;
+
     /**
      * @var string[]
      */
@@ -371,8 +376,10 @@ public function createTable(TableMetadata $table, array $columns = [], array $in
     protected function mapColumnData(array $data): array
     {
         if ($data['type'] == self::TYPE_TEXT && $data['length'] !== null) {
+            // Accept both migrations TEXT_LONG and CakePHP LENGTH_LONG for backward compatibility
+            // with migrations generated before the fix (LENGTH_TINY/MEDIUM are already equal to TEXT_TINY/MEDIUM)
             $data['length'] = match ($data['length']) {
-                self::TEXT_LONG => TableSchema::LENGTH_LONG,
+                self::TEXT_LONG, TableSchema::LENGTH_LONG => TableSchema::LENGTH_LONG,
                 self::TEXT_MEDIUM => TableSchema::LENGTH_MEDIUM,
                 self::TEXT_REGULAR => null,
                 self::TEXT_TINY => TableSchema::LENGTH_TINY,
@@ -979,7 +986,7 @@ protected function getAddForeignKeyInstructions(TableMetadata $table, ForeignKey
     {
         $alter = sprintf(
             'ADD %s',
-            $this->getForeignKeySqlDefinition($foreignKey),
+            $this->getForeignKeySqlDefinition($foreignKey, $table->getName()),
         );
 
         return new AlterInstructions([$alter]);
@@ -1194,15 +1201,13 @@ protected function getIndexSqlDefinition(Index $index): string
      * Gets the MySQL Foreign Key Definition for an ForeignKey object.
      *
      * @param \Migrations\Db\Table\ForeignKey $foreignKey Foreign key
+     * @param string $tableName Table name for auto-generating constraint name
      * @return string
      */
-    protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
+    protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $tableName): string
     {
-        $def = '';
-        $name = $foreignKey->getName();
-        if ($name) {
-            $def .= ' CONSTRAINT ' . $this->quoteColumnName($name);
-        }
+        $constraintName = $foreignKey->getName() ?: $this->getUniqueForeignKeyName($tableName, $foreignKey->getColumns());
+        $def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName);
         $columnNames = [];
         foreach ($foreignKey->getColumns() as $column) {
             $columnNames[] = $this->quoteColumnName($column);
@@ -1229,6 +1234,35 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
         return $def;
     }
 
+    /**
+     * Generate a unique foreign key constraint name.
+     *
+     * @param string $tableName Table name
+     * @param array<string> $columns Column names
+     * @return string
+     */
+    protected function getUniqueForeignKeyName(string $tableName, array $columns): string
+    {
+        $baseName = $tableName . '_' . implode('_', $columns);
+        $maxLength = static::IDENTIFIER_MAX_LENGTH - 3;
+        if (strlen($baseName) > $maxLength) {
+            $baseName = substr($baseName, 0, $maxLength);
+        }
+        $existingKeys = $this->getForeignKeys($tableName);
+        $existingNames = array_column($existingKeys, 'name');
+
+        if (!in_array($baseName, $existingNames, true)) {
+            return $baseName;
+        }
+
+        $counter = 2;
+        while (in_array($baseName . '_' . $counter, $existingNames, true)) {
+            $counter++;
+        }
+
+        return $baseName . '_' . $counter;
+    }
+
     /**
      * Returns MySQL column types (inherited and MySQL specified).
      *

src/Db/Adapter/PostgresAdapter.php

@@ -29,6 +29,11 @@
 
 class PostgresAdapter extends AbstractAdapter
 {
+    /**
+     * Maximum length for identifiers (table names, column names, constraint names, etc.)
+     */
+    protected const IDENTIFIER_MAX_LENGTH = 63;
+
     public const GENERATED_ALWAYS = 'ALWAYS';
     public const GENERATED_BY_DEFAULT = 'BY DEFAULT';
     /**
@@ -955,11 +960,7 @@ protected function getIndexSqlDefinition(Index $index, string $tableName): strin
      */
     protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $tableName): string
     {
-        $parts = $this->getSchemaName($tableName);
-
-        $constraintName = $foreignKey->getName() ?: (
-            $parts['table'] . '_' . implode('_', $foreignKey->getColumns()) . '_fkey'
-        );
+        $constraintName = $foreignKey->getName() ?: $this->getUniqueForeignKeyName($tableName, $foreignKey->getColumns());
         $columnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getColumns()));
         $refColumnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getReferencedColumns()));
         $referencedTable = $foreignKey->getReferencedTable();
@@ -982,6 +983,36 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $ta
         return $def;
     }
 
+    /**
+     * Generate a unique foreign key constraint name.
+     *
+     * @param string $tableName Table name
+     * @param array<string> $columns Column names
+     * @return string
+     */
+    protected function getUniqueForeignKeyName(string $tableName, array $columns): string
+    {
+        $parts = $this->getSchemaName($tableName);
+        $baseName = $parts['table'] . '_' . implode('_', $columns) . '_fkey';
+        $maxLength = static::IDENTIFIER_MAX_LENGTH - 3;
+        if (strlen($baseName) > $maxLength) {
+            $baseName = substr($baseName, 0, $maxLength);
+        }
+        $existingKeys = $this->getForeignKeys($tableName);
+        $existingNames = array_column($existingKeys, 'name');
+
+        if (!in_array($baseName, $existingNames, true)) {
+            return $baseName;
+        }
+
+        $counter = 2;
+        while (in_array($baseName . '_' . $counter, $existingNames, true)) {
+            $counter++;
+        }
+
+        return $baseName . '_' . $counter;
+    }
+
     /**
      * @inheritDoc
      */

src/Db/Adapter/SqliteAdapter.php

@@ -1428,7 +1428,7 @@ protected function getAddForeignKeyInstructions(TableMetadata $table, ForeignKey
         $tableName = $table->getName();
         $instructions->addPostStep(function ($state) use ($foreignKey, $tableName) {
             $this->execute('pragma foreign_keys = ON');
-            $sql = substr($state['createSQL'], 0, -1) . ',' . $this->getForeignKeySqlDefinition($foreignKey) . '); ';
+            $sql = substr($state['createSQL'], 0, -1) . ',' . $this->getForeignKeySqlDefinition($foreignKey, $tableName) . '); ';
 
             //Delete indexes from original table and recreate them in temporary table
             $schema = $this->getSchemaName($tableName, true)['schema'];
@@ -1673,15 +1673,13 @@ public function getColumnTypes(): array
      * Gets the SQLite Foreign Key Definition for an ForeignKey object.
      *
      * @param \Migrations\Db\Table\ForeignKey $foreignKey Foreign key
+     * @param string $tableName Table name for auto-generating constraint name
      * @return string
      */
-    protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
+    protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $tableName): string
     {
-        $def = '';
-        $name = $foreignKey->getName();
-        if ($name) {
-            $def .= ' CONSTRAINT ' . $this->quoteColumnName($name);
-        }
+        $constraintName = $foreignKey->getName() ?: $this->getUniqueForeignKeyName($tableName, $foreignKey->getColumns());
+        $def = ' CONSTRAINT ' . $this->quoteColumnName($constraintName);
         $columnNames = [];
         foreach ($foreignKey->getColumns() as $column) {
             $columnNames[] = $this->quoteColumnName($column);
@@ -1706,6 +1704,31 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey): string
         return $def;
     }
 
+    /**
+     * Generate a unique foreign key constraint name.
+     *
+     * @param string $tableName Table name
+     * @param array<string> $columns Column names
+     * @return string
+     */
+    protected function getUniqueForeignKeyName(string $tableName, array $columns): string
+    {
+        $baseName = $tableName . '_' . implode('_', $columns);
+        $existingKeys = $this->getForeignKeys($tableName);
+        $existingNames = array_column($existingKeys, 'name');
+
+        if (!in_array($baseName, $existingNames, true)) {
+            return $baseName;
+        }
+
+        $counter = 2;
+        while (in_array($baseName . '_' . $counter, $existingNames, true)) {
+            $counter++;
+        }
+
+        return $baseName . '_' . $counter;
+    }
+
     /**
      * @inheritDoc
      */

src/Db/Adapter/SqlserverAdapter.php

@@ -30,6 +30,11 @@
  */
 class SqlserverAdapter extends AbstractAdapter
 {
+    /**
+     * Maximum length for identifiers (table names, column names, constraint names, etc.)
+     */
+    protected const IDENTIFIER_MAX_LENGTH = 128;
+
     /**
      * @var string[]
      */
@@ -874,7 +879,7 @@ protected function getIndexSqlDefinition(Index $index, string $tableName): strin
      */
     protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $tableName): string
     {
-        $constraintName = $foreignKey->getName() ?: $tableName . '_' . implode('_', $foreignKey->getColumns());
+        $constraintName = $foreignKey->getName() ?: $this->getUniqueForeignKeyName($tableName, $foreignKey->getColumns());
         $columnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getColumns()));
         $refColumnList = implode(', ', array_map($this->quoteColumnName(...), $foreignKey->getReferencedColumns()));
 
@@ -895,6 +900,35 @@ protected function getForeignKeySqlDefinition(ForeignKey $foreignKey, string $ta
         return $def;
     }
 
+    /**
+     * Generate a unique foreign key constraint name.
+     *
+     * @param string $tableName Table name
+     * @param array<string> $columns Column names
+     * @return string
+     */
+    protected function getUniqueForeignKeyName(string $tableName, array $columns): string
+    {
+        $baseName = $tableName . '_' . implode('_', $columns);
+        $maxLength = static::IDENTIFIER_MAX_LENGTH - 3;
+        if (strlen($baseName) > $maxLength) {
+            $baseName = substr($baseName, 0, $maxLength);
+        }
+        $existingKeys = $this->getForeignKeys($tableName);
+        $existingNames = array_column($existingKeys, 'name');
+
+        if (!in_array($baseName, $existingNames, true)) {
+            return $baseName;
+        }
+
+        $counter = 2;
+        while (in_array($baseName . '_' . $counter, $existingNames, true)) {
+            $counter++;
+        }
+
+        return $baseName . '_' . $counter;
+    }
+
     /**
      * Creates the specified schema.
      *

src/Db/Table/ForeignKey.php

@@ -113,11 +113,11 @@ public function setOptions(array $options)
                 throw new RuntimeException(sprintf('"%s" is not a valid foreign key option.', $option));
             }
 
-            // handle $options['delete'] as $options['update']
+            // handle $options['delete'] and $options['update']
             if ($option === 'delete') {
-                $this->setOnDelete($value);
+                $this->delete = $this->normalizeAction($value);
             } elseif ($option === 'update') {
-                $this->setOnUpdate($value);
+                $this->update = $this->normalizeAction($value);
             } elseif ($option === 'deferrable') {
                 $this->setDeferrableMode($value);
             } else {

src/View/Helper/MigrationHelper.php

@@ -18,11 +18,13 @@
 use Cake\Database\Connection;
 use Cake\Database\Driver\Mysql;
 use Cake\Database\Schema\CollectionInterface;
+use Cake\Database\Schema\TableSchema;
 use Cake\Database\Schema\TableSchemaInterface;
 use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 use Cake\View\Helper;
 use Cake\View\View;
+use Migrations\Db\Adapter\MysqlAdapter;
 use Migrations\Db\Table\ForeignKey;
 
 /**
@@ -401,6 +403,10 @@ public function getColumnOption(array $options): array
         if (empty($columnOptions['collate'])) {
             unset($columnOptions['collate']);
         }
+        // isset() returns false for null values, so this handles both missing and null cases
+        if (!isset($columnOptions['fixed'])) {
+            unset($columnOptions['fixed']);
+        }
 
         // currently only MySQL supports the signed option
         $driver = $connection->getDriver();
@@ -441,6 +447,13 @@ public function getColumnOption(array $options): array
             }
         }
 
+        // Convert CakePHP's LENGTH_LONG to migrations TEXT_LONG for text columns
+        // CakePHP uses LENGTH_LONG = 4294967295, but migrations expects TEXT_LONG = 2147483647
+        // (LENGTH_TINY and LENGTH_MEDIUM have the same values as TEXT_TINY and TEXT_MEDIUM)
+        if (isset($columnOptions['limit']) && $columnOptions['limit'] === TableSchema::LENGTH_LONG) {
+            $columnOptions['limit'] = MysqlAdapter::TEXT_LONG;
+        }
+
         return $columnOptions;
     }