72372[!!!][TASK] Require Doctrine/DBAL 3.2
Commit message
Review
-
Code review CR +2 Done
- Benni Mack +2
- Stefan Bürk +1
- Christian Kuhn +1
-
Verified V +2 Done
- Benni Mack +2
- Stefan Bürk +1
- Christian Kuhn +1
- core-ci +1 CI
Issues 1
Files 40
- typo3/sysext/backend/Classes/Authentication/PasswordReset.php+2 −2
- typo3/sysext/backend/Classes/Utility/BackendUtility.php9+5 −11
- typo3/sysext/core/Classes/Database/Driver/PDOMySql/Driver.php+31 −18
- typo3/sysext/core/Classes/Database/Driver/PDOPgSql/Driver.php+24 −13
- typo3/sysext/core/Classes/Database/Driver/PDOSqlite/Driver.php+19 −11
- typo3/sysext/core/Classes/Database/Driver/PDOSqlsrv/Connection.php+18 −20
- typo3/sysext/core/Classes/Database/Driver/PDOSqlsrv/Driver.php+37 −25
- typo3/sysext/core/Classes/Database/Driver/PDOSqlsrv/Statement.php+20 −8
- typo3/sysext/core/Classes/Database/Driver/DriverConnection.phpnew+111 −0
- typo3/sysext/core/Classes/Database/Driver/DriverResult.phpnew+172 −0
- typo3/sysext/core/Classes/Database/Driver/DriverStatement.phpnew+139 −0
- typo3/sysext/core/Classes/Database/Driver/PDOConnection.phpdeleted+0 −42
- typo3/sysext/core/Classes/Database/Driver/PDOStatement.phpdeleted+0 −91
- typo3/sysext/core/Classes/Database/Driver/PDOStatementImplementation.phpdeleted+0 −64
- typo3/sysext/core/Classes/Database/Platform/PlatformInformation.php+3 −3
- typo3/sysext/core/Classes/Database/Query/QueryBuilder.php+8 −16
- typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaAlterTableListener.php+2 −2
- typo3/sysext/core/Classes/Database/Schema/EventListener/SchemaIndexDefinitionListener.php+2 −2
- typo3/sysext/core/Classes/Database/Schema/Parser/TableBuilder.php+4 −4
- typo3/sysext/core/Classes/Database/Schema/Comparator.php+168 −6
Show 20 more files
- typo3/sysext/core/Classes/Database/Schema/ConnectionMigrator.php2+69 −77
- typo3/sysext/core/Classes/Database/Schema/SchemaMigrator.php+2 −2
- typo3/sysext/core/Classes/Database/Connection.php2+2 −22
- typo3/sysext/core/Classes/Database/ConnectionPool.php2+0 −1
- typo3/sysext/core/Classes/DataHandling/DataHandler.php6+6 −9
- typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96287-DoctrineDBAL32.rstnew+75 −0
- typo3/sysext/core/Tests/Unit/Database/Platform/PlatformInformationTest.php+3 −3
- typo3/sysext/core/Tests/Unit/Database/Query/QueryBuilderTest.php+7 −7
- typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php+2 −2
- typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php+5 −19
- typo3/sysext/core/composer.json+1 −1
- typo3/sysext/indexed_search/Tests/Functional/Utility/LikeWildcardTest.php+2 −2
- typo3/sysext/install/Classes/Database/PermissionsCheck.php+3 −3
- typo3/sysext/install/Classes/Service/UpgradeWizardsService.php+2 −2
- typo3/sysext/install/Classes/SystemEnvironment/DatabaseCheck.php+2 −6
- typo3/sysext/install/composer.json+1 −1
- typo3/sysext/lowlevel/Classes/Database/QueryGenerator.php+2 −2
- typo3/sysext/redirects/composer.json+1 −1
- composer.json+1 −1
- composer.lock+130 −108
Review log 62109
Show 4484 earlier messages
-
Benni Mack uploaded patch set 1 11/29/21, 12:38
-
Benni Mack uploaded patch set 2 11/29/21, 12:43
-
core-ci voted on patch set 1 V -1 11/29/21, 12:45 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19982
-
core-ci voted on patch set 2 V -1 11/29/21, 12:50 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19983
-
Benni Mack uploaded patch set 3 11/29/21, 12:54
-
Benni Mack uploaded patch set 4 11/29/21, 12:56
-
core-ci voted on patch set 3 V -1 11/29/21, 13:03 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19984
-
core-ci voted on patch set 4 V -1 11/29/21, 13:05 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19985
-
Benni Mack uploaded patch set 5 11/30/21, 12:32
-
Benni Mack uploaded patch set 6 11/30/21, 12:48
-
core-ci voted on patch set 5 V -1 11/30/21, 12:56 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20227
-
core-ci voted on patch set 6 V -1 11/30/21, 13:17 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20231
-
Benni Mack uploaded patch set 7 11/30/21, 15:28
-
Benni Mack uploaded patch set 8 11/30/21, 15:31
-
core-ci voted on patch set 7 V -1 11/30/21, 15:51 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20240
-
core-ci voted on patch set 8 V -1 11/30/21, 16:13 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20241
-
Benni Mack uploaded patch set 9 11/30/21, 16:49
-
Benni Mack uploaded patch set 10 11/30/21, 17:05
-
core-ci voted on patch set 9 V -1 11/30/21, 17:29 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20245
-
Christian Kuhn rebased onto patch set 11 11/30/21, 17:33
-
core-ci voted on patch set 10 V -1 11/30/21, 17:34 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20248
-
core-ci voted on patch set 11 V -1 11/30/21, 17:47 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20255
-
Benni Mack uploaded patch set 12 12/01/21, 15:41
-
core-ci voted on patch set 12 V -1 12/01/21, 16:09 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20334
-
Benni Mack uploaded patch set 13 12/01/21, 16:18
-
core-ci voted on patch set 13 V -1 12/01/21, 16:39 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20338
-
Benni Mack uploaded patch set 14 12/01/21, 16:49
-
core-ci voted on patch set 14 V -1 12/01/21, 17:12 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20343
-
Benni Mack uploaded patch set 15 12/02/21, 12:43
-
core-ci voted on patch set 15 V -1 12/02/21, 13:02 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20396
-
Benni Mack uploaded patch set 16 12/02/21, 13:09
-
Benni Mack uploaded patch set 17 12/02/21, 13:10
-
core-ci voted on patch set 17 V -1 12/02/21, 13:25 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20400
-
core-ci voted on patch set 16 V -1 12/02/21, 13:26 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20399
-
Benni Mack uploaded patch set 18 12/02/21, 13:26
-
core-ci voted on patch set 18 V -1 12/02/21, 13:46 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20403
-
Benni Mack uploaded patch set 19 12/02/21, 13:52
-
core-ci voted on patch set 19 V -1 12/02/21, 14:06 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20405
-
Benni Mack uploaded patch set 20 12/02/21, 15:10
-
core-ci voted on patch set 20 V -1 12/02/21, 15:25 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20415
-
Oliver Hader commented on patch set 20 12/02/21, 15:32
There are probably still some occurrences of deprecated `Result::fetch()` and similar, that could be adjusted as well... -
Stefan Bürk commented on patch set 20 CR -1 12/02/21, 21:23
temporarly -1, check patch out and working on the postgres pipeline fails -
Stefan Bürk uploaded patch set 21 12/02/21, 23:53
-
Stefan Bürk commented on patch set 21 CR -1 12/03/21, 00:03
functional postgress green, next mariadb functionals (on it) -
core-ci voted on patch set 21 V -1 12/03/21, 00:07 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20450
-
Stefan Bürk uploaded patch set 22 12/03/21, 01:17
-
core-ci voted on patch set 22 V -1 12/03/21, 01:31 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20455
-
Stefan Bürk uploaded patch set 23 12/03/21, 01:56
-
core-ci voted on patch set 23 V -1 12/03/21, 02:08 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20456
-
Stefan Bürk uploaded patch set 24 12/03/21, 02:24
-
core-ci voted on patch set 24 V +1 12/03/21, 02:38 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20458
-
Stefan Bürk commented on patch set 24 CR -1 12/03/21, 02:47
Summary: * functional/postgres: added ServerInfoAwareConnection to PDOConnection(), thus ServerVersion could be fetched again. Tests failed because platform 94 instead of 100 was loaded * functional/mariadb: moved some code from doctrine/dbal to core classes to keep it working. This MUST be discussed and is the reason for the -1 => Comparator() * replaced one last fetchColumn() with fetchOne() * replaced removed ping() method with getWrappedConnection() as database connection check in several places -
Stefan Bürk uploaded patch set 25 12/03/21, 10:57
-
core-ci voted on patch set 25 V +1 12/03/21, 11:12 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20465
-
core-ci voted on patch set 25 V -1 12/03/21, 11:51 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20469
-
Stefan Bürk uploaded patch set 26 12/04/21, 14:48
-
core-ci voted on patch set 26 V +1 12/04/21, 15:05 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20565
-
Stefan Bürk commented on patch set 26 12/04/21, 15:12
Patchset 26 is for testing changes in testing-framework, which are needed for functional mssql testing (nightly). This will also be tested with nightly, but as it is a fork min/max should fail, which is expected. lock tests however should be green. TF changes are testes for main / doctrine 2.13.x compatibility in a dedicated wip patch. -
core-ci voted on patch set 26 V -1 12/04/21, 15:32 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20567
-
Benni Mack uploaded patch set 27 12/07/21, 11:49
-
core-ci voted on patch set 27 V -1 12/07/21, 11:58 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20716
-
Benni Mack uploaded patch set 28 12/07/21, 12:25
-
core-ci voted on patch set 28 V -1 12/07/21, 12:27 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20720
-
Stefan Bürk uploaded patch set 29 12/07/21, 13:59
-
Stefan Bürk uploaded patch set 30 12/07/21, 14:10
-
core-ci voted on patch set 29 V -1 12/07/21, 14:16 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20728
-
Stefan Bürk uploaded patch set 31 12/07/21, 14:18
-
core-ci voted on patch set 30 V -1 12/07/21, 14:30 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20729
-
core-ci voted on patch set 31 V +1 12/07/21, 14:36 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20731
-
Stefan Bürk commented on patch set 31 12/07/21, 14:40
After splitting & rebasing, re-running a nightly on it: https://git.typo3.org/typo3/CI/cms/-/pipelines/20732 -
core-ci voted on patch set 31 V -1 12/07/21, 15:07 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20732
-
core-ci commented on patch set 31 12/07/21, 15:14 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20732
-
Benni Mack uploaded patch set 32 12/08/21, 10:44
-
core-ci voted on patch set 32 V +1 12/08/21, 11:00 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20772
-
Benni Mack uploaded patch set 33 12/08/21, 12:58
-
core-ci voted on patch set 33 V +1 12/08/21, 13:11 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20779
-
Benni Mack uploaded patch set 34 12/08/21, 15:54
-
core-ci voted on patch set 34 V +1 12/08/21, 16:09 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20788
-
core-ci voted on patch set 34 V -1 12/08/21, 16:30 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20789
-
core-ci commented on patch set 34 12/08/21, 16:49 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20789
-
Benni Mack uploaded patch set 35 12/08/21, 16:56
-
Benni Mack uploaded patch set 36 12/08/21, 17:01
-
Christian Kuhn commented on patch set 36 12/08/21, 17:02
BackendUtility.php:473that's actually much better than the v2 doctrine handling.Connection.php:423as planned. +1ConnectionPool.php:187ah, good. -
Christian Kuhn commented on patch set 36 12/08/21, 17:02
BackendUtility.php:473ReplyDoneConnection.php:423ReplyDoneConnectionPool.php:187ReplyDone
-
core-ci voted on patch set 35 V -1 12/08/21, 17:18 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20794
-
core-ci voted on patch set 36 V -1 12/08/21, 17:19 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20798
-
Stefan Bürk commented on patch set 36 12/08/21, 19:07
ConnectionMigrator.php:234This is to early. First, it's a non-static call on a static method. Secondly doctrine itself uses "new self()" in this method, which prevents that core overriden method in the extension are called - and as such, table engine option got lost, thus failing 'SchamaMigratorTest::changeTable()'. -
Stefan Bürk uploaded patch set 37 12/08/21, 20:50
-
core-ci voted on patch set 37 V -1 12/08/21, 21:03 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20816
-
Stefan Bürk uploaded patch set 38 12/08/21, 21:08
-
core-ci voted on patch set 38 V +1 12/08/21, 21:20 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20818
-
Christian Kuhn commented on patch set 38 12/08/21, 21:26
ConnectionMigrator.php:234ReplyDone -
core-ci commented on patch set 38 12/08/21, 21:45 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20820
-
Stefan Bürk commented on patch set 38 CR -1 12/08/21, 22:15
on itBackendUtility.php:474Nice replacement and workaround for changed doctine/dbal api, but tree points to consider: * as it is a select query, we should use $queryBuilder->executeQuery() here * with doctrine/dbal 3.2 we retrieve result here, not a statement any more. Wrong variable naming * as only one row is retrieved, we can ommit the statement/result retrieving and simply use: ``` $row = $queryBuilder->executeQuery()->fetchAssociative(); ```DataHandler.php:2378Should use $result now, as it is no longer a statement which is returned.DataHandler.php:2378We could use `executeQuery()` directly here, as we are changing this part of the code - this avoid here the usage of the backword compatible combined execute() method.DataHandler.php:2383We could avoid here execute() and use forward compatible executeQuery() here. And use $result as it matched the return type better, because returned value is no longer a statement. -
Stefan Bürk uploaded patch set 39 12/08/21, 22:18
-
Stefan Bürk commented on patch set 39 12/08/21, 22:19
BackendUtility.php:474ReplyDoneDataHandler.php:2378ReplyDoneDataHandler.php:2378ReplyDoneDataHandler.php:2383ReplyDone -
core-ci voted on patch set 39 V +1 12/08/21, 22:32 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20824
-
Stefan Bürk commented on patch set 39 12/08/21, 22:33
Rerun nightly (after last changed + rebase on top of composer installers ^4.0): https://git.typo3.org/typo3/CI/cms/-/pipelines/20825 -
core-ci commented on patch set 39 12/08/21, 22:58 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/20825
-
Stefan Bürk commented on patch set 39 V +1 CR +1 12/08/21, 23:04
Nightly happy. I have looked truly through the changes, and the make sense. Just changed two places which were changed to use directly new QueryBuilder split methods, for ex. 'executeQuery()' instead of 'execute()'. Otherwise we have a really smotheless migration path now. This should be replaced over time in the core, before we can mark QueryBuilder()->execute() as deprecated or remove it (as it is marked internal now), which is out of the scope of this patch. This should be raised in awareness in the review/merging workflow. Another point is, we should try to get some points into doctrine/dbal to lower code duplication/cloning to work around some things, like code cloned in Comparator. -
Christian Kuhn voted on patch set 39 V +2 CR +2 12/09/21, 00:38
-
Christian Kuhn voted on patch set 39 V +1 CR +1 12/09/21, 00:39
-
Benni Mack voted on patch set 39 V +2 CR +2 12/09/21, 12:41
-
Benni Mack merged patch set 40 12/09/21, 12:41
-
Markus Klein commented on patch set 40 12/09/21, 13:07
BackendUtility.php:473you just removed the prepared statement here? we re-prepare now on every call? -
Benni Mack commented on patch set 40 12/09/21, 13:08
BackendUtility.php:473Replyyou mean we should work on the statement? Then I guess we'd need to call $connection->prepare() (this is the only way to get the statement) and the only $stmt->execute() ? -
Markus Klein commented on patch set 40 12/09/21, 13:11
BackendUtility.php:473ReplyI didn't take a deeper look into DBAL 3.2 yet. I just know that this was a real prepared statement, which got reused with new parameter bindings. This was one of our huge performance boosts for large page trees. Maybe DBAL changed things now somehow, but please make sure, we stick with prepared statements here and really reuse them. -
Benni Mack commented on patch set 40 12/09/21, 13:46
BackendUtility.php:473ReplyWill look closer in a followup patch. -
Stefan Bürk commented on patch set 40 05/23/22, 07:43
BackendUtility.php:473Replydoctrine/dbal has removed direct prepared statement support from the QueryBuilder, and Results are not Statements anymore which can be re-queried. And there was some hidings anyway in the background. We have re-added prepared statement support and changed the two places in the core back to prepared statements, where this has been explicitly used. See: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72610 https://review.typo3.org/c/Packages/TYPO3.CMS/+/72610/15/typo3/sysext/backend/Classes/Utility/BackendUtility.php#471