Skip to content

#915 allow default, not null, comment in enum type #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dereuromark merged 1 commit into from
Oct 10, 2025
Merged

#915 allow default, not null, comment in enum type #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Db/Adapter/MysqlAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,12 @@ protected function columnDefinitionSql(SchemaDialect $dialect, Column $column):
}, $values)) . ')';
}

$sql .= $column->getEncoding() ? ' CHARACTER SET ' . $column->getEncoding() : '';
$sql .= $column->getCollation() ? ' COLLATE ' . $column->getCollation() : '';
$sql .= $column->isNull() ? ' NULL' : ' NOT NULL';
$sql .= $column->getDefault() ? ' DEFAULT ' . $this->quoteString($column->getDefault()) : '';
$sql .= $column->getComment() ? ' COMMENT ' . $this->quoteString($column->getComment()) : '';

return $sql;
}

Expand Down
20 changes: 20 additions & 0 deletions tests/TestCase/Db/Adapter/MysqlAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,8 +1952,28 @@ public function testAddColumnEnum()
$table->addColumn('column2', 'enum', ['values' => ['a', 'b']])->save();
$this->assertTrue($this->adapter->hasColumn('t', 'column2'));

$comment = 'Comments from "column3"';
$table->addColumn('column3', 'enum', ['values' => ['c', 'd'], 'null' => false, 'default' => 'd', 'comment' => $comment])->save();
$this->assertTrue($this->adapter->hasColumn('t', 'column3'));

$rows = $this->adapter->fetchAll('SHOW COLUMNS FROM t');
$this->assertEquals("enum('a','b')", $rows[2]['Type']);
$this->assertEquals('YES', $rows[2]['Null']);
$this->assertNull($rows[2]['Default']);
$this->assertEquals("enum('c','d')", $rows[3]['Type']);
$this->assertEquals('NO', $rows[3]['Null']);
$this->assertEquals('d', $rows[3]['Default']);

$rows = $this->adapter->fetchAll(sprintf(
"SELECT COLUMN_NAME, COLUMN_COMMENT
FROM information_schema.columns
WHERE TABLE_SCHEMA='%s' AND TABLE_NAME='t'
ORDER BY ORDINAL_POSITION",
$this->config['database'],
));
$columnWithComment = $rows[3];
$this->assertSame('column3', $columnWithComment['COLUMN_NAME'], "Didn't set column name correctly");
$this->assertEquals($comment, $columnWithComment['COLUMN_COMMENT'], "Didn't set column comment correctly");
}

public function testAddGeoSpatialColumns()
Expand Down
Loading