Skip to content

Add fixed option for binary column type#1014

Merged
markstory merged 4 commits into5.xfrom
add-fixed-option-for-binary-type
Mar 7, 2026
Merged

Add fixed option for binary column type#1014
markstory merged 4 commits into5.xfrom
add-fixed-option-for-binary-type

Conversation

@dereuromark
Copy link
Member

@dereuromark dereuromark commented Jan 28, 2026

Summary

  • Adds support for the fixed attribute on binary columns to distinguish between fixed-length BINARY and variable-length VARBINARY types
  • When reflecting a BINARY(n) column from the database, fixed => true is now passed through to the Column object
  • When baking migrations, the fixed option is now included in the generated migration code

This is the companion PR to cakephp/cakephp#19207 which adds the core framework support for this feature.

Usage

// Creates VARBINARY(20) - variable length (default)
$table->addColumn('data', 'binary', ['length' => 20]);

// Creates BINARY(20) - fixed length  
$table->addColumn('hash', 'binary', ['length' => 20, 'fixed' => true]);

Refs #999


Constraint: This one doesnt technically need one.

Also, even if, since #1013 is raising the constraint already, I skipped it for this PR here.

Add support for the `fixed` attribute on binary columns to distinguish
between fixed-length BINARY and variable-length VARBINARY types.
This mirrors cakephp/cakephp#19207.
Tests cover:
- Column class getter/setter for fixed option
- Column::toArray() including fixed in output
- Column::setOptions() accepting fixed option
- MigrationHelper::getColumnOption() including/excluding fixed
- MysqlAdapter creating BINARY vs VARBINARY based on fixed option
Comment on lines +788 to +793
public function setFixed(bool $fixed)
{
$this->fixed = $fixed;

return $this;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should eventually raise the version constraint so that we can remove this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a TODO here in code? Or just track this for a future cleanup in some ticket?

Comment on lines +3529 to +3532
$this->assertNotNull($hashCol);
$this->assertNotNull($dataCol);
$this->assertTrue($hashCol->getFixed());
$this->assertNull($dataCol->getFixed());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also have an assertion on the column types?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@dereuromark
Copy link
Member Author

We need to wait with final merge and bugfix release until core patch has been released it seems.

@dereuromark dereuromark marked this pull request as ready for review March 6, 2026 15:51
@markstory markstory merged commit 9d74ef7 into 5.x Mar 7, 2026
14 checks passed
@markstory markstory deleted the add-fixed-option-for-binary-type branch March 7, 2026 04:00
jamisonbryant pushed a commit that referenced this pull request Mar 11, 2026
Add support for the `fixed` attribute on binary columns to distinguish
between fixed-length BINARY and variable-length VARBINARY types.
This mirrors cakephp/cakephp#19207.

* Add test cases for fixed option on binary columns

Tests cover:
- Column class getter/setter for fixed option
- Column::toArray() including fixed in output
- Column::setOptions() accepting fixed option
- MigrationHelper::getColumnOption() including/excluding fixed
- MysqlAdapter creating BINARY vs VARBINARY based on fixed option

* Add column type assertions to binary fixed test
dereuromark added a commit that referenced this pull request Mar 11, 2026
* add using when changing column type to json (#1031)

* Fix CI failures on MySQL/MariaDB (#1034)

1. Handle uninitialized Column::$fixed property in BakeMigrationDiffCommand

   When TableSchema::getColumn() is called on cached/serialized schema
   objects, the Column::$fixed property may not be initialized, causing
   an Error. Added safeGetColumn() helper that catches this error and
   uses reflection to initialize uninitialized properties before retry.

2. Fix CURRENT_TIMESTAMP test assertion for MySQL/MariaDB

   Different versions of MySQL and MariaDB return CURRENT_TIMESTAMP
   in different formats (CURRENT_TIMESTAMP, current_timestamp(),
   CURRENT_TIMESTAMP()). Changed the test to use a regex that accepts
   all valid formats case-insensitively.

Fixes #1033

* Fix TEXT column variants not round-tripping correctly (#1032)

When using migration_diff, TEXT column variants (TINYTEXT, MEDIUMTEXT,
LONGTEXT) were not being properly mapped back from the database. The
BLOB type handling already used rawType to distinguish BLOB variants,
but TEXT variants were missing equivalent handling.

This adds similar rawType-based mapping for TEXT columns in
mapColumnType() and includes round-trip tests.

Fixes #1029

* Add fixed option for binary column type (#1014)

Add support for the `fixed` attribute on binary columns to distinguish
between fixed-length BINARY and variable-length VARBINARY types.
This mirrors cakephp/cakephp#19207.

* Add test cases for fixed option on binary columns

Tests cover:
- Column class getter/setter for fixed option
- Column::toArray() including fixed in output
- Column::setOptions() accepting fixed option
- MigrationHelper::getColumnOption() including/excluding fixed
- MysqlAdapter creating BINARY vs VARBINARY based on fixed option

* Add column type assertions to binary fixed test

* Fix misleading next steps message in upgrade command (#1037)

Only show 'Set legacyTables => false' step after tables have been
dropped, as the upgrade command becomes unavailable once this config
is set.

Fixes #1036

* Fix upgrade command not matching plugins with slashes (#1039)

* Fix upgrade command not matching plugins with slashes

When upgrading from legacy phinxlog tables, the plugin name was being
derived by camelizing the table prefix (e.g. cake_d_c_users -> CakeDCUsers).
This didn't work for plugins with slashes in their names like CakeDC/Users
since the slash was replaced with underscore during table name generation.

This fix builds a map of loaded plugin names to their expected table
prefixes, allowing proper matching of plugins like CakeDC/Users.

Fixes #1038

* Fix test for SQL Server compatibility

* Add TYPE_BIT constant to AdapterInterface (#1013)

* Add TYPE_BIT constant to AdapterInterface

Adds the TYPE_BIT constant mapping to TableSchemaInterface::TYPE_BIT
for consistency with the core BIT type support added in cakephp/cakephp#19223.

This allows migration users to reference AdapterInterface::TYPE_BIT
when defining BIT columns in MySQL migrations.

* Bump cakephp/database constraint to ^5.3.2 for TYPE_BIT support

* Bump PHPStan level +1

* Make props non-nullable

* Add null guards for getConstraint() in BakeMigrationDiffCommand

* Fix nullable return types in Column and ForeignKey

Column::getNull() now coalesces the nullable bool property to
false. ForeignKey::getOnDelete()/getOnUpdate() guard against null
from getDelete()/getUpdate() before calling mapAction().

* Fix null safety in Db adapters and domain classes

Cast preg_replace results to string, coalesce nullable getColumns()
returns, cast nullable getReferencedTable()/getName() at call sites,
and use null-safe operator for optional ConsoleIo.

* Fix remaining PHPStan level 8 null safety issues

Add null guards for constraint diff, fail-fast for null column type,
fix import order, and remaining null safety in BaseSeed, ColumnParser,
TableFinder, and MigrationHelper.

* Replace assert with RuntimeException in AbstractAdapter::getConnection()

Assertions can be disabled in production, which would allow a null
connection to slip through silently. Throw a RuntimeException instead
to fail fast in all environments.

* Use truthiness checks for optional nullable getters

Replace (string) casts with assign-then-check pattern for optional
values that can legitimately be null: Index::getWhere(),
ForeignKey::getName(), Index::getName(), Column::getGenerated().
This avoids silently converting null to empty string.

* Throw on null for required Column::getName() and FK::getReferencedTable()

Replace (string) casts with explicit null checks and
InvalidArgumentException throws for values that must be present:
Column::getName() in SQL generation and ForeignKey::getReferencedTable()
in FK definition builders. A column without a name or a foreign key
without a referenced table are always programming errors that should
fail fast rather than silently produce broken SQL.

* Narrow ForeignKey::getColumns() return type and remove null guards

Override getColumns() in Migrations ForeignKey to return array instead
of the parent's ?array. The $columns property is always initialized as
[] in the constructor, making null unreachable. This is a covariant
return type narrowing, same pattern used for Column::getNull().

Removes the now-unnecessary ?? [] fallbacks from all 6 call sites
across the adapter and plan classes.

* Narrow Column::getName() return type and remove dead null checks

Override getName() in Migrations Column to return string instead of the
parent's ?string. The $name property is typed as string (not ?string)
in the constructor, making null unreachable. This is a covariant return
type narrowing, same pattern used for ForeignKey::getColumns().

Removes now-unnecessary null checks across adapter/action files and
the dead null guard in Table::setPrimaryKey().

* Add null guards for column diff loop in BakeMigrationDiffCommand

Use early-continue pattern to narrow nullable safeGetColumn() return
types before array operations, fixing PHPStan level 8 errors.

* Cast nullable getName() to string for drop FK/index instructions

* Fix phpcs coding standard violations

Remove unused InvalidArgumentException import from RecordingAdapter,
extract assignment out of if condition in PostgresAdapter, and remove
blank line before closing brace in ForeignKeyTest.

* Consolidate null guard conditions in BakeMigrationDiffCommand

* Fix inverted condition in ChangeColumn name fallback

* Accept null in Column::setFixed() for snapshot compatibility

Generated migration snapshots can emit 'fixed' => null for binary
columns, which causes a TypeError since setFixed() only accepted
bool. Widen the parameter to ?bool to match the property and getter
types. Fixes #1046.

---------

Co-authored-by: Matthias Wirtz <matthias.wirtz@hotmail.de>
Co-authored-by: Mark Scherer <dereuromark@users.noreply.github.com>
Co-authored-by: Jamison Bryant <jbryant@ticketsauce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants