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

CRM-21364 Fix upgrades from 4.2.x for ONLY_FULL_GROUP_BY compatability #11209

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

seamuslee001
Copy link
Contributor

@seamuslee001 seamuslee001 commented Oct 29, 2017

@@ -613,7 +613,7 @@ public static function task_4_2_alpha1_convertContributions(CRM_Queue_TaskContex
LEFT JOIN civicrm_price_set_entity cpse on cpse.entity_table = 'civicrm_contribution_page' AND cpse.entity_id = cc.contribution_page_id
WHERE (cc.id BETWEEN %1 AND %2)
AND cli.entity_id IS NULL AND cc.contribution_page_id IS NOT NULL AND cpp.contribution_id IS NULL
GROUP BY cc.id
GROUP BY cc.id, cmp.membership_id
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm fairly certain this will have no major issues

@@ -782,8 +782,7 @@ public function createFinancialRecords() {
AND efaPP.account_relationship = {$assetAccountIs})
LEFT JOIN {$tempTableName1} tpi
ON ft.payment_instrument_id = tpi.instrument_id
WHERE ft.fee_amount IS NOT NULL AND ft.fee_amount != 0 AND (con.contribution_status_id IN (%1, %3) OR (con.contribution_status_id =%2 AND con.is_pay_later = 1))
GROUP BY con.id";
WHERE ft.fee_amount IS NOT NULL AND ft.fee_amount != 0 AND (con.contribution_status_id IN (%1, %3) OR (con.contribution_status_id =%2 AND con.is_pay_later = 1))";
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure if changing from the single group by to a distinct here will cause issues @JoeMurray @monishdeb thoughts?

@monishdeb
Copy link
Member

I agree with the patch and it works for me. Hence merging it.

@monishdeb monishdeb merged commit 1ee15be into civicrm:master Oct 31, 2017
@monishdeb monishdeb deleted the CRM-21364-2 branch October 31, 2017 12:25
sluc23 pushed a commit to ixiam/civicrm-core that referenced this pull request Jan 10, 2018
CRM-21364 Fix upgrades from 4.2.x for ONLY_FULL_GROUP_BY compatability
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants