AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-11-12 15:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a collation check and repair to Admin > Debug: functions/database_collation.php reads from db.sql each table's default collation and each text column's, compares them with information_schema and can give every table that differs the collation db.sql has for it, one ALTER a table with a MODIFY a column built from its SHOW CREATE TABLE line with only the collation replaced, as database 3.6.5 does, so a binary column that was flattened goes back to utf8mb4_bin too and no column type changes; the ITFlow section gains a Database collation check that warns when any table differs, and the Database card lists them under Structure a row a table, in Copy for support as well, with a Repair collations button behind a confirm; the button posts to the new admin/post/debug.php, CSRF-checked and not tied to the request so a large table is not cut off with the browser, which writes an audit log entry naming the tables changed and a warning in App Logs for each one it had to leave, a table being changed whole or not at all; tables and columns db.sql does not have are not looked at; run through the page and against the whole schema on MySQL 8.0 and MariaDB 10.11; add both to the 26.11.7 changelog section

Browse Source
This commit is contained in:
johnnyq
2026-11-11 20:33:19 -05:00
parent 81ea84b71e
commit bce68aac6a
6 changed files with 303 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
admin/debug.php
View File

@@ -5,7 +5,8 @@
* (functions/system_health.php). What needs putting right comes first, each
* with what to do and where; then the figures at a glance, every check by
* section, the database (its size, biggest tables and how its structure
* compares with db.sql) and the uploads folder. Copy for support puts it all
* compares with db.sql - with Repair collations for tables whose collation
* differs, admin/post/debug.php) and the uploads folder. Copy for support puts it all
* on the clipboard as plain text for a forum post or a support email,
* without host names, paths or keys.
*/
@@ -188,16 +189,39 @@ $action_link = function (array $item, $class) {
<?php } else {
$missing = count(array_filter($differences, function ($d) {
return strpos($d['what'], 'Missing') === 0;
})); ?>
}));
// Collations - a row a table, and one more for a column with a collation of its own
$collation_rows = array_filter($differences, function ($d) {
return $d['what'] === 'Different collation';
});
$collation_tables = count(array_unique(array_column($collation_rows, 'table'))); ?>
<p class="mb-2" data-debug-structure="<?= count($differences) ?>">
<i class="fas fa-fw <?= $missing ? 'fa-times-circle text-danger' : 'fa-info-circle text-secondary' ?> me-1"></i>
<i class="fas fa-fw <?= $missing ? 'fa-times-circle text-danger' : ($collation_tables ? 'fa-exclamation-triangle text-warning' : 'fa-info-circle text-secondary') ?> me-1"></i>
<?= $plural(count($differences), 'difference', 'differences') ?> from db.sql.
<?php if ($missing) { ?>
Something missing usually means a database update didn't finish - <a href="update.php">Maintenance &gt; Update</a>.
<?php } else { ?>
<?php } elseif (count($differences) > count($collation_rows)) { ?>
Extra tables and columns are usually left by older versions or a plugin, and do no harm.
<?php } ?>
</p>
<?php if ($collation_tables) {
$collation_confirm = $plural($collation_tables, 'table', 'tables') . ' will be given the collation db.sql has for ' . ($collation_tables === 1 ? 'it' : 'them')
. '. A table is rebuilt as it is changed - a moment for most, minutes for a very large one, and ITFlow can be slow meanwhile. Nothing in a table is changed. Take a backup first if the last one is old.'; ?>
<div class="alert alert-warning d-flex flex-column flex-md-row align-items-md-center gap-3 mb-3" id="debug-collation" data-debug-collation="<?= $collation_tables ?>">
<div class="flex-grow-1 small">
<strong><?= $plural($collation_tables, 'table has', 'tables have') ?> a collation other than db.sql's.</strong>
Text in <?= $collation_tables === 1 ? 'it' : 'them' ?> is compared by different rules from the rest of the database, and a page that reads both can stop with
&quot;Illegal mix of collations&quot;. Repair gives each the collation db.sql has for it; what is in the tables stays as it is.
</div>
<form action="post.php" method="post" class="flex-shrink-0">
<input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
<button type="submit" name="repair_database_collation" class="btn btn-warning btn-sm confirm-link" data-confirm-title="Repair collations?" data-confirm-button="Repair"
data-confirm-icon="question" data-confirm-text="<?= escapeHtml($collation_confirm) ?>">
<i class="fas fa-fw fa-wrench me-2"></i>Repair collations
</button>
</form>
</div>
<?php } ?>
<details <?= count($differences) <= 10 ? 'open' : '' ?> class="mb-3">
<summary class="small text-body-secondary mb-2">Show them</summary>
<div class="table-responsive">