CiviWare
/
com.megaphonetech.relateentities
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of jon/com.megaphonetech.relateentities into master

This commit is contained in:
CiviWare Solutions 2019-09-20 16:46:17 +00:00 committed by Gogs
parent ae5edc1f48 31cc8d3d06
commit 347d23d88d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CRM/RelateEntities/Settings.php
View File

@ -5,7 +5,7 @@ class CRM_RelateEntities_Settings {
public static function install() {
CRM_Core_DAO::executeQuery("
CREATE TABLE IF NOT EXISTS `civicrm_relate_entities` (
`id` int(10) UNSIGNED NOT NULL,
`id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
`entity_table_a` varchar(255) NOT NULL,
`entity_table_b` varchar(255) NOT NULL,
`entity_id_a` int(10) UNSIGNED NOT NULL,

8
CRM/RelateEntities/Utils.php
View File

@ -208,13 +208,15 @@ class CRM_RelateEntities_Utils {
) AS temp
$groupByClause
";
CRM_Core_DAO::disableFullGroupByMode();
if ($getCount) {
return CRM_Core_DAO::singleValueQuery($query, $queryParams);
$result = CRM_Core_DAO::singleValueQuery($query, $queryParams);
}
else {
return CRM_Core_DAO::executeQuery($query, $queryParams);
$result = CRM_Core_DAO::executeQuery($query, $queryParams);
}
CRM_Core_DAO::reenableFullGroupByMode();
return $result;
}
}