dev/core#382 Ensure that no db errors are generated when trying to up… #12785
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
CRM/Contact/BAO/Group.php
Outdated
| @@ -450,6 +450,10 @@ public static function create(&$params) { | |||
| if (!empty($params['organization_id'])) { | |||
| $groupOrg = $params; | |||
| $groupOrg['group_id'] = $group->id; | |||
| // dev/core#382 Keeping the id here can cause db errors as it tries to update the wrong record in the Organization table | |||
| if (isset($groupOrg['id'])) { | |||
There was a problem hiding this comment.
@seamuslee001 I think it makes more sense to change the whole part inside the if to
CRM_Contact_BAO_GroupOrganization::add(['group_id' => $group->id, 'organization_id' => $params['organization_id']]);
- currently we are passing $params to CRM_Contact_BAO_GroupOrganization::add purely for the 'convenience' of them having one key in common.
Note that change also requires a change to stop accepting by reference in GroupOrganization::add but that seems generally good
There was a problem hiding this comment.
@eileenmcnaughton for the moment i think i'll just not worry about fixing the passing by reference but have made an update to cover what your after
|
@seamuslee001 OK - sure squash these & merge-on-pass |
…date a civicrm group linked to an organization when the group id doesn't match the id of the relevant row in civicrm_group_organization Only Pass necessary params to GroupOrganization::add function
seamuslee001
force-pushed
the
lab_core_382
branch
from
e3cbdf5 to
1321b65
Compare
|
@eileenmcnaughton done |
|
Jenkins re test this please |
|
test fail unrelated |
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.
…date a civicrm group linked to an organization when the group id doesn't match the id of the relevant row in civicrm_group_organization
Overview
When updating a group linked to an organization. If the record id in the civicrm_group_organization table doesn't match that of the groupID there can be a db error generated because of the unique key on the civicrm_group_organization table
Before
DB error generated
After
No DB error
ping @mattwire @eileenmcnaughton @nganivet @monishdeb This is especially an issue in Multisite configurations