Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Fixed: lp:1620421 SQL not compatible with ONLY_FULL_GROUP_BY mode

Browse Source
This commit is contained in:
Adam Zammit
2016-09-07 11:35:54 +10:00
parent 3c996a4a56
commit f91d51c19b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/addshift.php
View File

@@ -197,7 +197,7 @@ if ($questionnaire_id != false)
} }
print "</h4>"; print "</h4>";
$sql = "SELECT shift_id, dt, dta,start,end $sql = "SELECT MAX(shift_id) as shift_id, MIN(dt) as dt, dta,start,end
FROM ( FROM (
( (
SELECT shift_id, DATE_FORMAT( CONVERT_TZ( s.start, 'UTC', o.Time_zone_name ) , '%W %d %m %Y' ) AS dt, 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); $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, $sql = "SELECT MIN(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, MIN(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, 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 day_of_week - 1 as value
FROM day_of_week FROM day_of_week
GROUP BY value"; GROUP BY value";