Review main Merged

94843[BUGFIX] Fix table option lookup on MariaDB 11.4+

Stefan Bürk CR +2 V +2 Easy +39 −1 updated 07/20/26, 17:20

Commit message

MariaDB 11.4 introduced the UCA-1400 collations and made them the
server default, for example `utf8mb4_uca1400_ai_ci`. Along with them
a new `FULL_COLLATION_NAME` column was added to the information
schema table `COLLATION_CHARACTER_SET_APPLICABILITY`, which splits
the collation name: `COLLATION_NAME` only holds the character-set
independent part `uca1400_ai_ci`, while `FULL_COLLATION_NAME` holds
the complete `utf8mb4_uca1400_ai_ci`.

`ConnectionMigrator::getTableOptions()` joins that table on
`COLLATION_NAME = TABLES.TABLE_COLLATION`. Since `TABLE_COLLATION`
reports the full name, the join does not match at all for tables
using such a collation, and the inner join silently drops those
tables from the result set. Their `engine`, `row_format`, `charset`
and `comment` options are then read as unset, and the schema
analyzer keeps proposing changes which are already in place, for
instance `ALTER TABLE ... ROW_FORMAT = Dynamic` for a table that is
already `Dynamic`. The suggestion never disappears because applying
it does not change anything.

The join now uses `FULL_COLLATION_NAME` when the column is
available, and falls back to `COLLATION_NAME` otherwise. The column
is detected by inspecting the information schema instead of relying
on a server version, because platform elevation does not reliably
reflect the running MariaDB version for 11.7 and above.

Verified with the full `core/Tests/Functional/Database` suite:
MariaDB 11.4 went from 20 failures to green, MariaDB 10.4, MariaDB
11.3 and MySQL 8.0 stay green.

Manual verification (locally) - all green:

> Build/Scripts/runTests.sh -s functional \
  -d mariadb -i 11.4 typo3/sysext/core/Tests/Functional/Database
> Build/Scripts/runTests.sh -s functional \
  -d mariadb -i 10.7 typo3/sysext/core/Tests/Functional/Database
> Build/Scripts/runTests.sh -s functional \
  -d mysql -i 8.0 typo3/sysext/core/Tests/Functional/Database
> Build/Scripts/runTests.sh -s functional \
  -d mysql -i 8.4 typo3/sysext/core/Tests/Functional/Database
> Build/Scripts/runTests.sh -s functional \
  -d postgres -i 10 typo3/sysext/core/Tests/Functional/Database
> Build/Scripts/runTests.sh -s functional \
  -d sqlite typo3/sysext/core/Tests/Functional/Database

CI Matrix does not test MariaDB 11+ for now (will be enabled later)
together with other fixes for MariaDB >= 11.7 and Postgres >= 17.

Review

  • Code review CR +2 Done
    • Stefan Bürk +2
    • Markus Klein +1
    • Benni Mack +1
  • Verified V +2 Done
    • Stefan Bürk +2
    • Markus Klein +1
    • Benni Mack +1
    • core-ci +1 CI

Issues 1

Files 1

Review log 1116

  1. Stefan Bürk uploaded patch set 1 07/20/26, 08:07

  2. Stefan Bürk wrote 07/20/26, 08:09

    Topic set to doctrine-dbal
  3. core-ci voted on patch set 1 V +1 07/20/26, 08:15 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105011

  4. Stefan Bürk updated the commit message in patch set 2 V +1 07/20/26, 08:16

  5. Stefan Bürk updated the commit message in patch set 3 07/20/26, 08:18

  6. core-ci voted on patch set 2 V +1 07/20/26, 08:25 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105012

  7. core-ci voted on patch set 3 V +1 07/20/26, 08:27 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105013

  8. core-ci commented on patch set 3 07/20/26, 08:42 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105014

  9. Stefan Bürk commented on patch set 3 07/20/26, 08:44

    For reviewers - I already verified it locally also for 14.3 and 13.4 ;)
  10. Markus Klein voted on patch set 3 CR +1 07/20/26, 11:25

  11. Benni Mack updated the commit message in patch set 4 CR +1 V +1 07/20/26, 11:38

  12. Benni Mack voted on patch set 4 CR +1 V +1 07/20/26, 11:38

  13. core-ci voted on patch set 4 V +1 07/20/26, 11:46 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/105025

  14. Markus Klein voted on patch set 4 CR +1 V +1 07/20/26, 13:38

  15. Stefan Bürk voted on patch set 4 CR +2 V +2 07/20/26, 17:08

  16. Stefan Bürk merged patch set 5 07/20/26, 17:20