Skip to content
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

Merged
merged 1 commit into from
Nov 2, 2017

Conversation

seamuslee001
Copy link
Contributor

…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

Copy link
Member

@monishdeb monishdeb left a 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.

@seamuslee001
Copy link
Contributor Author

@Eileen are you ok with this?

@seamuslee001
Copy link
Contributor Author

@monishdeb tests have passed

@monishdeb
Copy link
Member

Happy with the final patch.. merging now

@monishdeb monishdeb merged commit 3821e98 into civicrm:master Nov 2, 2017
@monishdeb monishdeb deleted the test-fixes-full branch November 2, 2017 08:44
// 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)";
Copy link
Contributor

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

sluc23 pushed a commit to ixiam/civicrm-core that referenced this pull request Jan 10, 2018
CRM-21364 Non controversial fixes for ONLY_FULL_GROUP_BY and NO_ZERO_…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants