From 1728e9a007879d3a3873d11d388d53e069706d33 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 4 Aug 2016 20:37:52 +1200 Subject: [PATCH] CRM-19170 explicitly mark the reports not taking advantage of efficient group queries. The process of switching them over is not hard but they need to be looked at one-be-one --- CRM/Report/Form/Activity.php | 13 +++++++++++++ CRM/Report/Form/ActivitySummary.php | 11 +++++++++++ CRM/Report/Form/Case/Demographics.php | 13 ++++++++++++- CRM/Report/Form/Contact/CurrentEmployer.php | 13 +++++++++++++ CRM/Report/Form/Contact/Detail.php | 13 +++++++++++++ CRM/Report/Form/Contact/Relationship.php | 13 +++++++++++++ CRM/Report/Form/Contact/Summary.php | 14 ++++++++++++++ CRM/Report/Form/Contribute/Bookkeeping.php | 14 ++++++++++++++ CRM/Report/Form/Contribute/Detail.php | 10 ++++++++++ CRM/Report/Form/Contribute/Recur.php | 13 +++++++++++++ CRM/Report/Form/Contribute/Repeat.php | 9 +++++++++ CRM/Report/Form/Contribute/SoftCredit.php | 13 +++++++++++++ CRM/Report/Form/Contribute/Sybunt.php | 13 +++++++++++++ CRM/Report/Form/Contribute/TopDonor.php | 13 +++++++++++++ CRM/Report/Form/Event/ParticipantListCount.php | 12 ++++++++++++ CRM/Report/Form/Mailing/Bounce.php | 14 ++++++++++++++ CRM/Report/Form/Mailing/Clicks.php | 12 ++++++++++++ CRM/Report/Form/Mailing/Detail.php | 14 ++++++++++++++ CRM/Report/Form/Mailing/Opened.php | 11 +++++++++++ CRM/Report/Form/Member/ContributionDetail.php | 11 +++++++++++ CRM/Report/Form/Member/Detail.php | 13 +++++++++++++ CRM/Report/Form/Member/Lapse.php | 11 +++++++++++ CRM/Report/Form/Member/Summary.php | 11 +++++++++++ CRM/Report/Form/Pledge/Detail.php | 13 +++++++++++++ CRM/Report/Form/Pledge/Summary.php | 11 +++++++++++ 25 files changed, 307 insertions(+), 1 deletion(-) diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index a5d6181be9..ddb17452ff 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -39,6 +39,19 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { protected $_nonDisplayFields = array(); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php index d4ebc876b0..d0bdef0a7d 100644 --- a/CRM/Report/Form/ActivitySummary.php +++ b/CRM/Report/Form/ActivitySummary.php @@ -38,7 +38,18 @@ class CRM_Report_Form_ActivitySummary extends CRM_Report_Form { protected $_tempDurationSumTableName; /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php index 0ec779030f..ece79d69b6 100644 --- a/CRM/Report/Form/Case/Demographics.php +++ b/CRM/Report/Form/Case/Demographics.php @@ -37,10 +37,21 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form { protected $_emailField = FALSE; protected $_phoneField = FALSE; - /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** + * Class constructor. */ public function __construct() { $this->_columns = array( diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php index d8a9d127af..1585896087 100644 --- a/CRM/Report/Form/Contact/CurrentEmployer.php +++ b/CRM/Report/Form/Contact/CurrentEmployer.php @@ -32,6 +32,19 @@ */ class CRM_Report_Form_Contact_CurrentEmployer extends CRM_Report_Form { + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + protected $_summary = NULL; protected $_customGroupExtends = array( diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php index 68851120a9..dc9b766ac0 100644 --- a/CRM/Report/Form/Contact/Detail.php +++ b/CRM/Report/Form/Contact/Detail.php @@ -42,6 +42,19 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { 'Organization', ); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php index 61f86667a0..a791872696 100644 --- a/CRM/Report/Form/Contact/Relationship.php +++ b/CRM/Report/Form/Contact/Relationship.php @@ -44,6 +44,19 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form { ); public $_drilldownReport = array('contact/detail' => 'Link to Detail Report'); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * This will be a_b or b_a. * diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php index 3a496d599c..b3759306ae 100644 --- a/CRM/Report/Form/Contact/Summary.php +++ b/CRM/Report/Form/Contact/Summary.php @@ -48,6 +48,20 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form { public $_drilldownReport = array('contact/detail' => 'Link to Detail Report'); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + + /** + * Class constructor. */ public function __construct() { $this->_autoIncludeIndexedFieldsAsOrderBys = 1; diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 7446c0fc8c..34bdb94f23 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -45,6 +45,20 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { ); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + + /** + * Class constructor. */ public function __construct() { $this->_autoIncludeIndexedFieldsAsOrderBys = 1; diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 1baa200d2a..8454545467 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -46,6 +46,16 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ); /** + * This report has been optimised for group filtering. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = FALSE; + + /** + * Class constructor. */ public function __construct() { $this->_autoIncludeIndexedFieldsAsOrderBys = 1; diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php index bd71fee2cc..f4a27bea0e 100644 --- a/CRM/Report/Form/Contribute/Recur.php +++ b/CRM/Report/Form/Contribute/Recur.php @@ -34,6 +34,19 @@ */ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form { + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php index 30eeeb80f2..27027a9cf7 100644 --- a/CRM/Report/Form/Contribute/Repeat.php +++ b/CRM/Report/Form/Contribute/Repeat.php @@ -82,6 +82,15 @@ class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form { */ protected $contributionJoinTableColumn; + /** + * This report has been optimised for group filtering. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = FALSE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index dba761272c..3ef83d16dd 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -52,6 +52,19 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** */ public function __construct() { diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 5d5b30a8f4..5818c1da30 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -46,6 +46,19 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** */ public function __construct() { diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index 72d074efd0..de4043f00d 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -41,6 +41,19 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { 'Contribution', ); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + public $_drilldownReport = array('contribute/detail' => 'Link to Detail Report'); protected $_charts = array( diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php index 7cbe4934e4..0a01456817 100644 --- a/CRM/Report/Form/Event/ParticipantListCount.php +++ b/CRM/Report/Form/Event/ParticipantListCount.php @@ -39,6 +39,18 @@ class CRM_Report_Form_Event_ParticipantListCount extends CRM_Report_Form_Event { 'Participant', 'Event', ); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; public $_drilldownReport = array('event/income' => 'Link to Detail Report'); diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php index a351a96e7c..f2e220b7ca 100644 --- a/CRM/Report/Form/Mailing/Bounce.php +++ b/CRM/Report/Form/Mailing/Bounce.php @@ -52,6 +52,20 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form { ); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + + /** + * Class constructor. */ public function __construct() { $this->_columns = array(); diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php index de9b1e2072..2199da9fc6 100644 --- a/CRM/Report/Form/Mailing/Clicks.php +++ b/CRM/Report/Form/Mailing/Clicks.php @@ -54,8 +54,20 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form { ); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** + * Class constructor. */ public function __construct() { $this->_columns = array(); diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php index c0f31303b3..b27ce99a85 100644 --- a/CRM/Report/Form/Mailing/Detail.php +++ b/CRM/Report/Form/Mailing/Detail.php @@ -42,6 +42,20 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form { protected $_exposeContactID = FALSE; /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + + /** + * Class constructor. */ public function __construct() { $this->_columns = array(); diff --git a/CRM/Report/Form/Mailing/Opened.php b/CRM/Report/Form/Mailing/Opened.php index c41bc77d92..e0774aeaed 100644 --- a/CRM/Report/Form/Mailing/Opened.php +++ b/CRM/Report/Form/Mailing/Opened.php @@ -52,7 +52,18 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form { ); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index 87a39191d1..66d1278a88 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -43,7 +43,18 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { ); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 4cc84f6ab2..e29893828f 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -47,6 +47,19 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { protected $_customGroupExtends = array('Membership', 'Contribution'); protected $_customGroupGroupBy = FALSE; + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php index 88cf716b3d..640f04a385 100644 --- a/CRM/Report/Form/Member/Lapse.php +++ b/CRM/Report/Form/Member/Lapse.php @@ -45,7 +45,18 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { public $_drilldownReport = array('member/detail' => 'Link to Detail Report'); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index ed1f33f889..efd78052e5 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -46,7 +46,18 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { public $_drilldownReport = array('member/detail' => 'Link to Detail Report'); /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php index a0153f737e..5c72e55bad 100644 --- a/CRM/Report/Form/Pledge/Detail.php +++ b/CRM/Report/Form/Pledge/Detail.php @@ -51,6 +51,19 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { 'Individual', ); + /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool + */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ diff --git a/CRM/Report/Form/Pledge/Summary.php b/CRM/Report/Form/Pledge/Summary.php index c03f897080..b8429ecc42 100644 --- a/CRM/Report/Form/Pledge/Summary.php +++ b/CRM/Report/Form/Pledge/Summary.php @@ -42,7 +42,18 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form { protected $_emailField = FALSE; /** + * This report has not been optimised for group filtering. + * + * The functionality for group filtering has been improved but not + * all reports have been adjusted to take care of it. This report has not + * and will run an inefficient query until fixed. + * + * CRM-19170 + * + * @var bool */ + protected $groupFilterNotOptimised = TRUE; + /** * Class constructor. */ -- 2.25.1