Skip to content

Fix spurious warning when using empty conflictColumns with MySQL #1028

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
Feb 24, 2026
+33 −1
Merged

Fix spurious warning when using empty conflictColumns with MySQL #1028

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
2 changes: 1 addition & 1 deletion src/Db/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ protected function getUpsertClause(?InsertMode $mode, ?array $updateColumns, ?ar
return '';
}

if ($conflictColumns !== null) {
if ($conflictColumns !== null && $conflictColumns !== []) {
trigger_error(
'The $conflictColumns parameter is ignored by MySQL. ' .
'MySQL\'s ON DUPLICATE KEY UPDATE applies to all unique constraints on the table.',
Expand Down
32 changes: 32 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 @@ -3080,6 +3080,38 @@ public function testInsertOrUpdateModeResetsAfterSave()
])->save();
}

public function testInsertOrUpdateWithEmptyConflictColumnsDoesNotWarn()
{
$table = new Table('currencies', [], $this->adapter);
$table->addColumn('code', 'string', ['limit' => 3])
->addColumn('rate', 'decimal', ['precision' => 10, 'scale' => 4])
->addIndex('code', ['unique' => true])
->create();

$warning = null;
set_error_handler(function (int $errno, string $errstr) use (&$warning) {
$warning = $errstr;

return true;
}, E_USER_WARNING);

try {
$table->insertOrUpdate([
['code' => 'USD', 'rate' => 1.0000],
['code' => 'EUR', 'rate' => 0.9000],
], ['rate'], [])->save();
} finally {
restore_error_handler();
}

$this->assertNull($warning, 'Empty conflictColumns should not trigger a warning for MySQL');

$rows = $this->adapter->fetchAll('SELECT * FROM currencies ORDER BY code');
$this->assertCount(2, $rows);
$this->assertEquals('0.9000', $rows[0]['rate']);
$this->assertEquals('1.0000', $rows[1]['rate']);
}

public function testCreateTableWithRangeColumnsPartitioning()
{
// MySQL requires RANGE COLUMNS for DATE columns
Expand Down