iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix metrics and notifications when sql_mode is only_full_group_by (since MySQL 5.7/8.0)

This commit is contained in:
Igor Scheller 2022-03-20 15:32:44 +01:00
parent fb573fd1d9
commit b345bf4ea7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/model/UserAngelTypes_model.php
View File

@ -60,7 +60,7 @@ function User_unconfirmed_AngelTypes($userId)
AND `UserAngelTypes`.`supporter`=TRUE AND `UserAngelTypes`.`supporter`=TRUE
AND `AngelTypes`.`restricted`=TRUE AND `AngelTypes`.`restricted`=TRUE
AND `UnconfirmedMembers`.`confirm_user_id` IS NULL AND `UnconfirmedMembers`.`confirm_user_id` IS NULL
GROUP BY `UserAngelTypes`.`angeltype_id`, `UserAngelTypes`.`id` GROUP BY `UserAngelTypes`.`angeltype_id`, `UserAngelTypes`.`id`, AngelTypes.name, UserAngelTypes.user_id, UserAngelTypes.confirm_user_id, UserAngelTypes.supporter
ORDER BY `AngelTypes`.`name` ORDER BY `AngelTypes`.`name`
', [$userId]); ', [$userId]);
} }

4
src/Controllers/Metrics/Stats.php
View File

@ -309,7 +309,7 @@ class Stats
$this->workSecondsQuery($done, $freeloaded), $this->workSecondsQuery($done, $freeloaded),
'UID', 'UID',
'SUM(end - start)', 'SUM(end - start)',
'end - start' 'SUM(end - start)'
); );
} }
@ -364,7 +364,7 @@ class Stats
Worklog::query(), Worklog::query(),
'user_id', 'user_id',
'SUM(hours * 60 * 60)', 'SUM(hours * 60 * 60)',
'hours * 60 * 60' 'SUM(hours * 60 * 60)'
); );
} }