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

dev/core#4821 - APIv4: Allow custom field to reference value in bridge joins #29325

Merged
merged 2 commits into from
Feb 8, 2024

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Feb 8, 2024

Overview

Fixes https://lab.civicrm.org/dev/core/-/issues/4821

Before

SQL error when trying to compare a field value in the on condition of a custom field.

After

Query works correctly.

Technical Details

When part of a bridge join there are two ways to get at the id of the joined entity. E.g. when joining Activity through ActivityContact, you could access the Activity id field either via civicrm_activity.id or via civicrm_activity_contact.activity_id. Custom fields were trying to join using the normal way of civicrm_activity.id but that fails if the custom field is getting joined prior to the activity table join. So instead of joining custom fields the normal way, they need to be joined to the bridge table.

Also includes follow-up to b367821 which adds metadata about these joins so the values are discoverable and not always assumed to match the name of the entity table (usually they do, but they don't have to).

Copy link

civibot bot commented Feb 8, 2024

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷

Introduction for new contributors...
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the master label Feb 8, 2024
Follow-up to b367821 which adds metadata
about these joins so the values are discoverable and not always assumed
to match the name of the entity table (usually they do, but they don't have to).
@colemanw colemanw changed the title APIv4 - Ensure dynamic joins use correct values for refTypeColumn dev/core#4821 - APIv4: Allow custom field to reference value in bridge joins Feb 8, 2024
@seamuslee001
Copy link
Contributor

Seems to work for me on the PR test site and there is a Unit test

@seamuslee001 seamuslee001 merged commit 0cf567c into civicrm:master Feb 8, 2024
3 checks passed
@seamuslee001 seamuslee001 deleted the skCustomJoins branch February 8, 2024 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants