Thanks to visit codestin.com
Credit goes to github.com

Skip to content

distinct() updates QueryBuilder state correctly#10789

Merged
greg0ire merged 1 commit into
doctrine:2.15.xfrom
macroparts:distinct-updates-state-correctly
Jun 25, 2023
Merged

distinct() updates QueryBuilder state correctly#10789
greg0ire merged 1 commit into
doctrine:2.15.xfrom
macroparts:distinct-updates-state-correctly

Conversation

@macroparts
Copy link
Copy Markdown

@macroparts macroparts commented Jun 23, 2023

Previously calling distinct() when the QueryBuilder was in clean state would cause subsequent getDQL() calls to ignore the distinct queryPart

Fixes #10784

@greg0ire greg0ire added the Bug label Jun 23, 2023
@greg0ire greg0ire self-requested a review June 23, 2023 09:50
@greg0ire greg0ire changed the base branch from 2.14.x to 2.15.x June 23, 2023 09:50
@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023

2.14.x is no longer maintained. I retargeted on 2.15.x, and now there is a conflict.

@macroparts macroparts force-pushed the distinct-updates-state-correctly branch from eec49b5 to 73237c2 Compare June 23, 2023 13:05
@macroparts
Copy link
Copy Markdown
Author

macroparts commented Jun 23, 2023

Conflicts are resolved now.

@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023

The build failure seems unrelated to your changes 🤔

@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023

slevomat/coding-standard published a minor release 4 hours ago, that's why.

@macroparts
Copy link
Copy Markdown
Author

macroparts commented Jun 23, 2023

Should I fix those in my PR or are these fixed separately?

@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023 •
edited
Loading

I don't think you can fix them: slevomat/coding-standard#1585
The best course of action might be to add a version constraint preventing 8.13.0 in a separate PR.

@macroparts
Copy link
Copy Markdown
Author

macroparts commented Jun 23, 2023

Their maintainers might provide a fix for the broken comment parsing in their latest release soon. I'll leave it for now and check back on Monday.

@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023 •
edited
Loading

They are usually quite swift, so yeah, maybe. Also, it might be possible to work around some of the issues (use @param instead of @psalm-param, avoid @\, etc.

@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 23, 2023

Addressed in #10790

@daniel-innosabi @greg0ire
distinct() updates QueryBuilder state correctly
efb50b9 
Previously calling distinct() when the QueryBuilder was in clean state would cause subsequent getDQL() calls to ignore the distinct queryPart

Fixes doctrine#10784
@greg0ire greg0ire force-pushed the distinct-updates-state-correctly branch from 73237c2 to efb50b9 Compare June 25, 2023 15:54
@derrabus derrabus added this to the 2.15.4 milestone Jun 25, 2023
@greg0ire greg0ire merged commit 4e13890 into doctrine:2.15.x Jun 25, 2023
@greg0ire
Copy link
Copy Markdown
Member

greg0ire commented Jun 25, 2023

Thanks @macroparts !

@macroparts
Copy link
Copy Markdown
Author

macroparts commented Jun 26, 2023

Thank you @greg0ire !

@github-actions github-actions Bot mentioned this pull request Jul 23, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@greg0ire greg0ire greg0ire approved these changes

@derrabus derrabus derrabus approved these changes

@SenseException SenseException Awaiting requested review from SenseException

Assignees

No one assigned

Labels

Bug

Projects

None yet

Milestone

2.15.4

Development

Successfully merging this pull request may close these issues.

Calling distinct() on QueryBuilder does not update state correctly

4 participants

@macroparts @greg0ire @derrabus @daniel-innosabi