CRM-21677 - reduce unnecessary address joins on activity & contact detail reports #11855
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/Report/Form/ActivitySummary.php
Outdated
| ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_phone']}.contact_id AND | ||
| {$this->_aliases['civicrm_phone']}.is_primary = 1 "; | ||
| } | ||
| $this->joinPhoneFromClause(); |
There was a problem hiding this comment.
should be joinPhoneFromContact()?
CRM/Report/Form/ActivitySummary.php
Outdated
| ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND | ||
| {$this->_aliases['civicrm_email']}.is_primary = 1 "; | ||
| } | ||
| $this->joinEmailFromClause(); |
There was a problem hiding this comment.
another typo - should be joinEmailFromContact()
There was a problem hiding this comment.
ug I took from the wrong version! That was one of the things I fixed when I did my cut
https://github.com/civicrm/civicrm-core/pull/11814/files#diff-35417c3a249b354869b9e25ca48e9d5cR585
eileenmcnaughton
force-pushed
the
report_min
branch
from
90afe51
to
e3c74b6
Compare
|
@jitendrapurohit fixed now - right version of those changes, one more report in the commit too now |
jitendrapurohit
approved these changes
Mar 22, 2018
|
thanks @jitendrapurohit - I'll merge once tests complete then & rebase these changes out of the main PR with these changes |
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
Improve efficiency of joins in these reports
Before
unnecessary joins to phone, email and address tables
After
join only when needed, code standardised
Technical Details
This also aligns the approach with that used in the extended report extension - there might be some notices as I have updated the extension where the signature differs from core but will need to drop a new release & people will need to be on it.
Comments
Sub-commit of #11814 which in itself is a reviewer's cut of #11550 - I have just included the files for changes for 3 reports here
In order to get the first chunk reviewed & merged (as I fear #11814 will languish due to the number of reports affected)
@yashodha hoping you can review & merge this or that @jitendrapurohit can review to get your original PR cleared away