Review main Merged

86814[BUGFIX] Fix mariadb platform detection in various places

Benjamin Franzke CR +2 V +2 Easy +9 −5 updated 11/04/24, 07:56

Commit message

Doctrine v4 switched `MariaDBPlatform` to be based on
*AbstractMySQLPlatform` instead of `MySQLPlatform`, that means that all
checks that test for mysql/mariadb must not check against
`MySQLPlatform` only, but also for `MariaDBPlatform`.

See https://github.com/doctrine/dbal/pull/5098

Review

  • Code review CR +2 Done
    • Benjamin Franzke +2
    • Stefan Bürk +1
    • Andreas Kienast +1
    • Benni Mack +1
  • Verified V +2 Done
    • Benjamin Franzke +2
    • Stefan Bürk +1
    • Andreas Kienast +1
    • core-ci +1 CI

Issues 2

Files 2

Review log 1012

  1. Benjamin Franzke uploaded patch set 1 10/28/24, 17:11

  2. core-ci voted on patch set 1 V -1 10/28/24, 17:21 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/68732

  3. Xavier Perseguers commented on patch set 1 10/28/24, 17:24

    DatabaseUpgradeWizardsService.php:21

    What's the (real) purpose of using an alias instead of the original name as done until now?
  4. Benjamin Franzke uploaded patch set 2 V -1 10/28/24, 17:43

  5. Benjamin Franzke commented on patch set 2 10/28/24, 17:43

    DatabaseUpgradeWizardsService.php:21 Reply

    I don't like it (either), but did it because all current mariadb/mysql detection conditions in core do so. That means "real reason" is: consistency ``` git grep "instanceof DoctrineM.*Plat" typo3/sysext/backend/Classes/Authentication/PasswordReset.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Connection.php: $platform instanceof DoctrineMariaDBPlatform => 'MySQL' . $version, typo3/sysext/core/Classes/Database/Connection.php: $platform instanceof DoctrineMySQLPlatform => 'MySQL' . $version, typo3/sysext/core/Classes/Database/Platform/PlatformInformation.php: if ($platform instanceof DoctrineMariaDBPlatform) { typo3/sysext/core/Classes/Database/Platform/PlatformInformation.php: if ($platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/ConcreteQueryBuilder.php: return $platform instanceof DoctrineMariaDBPlatform typo3/sysext/core/Classes/Database/Query/ConcreteQueryBuilder.php: || $platform instanceof DoctrineMySQL80Platform typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: $platform instanceof DoctrineMySQLPlatform => 'CHAR', typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($platform instanceof DoctrineMariaDBPlatform) { typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: $platform instanceof DoctrineMariaDBPlatform, typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: $platform instanceof DoctrineMySQLPlatform => 'IF(%s, %s, %s)', typo3/sysext/core/Classes/Database/Query/Expression/ExpressionBuilder.php: if ($this->connection->getDatabasePlatform() instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Query/QueryBuilder.php: if ($databasePlatform instanceof DoctrineMariaDBPlatform || $databasePlatform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: $databasePlatform instanceof DoctrineMariaDBPlatform, typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: $databasePlatform instanceof DoctrineMySQLPlatform => $databasePlatform, typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if (($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if (!($databasePlatform instanceof DoctrineMariaDBPlatform || $databasePlatform instanceof DoctrineMySQLPlatform)) { typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { typo3/sysext/core/Classes/Database/Schema/SchemaManager/CoreSchemaManagerFactory.php: $platform instanceof DoctrineMariaDBPlatform, typo3/sysext/core/Classes/Database/Schema/SchemaManager/CoreSchemaManagerFactory.php: $platform instanceof DoctrineMySQLPlatform, typo3/sysext/core/Classes/Database/Schema/SchemaManager/CustomDoctrineTypesColumnDefinitionTrait.php: if ($platform instanceof DoctrineMariaDBPlatform typo3/sysext/core/Classes/Database/Schema/SchemaManager/CustomPortableTableIndexesListTrait.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/core/Classes/Database/Schema/SchemaManager/MySQLSchemaManager.php: if (!($platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/core/Documentation/Changelog/13.0/Important-102402-ExtendedDoctrineDBALPlatformClasses.rst: $check = $platform instanceof DoctrineMySQLPlatform(); typo3/sysext/core/Documentation/Changelog/13.3/Feature-104482-IfSupportInExpressionBuilder.rst: $platform instanceof DoctrineMariaDBPlatform, typo3/sysext/core/Documentation/Changelog/13.3/Feature-104482-IfSupportInExpressionBuilder.rst: $platform instanceof DoctrineMySQLPlatform => 'IF(%s, %s, %s)', typo3/sysext/core/Documentation/Changelog/13.3/Feature-104493-AddCastTextExpressionSupportToExpressionBuilder.rst: if ($platform instanceof DoctrineMariaDBPlatform) { typo3/sysext/core/Documentation/Changelog/13.3/Feature-104493-AddCastTextExpressionSupportToExpressionBuilder.rst: if ($platform instanceof DoctrineMySQLPlatform) { typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php: if ($databasePlatform instanceof DoctrineMariaDBPlatform || $databasePlatform instanceof DoctrineMySQLPlatform) { typo3/sysext/install/Classes/Service/DatabaseUpgradeWizardsService.php: $isDefaultConnectionMysql = $platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform; typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck/Platform/MySql.php: return $connection->getDatabasePlatform() instanceof DoctrineMariaDBPlatform; typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php: $isConnectionMysql = ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform); typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php: return $platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform; typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableAdditionalFieldProvider.php: if (!($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform)) { typo3/sysext/scheduler/Classes/Task/OptimizeDatabaseTableTask.php: if ($platform instanceof DoctrineMariaDBPlatform || $platform instanceof DoctrineMySQLPlatform) { ```
  6. Benjamin Franzke commented on patch set 2 10/28/24, 17:46

    DatabaseUpgradeWizardsService.php:21 Reply

    I *guess* the reason for that is to differentiate from ./typo3/sysext/core/Classes/Database/Platform/MySQLPlatform.php and ./typo3/sysext/core/Classes/Database/Platform/MariaDBPlatform.php …but as I said, I personally don't like that and wouldn't have done that, but will stick to that "style" (for now).
  7. core-ci voted on patch set 2 V +1 10/28/24, 17:52 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/68734

  8. Andreas Kienast voted on patch set 2 CR +1 V +1 10/29/24, 07:48

  9. Benni Mack voted on patch set 2 CR +1 10/29/24, 09:13

  10. Stefan Bürk voted on patch set 2 CR +1 V +1 11/04/24, 07:43

  11. Benjamin Franzke voted on patch set 2 CR +2 V +2 11/04/24, 07:44

  12. Benjamin Franzke merged patch set 3 11/04/24, 07:56