From: kurund <kurund@civicrm.org>
Date: Sun, 24 Aug 2014 13:26:47 +0000 (+0530)
Subject: fixed merge forward, CRM-12772
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fb7829f23298f61bc739f6f04a3598470fcea514;p=civicrm-core.git

fixed merge forward, CRM-12772

----------------------------------------
* CRM-12772: Member Report (Detail) locks in DB with large membership/contribution sets
  https://issues.civicrm.org/jira/browse/CRM-12772
---

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index a6732d5976..030b90e7e2 100644
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -379,15 +379,10 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form {
     //used when contribution field is selected
     if ($this->_contribField) {
       $this->_from .= "
-              LEFT JOIN (
-                  SELECT cc.*, cmp.membership_id as membership_id
-                  FROM civicrm_membership_payment cmp
-                    JOIN civicrm_contribution cc
-                      ON cc.id = cmp.contribution_id
-                  ORDER BY cc.receive_date DESC
-                  ) {$this->_aliases['civicrm_contribution']}
-                ON {$this->_aliases['civicrm_membership']}.id =
-                  {$this->_aliases['civicrm_contribution']}.membership_id\n";
+             LEFT JOIN civicrm_membership_payment cmp
+                 ON {$this->_aliases['civicrm_membership']}.id = cmp.membership_id
+             LEFT JOIN civicrm_contribution {$this->_aliases['civicrm_contribution']}
+                 ON cmp.contribution_id={$this->_aliases['civicrm_contribution']}.id\n";
     }
   }