From f91d51c19bc8a8b08003aae832b027fa87423d91 Mon Sep 17 00:00:00 2001 From: Adam Zammit Date: Wed, 7 Sep 2016 11:35:54 +1000 Subject: [PATCH] Fixed: lp:1620421 SQL not compatible with ONLY_FULL_GROUP_BY mode --- admin/addshift.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/addshift.php b/admin/addshift.php index 52089d59..c798697d 100644 --- a/admin/addshift.php +++ b/admin/addshift.php @@ -197,7 +197,7 @@ if ($questionnaire_id != false) } print ""; - $sql = "SELECT shift_id, dt, dta,start,end + $sql = "SELECT MAX(shift_id) as shift_id, MIN(dt) as dt, dta,start,end FROM ( ( SELECT shift_id, DATE_FORMAT( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) , '%W %d %m %Y' ) AS dt, @@ -224,9 +224,9 @@ if ($questionnaire_id != false) $shifts = $db->GetAll($sql); - $sql = "SELECT DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W %d %m %Y') as dt, - DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W') as dtd, - DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%d %m %Y') as dto, + $sql = "SELECT MIN(DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W %d %m %Y')) as dt, + MIN(DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%W')) as dtd, + MIN(DATE_FORMAT(STR_TO_DATE(CONCAT($year, ' ',$woy,' ',day_of_week - 1),'%x %v %w'), '%d %m %Y')) as dto, day_of_week - 1 as value FROM day_of_week GROUP BY value";