Skip to content

fix: Detect and sync missing columns even when schema version is unchanged #990

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

Open
rubenvdlinde wants to merge 3 commits into
base: beta
Choose a base branch
from
+28 −10
Open

fix: Detect and sync missing columns even when schema version is unchanged #990

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70d03f0
fix: Detect and sync missing columns even when schema version is unch…
rubenvdlinde Mar 24, 2026
3e9da9b
Merge branch 'development' into fix/schema-drift-sync
rubenvdlinde Mar 25, 2026
75de28a
fix: add missing end-if comments in MagicTableHandler
rubenvdlinde Mar 25, 2026
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
38 changes: 28 additions & 10 deletions lib/Db/MagicMapper/MagicTableHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,40 @@
if (($tableExists === true) && ($force === false)) {
// Table exists and not forcing update - check if schema changed.
if ($this->magicMapper->hasRegisterSchemaChanged(register: $register, schema: $schema) === false) {
$this->logger->debug(
message: '[MagicTableHandler] Table exists and schema unchanged, skipping',
// Sanity check: verify all schema columns exist in the table.
// The version hash can be stale if it was stored without a full sync.
$requiredColumns = $this->magicMapper->buildTableColumnsFromSchema(schema: $schema);
$currentColumns = $this->magicMapper->getExistingTableColumns(tableName: $tableName);
$missingColumns = array_diff_key($requiredColumns, array_flip($currentColumns));

Check failure on line 118 in lib/Db/MagicMapper/MagicTableHandler.php

View workflow job for this annotation

GitHub Actions / quality / PHP Quality (phpstan) 

Parameter #1 $array of function array_flip expects array<int|string>, array<array> given.

if (empty($missingColumns) === true) {
$this->logger->debug(
message: '[MagicTableHandler] Table exists and schema unchanged, skipping',
context: [
'file' => __FILE__,
'line' => __LINE__,
'tableName' => $tableName,
'cacheKey' => $cacheKey,
]
);
return true;
}

$this->logger->warning(
message: '[MagicTableHandler] Schema version unchanged but columns missing, forcing sync',
context: [
'file' => __FILE__,
'line' => __LINE__,
'tableName' => $tableName,
'cacheKey' => $cacheKey,
'file' => __FILE__,
'line' => __LINE__,
'tableName' => $tableName,
'missingColumns' => array_keys($missingColumns),
]
);
return true;
}
}//end if

// Schema changed, update table.
// Schema changed or columns missing, update table.
$result = $this->syncTableForRegisterSchema(register: $register, schema: $schema);
return $result['success'] ?? true;
}
}//end if

// Create new table or recreate if forced.
if (($tableExists === true) && ($force === true)) {
Expand Down
Loading