Merge 2.18.x up into 3.0.x #11202
Merged
Merge 2.18.x up into 3.0.x #11202
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is strictly beneficial for the Psalm baseline.
Use a more specific type for getSqlStatements()
This will help to make sure we don't lose those parts of the SQL when working on doctrine#11188.
…utput-walker-test Cover limit/offset values in `LimitSubqueryOutputWalkerTest`
Fix calls to removed lock methods (doctrine#11061)
Merge 2.17.x up into 2.18.x
greg0ire
reviewed
Jan 31, 2024
Conflicts: phpstan-dbal2.neon phpstan-persistence2.neon phpstan.neon psalm-baseline.xml psalm.xml src/Persisters/Entity/BasicEntityPersister.php src/Query/Exec/MultiTableUpdateExecutor.php src/Utility/LockSqlHelper.php tests/Tests/ORM/Functional/Locking/LockTest.php tests/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php
mpdude
force-pushed
the
mergeup-2.18.x-3.0.x
branch
from
1696d53 to
da6c6f7
Compare
|
Strange, tests run on my machine both with SQLite and MySQL as the primary configured drivers |
|
Try downgrading to DBAL 3 ;) |
|
So the reasons really is certain platforms generating different SQL in DBAL 3 vs 4? How could I best write a portable test? |
|
I think asserting SQL in the ORM is wrong. The best test for this should be a functional one. For now, I suggest you skip this test when DBAL 3 is in use, and create an issue about rewriting such tests. |
|
@greg0ire I think I found a way to make the tests work for both DBAL 3 and 4. |
greg0ire
approved these changes
Feb 1, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LimitSubqueryOutputWalkerTest