Compare commits
2 Commits
808cdbaddc
...
d731f97169
Author | SHA1 | Date | |
---|---|---|---|
d731f97169 | |||
0231d2bd21 |
@ -66,9 +66,14 @@ SELECT CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km
|
|||||||
FROM user u
|
FROM user u
|
||||||
INNER JOIN rower r ON u.id = r.rower_id
|
INNER JOIN rower r ON u.id = r.rower_id
|
||||||
INNER JOIN logbook l ON r.logbook_id = l.id
|
INNER JOIN logbook l ON r.logbook_id = l.id
|
||||||
INNER JOIN user_role ur ON u.id = ur.user_id
|
WHERE u.id NOT IN (
|
||||||
|
SELECT ur.user_id
|
||||||
|
FROM user_role ur
|
||||||
INNER JOIN role ro ON ur.role_id = ro.id
|
INNER JOIN role ro ON ur.role_id = ro.id
|
||||||
WHERE ro.name = 'scheckbuch' AND l.distance_in_km IS NOT NULL AND l.arrival LIKE '{year}-%';
|
WHERE ro.name = 'Donau Linz'
|
||||||
|
)
|
||||||
|
AND l.distance_in_km IS NOT NULL
|
||||||
|
AND l.arrival LIKE '{year}-%';
|
||||||
"
|
"
|
||||||
))
|
))
|
||||||
.fetch_one(db)
|
.fetch_one(db)
|
||||||
@ -93,10 +98,10 @@ WHERE ro.name = 'scheckbuch' AND l.distance_in_km IS NOT NULL AND l.arrival LIKE
|
|||||||
SELECT u.name, CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km
|
SELECT u.name, CAST(SUM(l.distance_in_km) AS INTEGER) AS rowed_km
|
||||||
FROM (
|
FROM (
|
||||||
SELECT * FROM user
|
SELECT * FROM user
|
||||||
WHERE id NOT IN (
|
WHERE id IN (
|
||||||
SELECT user_id FROM user_role
|
SELECT user_id FROM user_role
|
||||||
JOIN role ON user_role.role_id = role.id
|
JOIN role ON user_role.role_id = role.id
|
||||||
WHERE role.name = 'scheckbuch'
|
WHERE role.name = 'Donau Linz'
|
||||||
)
|
)
|
||||||
) u
|
) u
|
||||||
INNER JOIN rower r ON u.id = r.rower_id
|
INNER JOIN rower r ON u.id = r.rower_id
|
||||||
|
Loading…
Reference in New Issue
Block a user