Fix ambiguous column in search with ORDER BY #15899
Merged
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
|
(Standard links)
|
6b3ef55 to
4686482
Compare
|
Surprisingly this doesn't seem to break anything, so marking as ready for review. I did an Note: There's a non-related, pre-existing issue in the activity search when sorting by activity status. |
|
@pfigel do you have any idea when this broke? |
|
(CiviCRM Review Template WORD-1.2)
@eileenmcnaughton @pfigel i think this should probably go into 5.20 thoughts? |
|
5.20 makes sense to me |
This fixes an issue where columns whose names are not unique in a search query cause a DB error when they're used as a sort column. The issue can be observed in the contribution search when sorting by contribution status. The issue is resolved by using the where field of the column spec, which holds the fully-qualified name of the column.
4686482 to
452a21f
Compare
|
@seamuslee001 @eileenmcnaughton breakage happened somewhere > 5.13 and <= 5.18. I rebased against 5.20. |
|
Cool - MOP based on @seamuslee001 review |
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.
Overview
This fixes an issue where columns whose names are not unique in a search query cause a DB error when they're used as a sort column. The issue can be observed in the contribution search when sorting by contribution status.
Before
Contribution search fails with a DB error when sorting results by contribution status.
After
Contribution search can be sorted by contribution status.
Technical Details
The issue is resolved by using the where field of the field spec, which holds the fully-qualified name of the column.
Comments
I initially thought about fixing this by adding a special case for
contribution_status_idsomewhere, but then figured this would fix the general case. The downside is that it changes something quite central inCRM_Contact_BAO_Query, so I'm having a hard time deciding on the trade-off.