$insertSQL = "INSERT INTO {$activityTempTable} (" . implode(',', $insertValueSQL) . " ) ";
$order = $limit = $groupBy = '';
- $groupBy = " GROUP BY " . implode(',', $insertValueSQL);
+ $groupBy = " GROUP BY tbl.activity_id, tbl.activity_type, tbl.case_id, tbl.case_subject ";
if (!empty($input['sort'])) {
if (is_a($input['sort'], 'CRM_Utils_Sort')) {
// for each activity insert one target contact
// if we load all target contacts the performance will suffer a lot for mass-activities.
- $select = "ac.activity_id,
+ $query = "
+INSERT INTO {$activityContactTempTable} ( activity_id, contact_id, record_type_id, contact_name, is_deleted, counter )
+SELECT ac.activity_id,
ac.contact_id,
ac.record_type_id,
c.sort_name,
- c.is_deleted";
- $query = "
-INSERT INTO {$activityContactTempTable} ( activity_id, contact_id, record_type_id, contact_name, is_deleted, counter )
-SELECT {$select},
+ c.is_deleted,
count(ac.contact_id)
FROM {$activityTempTable}
INNER JOIN civicrm_activity a ON ( a.id = {$activityTempTable}.activity_id )
INNER JOIN civicrm_activity_contact ac ON ( ac.activity_id = {$activityTempTable}.activity_id )
INNER JOIN civicrm_contact c ON c.id = ac.contact_id
WHERE ac.record_type_id = %1
-GROUP BY {$select}
+GROUP BY ac.activity_id, ac.contact_id
";
CRM_Core_DAO::executeQuery($query, $params);
$usedFor = CRM_Core_OptionGroup::values('tag_used_for');
- $select = "t1.id, t1.name, t1.description, t1.used_for, t1.is_tagset,
- t1.is_reserved, t1.used_for";
- $query = "SELECT {$select}, t1.parent_id, t2.name as parent
+ $query = "SELECT t1.name, t1.id, t2.name as parent, t1.description, t1.used_for, t1.is_tagset,
+ t1.is_reserved, t1.parent_id, t1.used_for
FROM civicrm_tag t1 LEFT JOIN civicrm_tag t2 ON t1.parent_id = t2.id
- GROUP BY t1.parent_id, {$select}, t2.name";
+ GROUP BY t1.parent_id, t1.id";
$tag = CRM_Core_DAO::executeQuery($query);
$values = array();
$this->set('values', $this->_values);
}
- $query = "SELECT MAX(id) as id, title FROM civicrm_report_instance WHERE name = %1 GROUP BY id, title";
+ $query = "SELECT MAX(id) as id, title FROM civicrm_report_instance WHERE name = %1 GROUP BY id";
$params = array(1 => array("survey_{$this->_surveyId}", 'String'));
$result = CRM_Core_DAO::executeQuery($query, $params);
if ($result->fetch()) {
$myCaseWhereClause = " AND case_relationship.contact_id_b = {$userID}";
$myGroupByClause = " GROUP BY CONCAT(case_relationship.case_id,'-',case_relationship.contact_id_b)";
}
- $myGroupByClause .= ", case_status.label, status_id, civicrm_case_type.title, case_type_id, case_relationship.contact_id_b";
+ $myGroupByClause .= ", case_status.label, status_id, case_type_id";
// FIXME: This query could be a lot more efficient if it used COUNT() instead of returning all rows and then counting them with php
$query = "
$assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
$sourceID = CRM_Utils_Array::key('Activity Source', $activityContacts);
$targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
- $selectClause = array(
- "ca.id AS id",
- "ca.activity_type_id AS type",
- "ca.activity_type_id AS activity_type_id",
- "tcc.sort_name AS target_contact_name",
- "tcc.id AS target_contact_id",
- "scc.sort_name AS source_contact_name",
- "scc.id AS source_contact_id",
- "scc.sort_name AS source_contact_name",
- "acc.sort_name AS assignee_contact_name",
- "acc.id AS assignee_contact_id",
- "ca.status_id AS status",
- "ca.subject AS subject",
- "ca.is_deleted AS deleted",
- "ca.priority_id AS priority",
- "ca.weight AS weight",
- "DATE_FORMAT(IF(ca.activity_date_time < NOW() AND ca.status_id=ov.value,
- ca.activity_date_time,
- DATE_ADD(NOW(), INTERVAL 1 YEAR)
- ), '%Y%m%d%H%i00') AS overdue_date",
- "DATE_FORMAT(ca.activity_date_time, '%Y%m%d%H%i00') AS display_date",
- );
// CRM-5081 - formatting the dates to omit seconds.
// Note the 00 in the date format string is needed otherwise later on it thinks scheduled ones are overdue.
$select = "
- SELECT SQL_CALC_FOUND_ROWS COUNT(ca.id) AS ismultiple, " . implode(', ', $selectClause) . ",
+ SELECT SQL_CALC_FOUND_ROWS COUNT(ca.id) AS ismultiple,
+ ca.id AS id,
+ ca.activity_type_id AS type,
+ ca.activity_type_id AS activity_type_id,
+ tcc.sort_name AS target_contact_name,
+ tcc.id AS target_contact_id,
+ scc.sort_name AS source_contact_name,
+ scc.id AS source_contact_id,
+ acc.sort_name AS assignee_contact_name,
+ acc.id AS assignee_contact_id,
+ DATE_FORMAT(
+ IF(ca.activity_date_time < NOW() AND ca.status_id=ov.value,
+ ca.activity_date_time,
+ DATE_ADD(NOW(), INTERVAL 1 YEAR)
+ ), '%Y%m%d%H%i00') AS overdue_date,
+ DATE_FORMAT(ca.activity_date_time, '%Y%m%d%H%i00') AS display_date,
+ ca.status_id AS status,
+ ca.subject AS subject,
+ ca.is_deleted AS deleted,
+ ca.priority_id AS priority,
+ ca.weight AS weight,
GROUP_CONCAT(ef.file_id) AS attachment_ids ";
$from = "
AND ca.activity_date_time <= '{$toActivityDate}'";
}
- $groupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($selectClause, 'ca.id');
+ $groupBy = "
+ GROUP BY ca.id, tcc.id, scc.id, acc.id, ov.value";
$sortBy = CRM_Utils_Array::value('sortBy', $params);
if (!$sortBy) {
if ($visibility) {
$where .= " AND civicrm_group.visibility != 'User and User Admin Only'";
}
- $groupBy = " GROUP BY civicrm_group.id, civicrm_group.title";
+ $groupBy = " GROUP BY civicrm_group.id";
$orderby = " ORDER BY civicrm_group.name";
$sql = $select . $from . $where . $groupBy . $orderby;
*/
public static function getGroupByFromSelectColumns($selectClauses, $groupBy = NULL) {
$groupBy = (array) $groupBy;
+ $mysqlVersion = CRM_Core_DAO::singleValueQuery('SELECT VERSION()');
$sqlMode = CRM_Core_DAO::singleValueQuery('SELECT @@sql_mode');
//return if ONLY_FULL_GROUP_BY is not enabled.
- if (!empty($sqlMode) && !in_array('ONLY_FULL_GROUP_BY', explode(',', $sqlMode))) {
- return " GROUP BY " . implode(', ', $groupBy);
+ if (version_compare($mysqlVersion, '5.7', '<') || !empty($sqlMode) && !in_array('ONLY_FULL_GROUP_BY', explode(',', $sqlMode))) {
+ if (!empty($groupBy)) {
+ return " GROUP BY " . implode(', ', $groupBy);
+ }
+ return '';
}
$regexToExclude = '/(ROUND|AVG|COUNT|GROUP_CONCAT|SUM|MAX|MIN)\(/i';
}
else {
list($selectColumn, $alias) = array_pad($aliasArray, 2, NULL);
- $dateRegex = '/^(DATE_FORMAT|DATE_ADD)/i';
+ $dateRegex = '/^(DATE_FORMAT|DATE_ADD|CASE)/i';
+ $tableName = current(explode('.', $selectColumn));
+ $primaryKey = "{$tableName}.id";
// exclude columns which are already included in groupBy and aggregate functions from select
- if (!in_array($selectColumn, $groupBy) && preg_match($regexToExclude, trim($selectColumn)) !== 1) {
+ // CRM-18439 - Also exclude the columns which are functionally dependent on columns in $groupBy (MySQL 5.7+)
+ if (!in_array($selectColumn, $groupBy) && !in_array($primaryKey, $groupBy) && preg_match($regexToExclude, trim($selectColumn)) !== 1) {
if (!empty($alias) && preg_match($dateRegex, trim($selectColumn))) {
$groupBy[] = $alias;
}
$innerQuery = "SELECT civicrm_contribution.total_amount, COUNT(civicrm_contribution.total_amount) as civicrm_contribution_total_amount_count,
civicrm_contribution.currency $from $completedWhere";
$query = "$select FROM (
- $innerQuery GROUP BY civicrm_contribution.id, civicrm_contribution.total_amount, civicrm_contribution.currency
+ $innerQuery GROUP BY civicrm_contribution.id
) as conts
GROUP BY currency";
$query = "
$select FROM (
SELECT civicrm_contribution_soft.amount as total_amount, civicrm_contribution_soft.currency $from $softCreditWhere
+ GROUP BY civicrm_contribution_soft.id
) as conts
GROUP BY currency";
$dao = CRM_Core_DAO::executeQuery($query);
$query = "$select FROM (
SELECT civicrm_contribution.total_amount, civicrm_contribution.currency $from $where
+ GROUP BY civicrm_contribution.id
) as conts
GROUP BY currency";
WHERE contrib_1.contact_id = contact_a.id
AND contrib_1.is_test = 0
$where
-GROUP BY contact_a.id, contact_a.display_name
+GROUP BY contact_a.id
$having
ORDER BY donation_amount desc
";
SELECT $select
FROM $from
WHERE $where
-GROUP BY contact_a.id, contact_a.sort_name
+GROUP BY contact_a.id
$having
";
//for only contact ids ignore order.
contact_a.contact_type as contact_type,
contact_a.sort_name as sort_name,
d.date_added as date_added";
- $groupBy = " GROUP BY contact_id, contact_a.contact_type, contact_a.sort_name, d.date_added ";
+ $groupBy = " GROUP BY contact_id ";
}
return $this->sql($selectClause,
ON (civicrm_contact.id = civicrm_log.entity_id AND
civicrm_log.entity_table = 'civicrm_contact')
GROUP BY
- civicrm_contact.id, civicrm_log.modified_date
+ civicrm_contact.id
HAVING
- civicrm_log.modified_date >= '$startDate'
+ date_added >= '$startDate'
$endDateFix";
if ($this->_debug > 0) {
* @param int $limit
*/
public function moveIDs($fromTable, $toTable, $limit) {
- $select = 'ca.id, substr(ca.subject, 1, 50), substr(ca.details, 1, 250),
- c1.id, c1.sort_name, cac.record_type_id,
- ca.activity_type_id,
- cca.case_id';
$sql = "
INSERT INTO {$toTable}
( table_name, activity_id, subject, details, contact_id, sort_name, record_type,
activity_type_id, case_id, client_id )
-SELECT 'Activity', {$select},
+SELECT 'Activity', ca.id, substr(ca.subject, 1, 50), substr(ca.details, 1, 250),
+ c1.id, c1.sort_name, cac.record_type_id,
+ ca.activity_type_id,
+ cca.case_id,
ccc.contact_id as client_id
FROM {$fromTable} eid
INNER JOIN civicrm_activity ca ON ca.id = eid.entity_id
LEFT JOIN civicrm_case_activity cca ON cca.activity_id = ca.id
LEFT JOIN civicrm_case_contact ccc ON ccc.case_id = cca.case_id
WHERE (ca.is_deleted = 0 OR ca.is_deleted IS NULL)
-GROUP BY {$select}, ccc.contact_id
{$this->toLimit($limit)}
";
CRM_Core_DAO::executeQuery($sql);
$where = $this->where($includeContactIDs);
if (!$justIDs && !$this->_allSearch) {
- $groupBy = " GROUP BY contact_a.id, contact_a.contact_type, contact_a.sort_name";
+ $groupBy = " GROUP BY contact_a.id";
}
else {
// CRM-10850
WHERE $where
";
- $sql .= " GROUP BY contact_a.id, contact_a.sort_name, contact_a.first_name, contact_a.last_name";
+ $sql .= " GROUP BY contact_a.id";
// Define ORDER BY for query in $sort, with default value
if (!empty($sort)) {
if (is_string($sort)) {
if ($getTrxnInfo && $baseTrxnId) {
$arRelationTypeId = key(CRM_Core_PseudoConstant::accountOptionValues('account_relationship', NULL, " AND v.name LIKE 'Accounts Receivable Account is' "));
$arAccount = CRM_Contribute_PseudoConstant::financialAccountType($financialTypeId, $arRelationTypeId);
- $select = "ft.total_amount,
- ft.payment_instrument_id,
- ft.trxn_date, ft.trxn_id, ft.status_id, ft.check_number, con.currency";
+
// Need to exclude fee trxn rows so filter out rows where TO FINANCIAL ACCOUNT is expense account
$sql = "
- SELECT GROUP_CONCAT(fa.`name`) as financial_account, {$select}
+ SELECT GROUP_CONCAT(fa.`name`) as financial_account,
+ ft.total_amount,
+ ft.payment_instrument_id,
+ ft.trxn_date, ft.trxn_id, ft.status_id, ft.check_number, con.currency
+
FROM civicrm_contribution con
LEFT JOIN civicrm_entity_financial_trxn eft ON (eft.entity_id = con.id AND eft.entity_table = 'civicrm_contribution')
INNER JOIN civicrm_financial_trxn ft ON ft.id = eft.financial_trxn_id
LEFT JOIN civicrm_financial_item fi ON fi.id = ef.entity_id
INNER JOIN civicrm_financial_account fa ON fa.id = fi.financial_account_id
- WHERE con.id = %1 AND ft.to_financial_account_id <> %3";
+ WHERE con.id = %1 AND ft.to_financial_account_id <> %3
+ GROUP BY ft.id";
- $sql .= " GROUP BY ft.id, {$select}";
$queryParams = array(
1 => array($contributionId, 'Integer'),
2 => array($feeFinancialAccount, 'Integer'),
";
CRM_Core_DAO::executeQuery($updateLineItem);
- $fiColumns = "fi.contact_id, fi.description, fi.amount, fi.currency,
- fi.financial_account_id, fi.status_id, fi.entity_table, fi.entity_id";
// gathering necessary info to record negative (deselected) financial_item
$updateFinancialItem = "
- SELECT {$fiColumns}, SUM(fi.amount) as differenceAmt, price_field_value_id, financial_type_id, tax_amount
+ SELECT fi.*, SUM(fi.amount) as differenceAmt, price_field_value_id, financial_type_id, tax_amount
FROM civicrm_financial_item fi LEFT JOIN civicrm_line_item li ON (li.id = fi.entity_id AND fi.entity_table = 'civicrm_line_item')
WHERE (li.entity_table = 'civicrm_participant' AND li.entity_id = {$participantId})
-GROUP BY li.entity_table, li.entity_id, price_field_value_id, fi.id, {$fiColumns}
+GROUP BY li.entity_table, li.entity_id, price_field_value_id, fi.id
";
$updateFinancialItemInfoDAO = CRM_Core_DAO::executeQuery($updateFinancialItem);
$trxn = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($contributionId, 'DESC', TRUE);
while ($updateFinancialItemInfoDAO->fetch()) {
$updateFinancialItemInfoValues = (array) $updateFinancialItemInfoDAO;
$updateFinancialItemInfoValues['transaction_date'] = date('YmdHis');
-
+ // the below params are not needed
+ unset($updateFinancialItemInfoValues['id']);
+ unset($updateFinancialItemInfoValues['created_date']);
// if not submitted and difference is not 0 make it negative
if (!in_array($updateFinancialItemInfoValues['price_field_value_id'], $submittedFieldValueIds) && $updateFinancialItemInfoValues['differenceAmt'] != 0) {
// INSERT negative financial_items
* Group By Clause
*/
public static function getGroupBy($exportMode, $queryMode, $returnProperties, $query) {
+ $groupBy = '';
if (!empty($returnProperties['tags']) || !empty($returnProperties['groups']) ||
CRM_Utils_Array::value('notes', $returnProperties) ||
// CRM-9552
($queryMode & CRM_Contact_BAO_Query::MODE_CONTACTS && $query->_useGroupBy)
) {
- $groupBy = " GROUP BY contact_a.id";
+ $groupBy = "contact_a.id";
}
switch ($exportMode) {
case CRM_Export_Form_Select::CONTRIBUTE_EXPORT:
- $groupBy = 'GROUP BY civicrm_contribution.id';
+ $groupBy = 'civicrm_contribution.id';
if (CRM_Contribute_BAO_Query::isSoftCreditOptionEnabled()) {
// especial group by when soft credit columns are included
- $groupBy = 'GROUP BY contribution_search_scredit_combined.id, contribution_search_scredit_combined.scredit_id';
+ $groupBy = array('contribution_search_scredit_combined.id', 'contribution_search_scredit_combined.scredit_id');
}
break;
case CRM_Export_Form_Select::EVENT_EXPORT:
- $groupBy = 'GROUP BY civicrm_participant.id';
+ $groupBy = 'civicrm_participant.id';
break;
case CRM_Export_Form_Select::MEMBER_EXPORT:
- $groupBy = " GROUP BY civicrm_membership.id";
+ $groupBy = "civicrm_membership.id";
break;
}
if ($queryMode & CRM_Contact_BAO_Query::MODE_ACTIVITY) {
- $groupBy = " GROUP BY civicrm_activity.id ";
+ $groupBy = "civicrm_activity.id ";
}
- $groupBy = !empty($groupBy) ? $groupBy : '';
+ if (!empty($groupBy)) {
+ $groupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($query->_select, $groupBy);
+ }
return $groupBy;
}
$groupBy = $groupJoin = '';
if ($dedupeEmail) {
$groupJoin = " INNER JOIN civicrm_email e ON e.id = i.email_id";
- $groupBy = " GROUP BY e.email, i.contact_id, i.email_id ";
+ $groupBy = " GROUP BY e.email, i.contact_id ";
}
$sql = "
// we only care about parent jobs, since that holds all the info on
// the mailing
$selectClause = implode(', ', $select);
- $groupFromSelect = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($select);
+ $groupFromSelect = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($select, "$mailing.id");
$query = "
SELECT {$selectClause},
MIN($job.scheduled_date) as scheduled_date,
$query = "SELECT * FROM `civicrm_mailing_abtest` ab
where (ab.mailing_id_a = %1
OR ab.mailing_id_b = %1
- OR ab.mailing_id_c = %1)";
+ OR ab.mailing_id_c = %1)
+ GROUP BY ab.id";
$params = array(1 => array($mailingID, 'Integer'));
$abTest = CRM_Core_DAO::executeQuery($query, $params);
$abTest->fetch();
}
$query = "
-SELECT block.target_entity_type, block.target_entity_id
+SELECT *
FROM civicrm_pcp_block block
LEFT JOIN civicrm_pcp pcp ON pcp.pcp_block_id = block.id
WHERE block.is_active = 1
{$clause}
-GROUP BY block.id, block.target_entity_type, block.target_entity_id
+GROUP BY block.id, pcp.id
ORDER BY target_entity_type, target_entity_id
";
$pcpBlockDao = CRM_Core_DAO::executeQuery($query);
);
$this->_query->_distinctComponentClause = "civicrm_pledge.id";
- $this->_query->_groupByComponentClause = " GROUP BY civicrm_pledge.id, civicrm_pledge.financial_type_id ";
+ $this->_query->_groupByComponentClause = " GROUP BY civicrm_pledge.id ";
}
/**
// Do not display any price sets
$query .= " AND 0 ";
}
- $query .= " GROUP BY s.id, f.price_set_id, s.title";
+ $query .= " GROUP BY s.id";
$dao = CRM_Core_DAO::executeQuery($query);
while ($dao->fetch()) {
$priceSets[$dao->id] = $dao->$column;
$this->customDataFrom();
$select = str_ireplace('contribution_civireport.total_amount', 'contribution_soft_civireport.amount', $this->_select);
- $this->_groupBy = str_ireplace('contribution_civireport.total_amount', 'contribution_soft_civireport.amount', $this->_groupBy);
$select = str_ireplace("'Contribution' as", "'Soft Credit' as", $select);
+ if (!empty($this->_groupBy)) {
+ $this->_groupBy .= ', contribution_soft_civireport.amount';
+ }
// we inner join with temp1 to restrict soft contributions to those in temp1 table
$sql = "{$select} {$this->_from} {$this->_where} {$this->_groupBy}";
$tempQuery = 'CREATE TEMPORARY TABLE civireport_contribution_detail_temp2 AS ' . $sql;
projects / civicrm-core.git / commitdiff