CRM-21677 reduce unnecessary joins in Case, Grant, Survey reports #11880
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
|
reviewing this now |
| LEFT JOIN civicrm_country country | ||
| ON {$this->_aliases['civicrm_address']}.country_id = | ||
| country.id | ||
| LEFT JOIN civicrm_worldregion {$this->_aliases['civicrm_world_region']} |
There was a problem hiding this comment.
This results into DB error on Grant Statistics report.
Database Error Code: Unknown column 'country.region_id' in 'on clause', 1054
Maybe, we should keep the left join of civicrm_country to connect with worldregion table?
There was a problem hiding this comment.
thanks - I'll take a look....
There was a problem hiding this comment.
@jitendrapurohit I pushed an update - altered start of country join to
protected function joinCountryFromAddress($prefix = '', $extra = array()) {
// include country field if country column is to be included
if ($this->isTableSelected($prefix . 'civicrm_country') || $this->isTableSelected($prefix . 'civicrm_worldregion')) {
if (empty($this->_aliases[$prefix . 'civicrm_country'])) {
$this->_aliases[$prefix . 'civicrm_country'] = $prefix . '_report_country';
}
eileenmcnaughton
force-pushed
the
min_report
branch
from
68caad5 to
6d81d64
Compare
jitendrapurohit
approved these changes
Mar 28, 2018
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
Reviewers cut of #11550 - reduce unnecessary joins to address tables in reports
Campaign/SurveyDetails
Case/Demographics
Case/Detail
Grant/Detail
Grant/Statistics
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
@yashodha back to you :-) This takes us down to 15 reports