-
-
Notifications
You must be signed in to change notification settings - Fork 825
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_… #11219
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed and tested the patch, works fine for me. @eileenmcnaughton can you review and merge the code, esp. the changes made in CRM/Activity/BAO/Activity.php that I suggested earlier.
@Eileen are you ok with this? |
f7aed9a
to
7d3b1a9
Compare
@monishdeb tests have passed |
Happy with the final patch.. merging now |
// The activityTempTable contains the sorted rows | ||
// so in order to maintain the sort order as-is we add an auto_increment | ||
// field; we can sort by this later to ensure the sort order stays correct. | ||
$sql .= " fixed_sort_order INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,"; | ||
foreach ($tableFields as $name => $desc) { | ||
$sql .= "$name $desc,\n"; | ||
$insertValueSQL[] = $name; | ||
if ($name == 'source_contact_name' && CRM_Utils_SQL::supportsFullGroupBy()) { | ||
$selectColumns[] = "ANY_VALUE(tbl.$name)"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@seamuslee001 ANY_VALUE does not exist on mariadb (https://jira.mariadb.org/browse/MDEV-10426) so including it here prevents us using mariadb. Just hit this while saving a new membership
CRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_…
…DATE sqlModes
Overview
This pulls out the non controversial fixes from https://github.com/civicrm/civicrm-core/pull/11053/files and #11207. ping @monishdeb @eileenmcnaughton @colemanw
This aims to fix some test failures on the unbuntu1604 matrix