Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge up 2.6 to 2.7 #7900

Merged
merged 19 commits into from
Nov 15, 2019
Merged

Merge up 2.6 to 2.7 #7900

merged 19 commits into from
Nov 15, 2019

Conversation

ostrolucky
Copy link
Member

No description provided.

Ocramius and others added 9 commits October 10, 2019 17:30
Since `WhereInWalker` does not run, query parameters are not translated
from their in-memory type to the expected SQL type when the paginator
is run again with the same DQL string. This is an architectural
issue, since (for the sake of simplicity) we moved parameter
translation into the SQL walker, we didn't consider that SQL
walkers only act when no cache is in place. The translatio
needs to be moved into the paginator logic again.
In order to figure out the paginated query identifier type, we would
have to parse the DQL query into an AST+SQL anyway, so we'd have
to re-parse it manually: instead of doing that, we can force the
`WhereInWalker` to be reached at all times by forcing the
`$whereInQuery` to use no query cache.

While it is a sad performance regression, it is also not a
noticeable one, since we'll be performing an `O(1)` operation
around an I/O one (query execution, in this case).
Update documentation to recommend DQL over QueryBuilder when possible
[Documentation] Advanced field value... - missing entity alias
Use quoted collation declaration when available.
@ostrolucky ostrolucky self-assigned this Nov 14, 2019
greg0ire
greg0ire previously approved these changes Nov 14, 2019
ostrolucky and others added 4 commits November 14, 2019 22:17
Otherwise, getClassMetadata would be triggered more times
UnitOfWork::clear() misses $eagerLoadingEntities
…-identifier-types-even-with-cached-dql-parsing

#7837 paginate with custom identifier types even with enabled DQL query cache
@lcobucci
Copy link
Member

Let's hold this for now until 2.6.5 is released.

rharink and others added 5 commits November 15, 2019 16:36
only replace '_id' at end of columnName
This was regression from #7862 which tried to respect tracking config
when clearing collections, but this logic can happen in UOW only,
PersistentCollection::clear is triggered too early to know what
is (going to be) persisted.

Fixes #7862
Delete statements will not be created using `clear`
lcobucci
lcobucci previously approved these changes Nov 15, 2019
Copy link
Member

@lcobucci lcobucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, let's get it merged in since it fixes the build state. We can do another merge up afterwards. I've added the new commits in 2.6.

Thanks @ostrolucky

@greg0ire
Copy link
Member

I think doctrine/persistence should be bumped to ^1.2.0 (in require-dev) for the low deps build to pass.

@greg0ire
Copy link
Member

Also, the composer.lock is out of sync, I'm going to try to fix both issues.

@greg0ire
Copy link
Member

Oh I see you just fixed that issue in 2.7 @lcobucci , I'm going to redo the merge then

@lcobucci
Copy link
Member

I've addressed this in 2.7 already 👍
Thanks @greg0ire

@lcobucci lcobucci merged commit 9162f35 into 2.7 Nov 15, 2019
@lcobucci lcobucci deleted the 2.6.x-merge-up-into-2.7 branch November 15, 2019 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants