Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge branch 'staging' into 'main'

Browse Source 
fix

See merge request PhilippHofer/rot!49
This commit is contained in:
PhilippHofer 2023-10-26 18:53:02 +00:00
commit 2195c5464c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migration.sql
View File

@ -86,7 +86,7 @@ CREATE TABLE IF NOT EXISTS "logbook_type" (
CREATE TABLE IF NOT EXISTS "logbook" ( CREATE TABLE IF NOT EXISTS "logbook" (
"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
"boat_id" INTEGER NOT NULL REFERENCES boat(id), "boat_id" INTEGER NOT NULL REFERENCES boat(id),
"shipmaster" INTEGER NOT NULL REFERENCES user(id), -- null: club is owner "shipmaster" INTEGER NOT NULL REFERENCES user(id),
"shipmaster_only_steering" boolean not null, "shipmaster_only_steering" boolean not null,
"departure" datetime not null, "departure" datetime not null,
"arrival" datetime, -- None -> ship is on water "arrival" datetime, -- None -> ship is on water

2
src/model/stat.rs
View File

@ -13,7 +13,7 @@ impl Stat {
//TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server) //TODO: switch to query! macro again (once upgraded to sqlite 3.42 on server)
sqlx::query( sqlx::query(
" "
SELECT u.name, SUM(sub.distance_in_km) AS rowed_km SELECT u.name, CAST(SUM(sub.distance_in_km) AS INTEGER) AS rowed_km
FROM user u FROM user u
INNER JOIN ( INNER JOIN (
SELECT r.rower_id AS user_id, l.distance_in_km SELECT r.rower_id AS user_id, l.distance_in_km