fix mutliday support issues
This commit is contained in:
parent
d7fc530201
commit
093962e1db
4 changed files with 16 additions and 15 deletions
BIN
foods.db
BIN
foods.db
Binary file not shown.
|
|
@ -12,7 +12,7 @@ LEFT JOIN
|
|||
day_serving
|
||||
ON
|
||||
day_serving.food_id = food.id
|
||||
WHERE
|
||||
coalesce(day_serving.day, CURRENT_DATE) = CURRENT_DATE
|
||||
AND coalesce(day_serving.day, CURRENT_DATE) = CURRENT_DATE
|
||||
ORDER BY
|
||||
sort_order, name;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
SELECT
|
||||
SUM(kc_per_serving * servings_eaten) AS kc,
|
||||
SUM(protein_per_portion * servings_eaten) AS protein,
|
||||
SUM(fiber_per_portion * servings_eaten) AS bs
|
||||
SUM(kc_per_serving * coalesce(servings_eaten, 0)) AS kc,
|
||||
SUM(protein_per_portion * coalesce(servings_eaten, 0)) AS protein,
|
||||
SUM(fiber_per_portion * coalesce(servings_eaten, 0)) AS bs
|
||||
FROM
|
||||
food
|
||||
LEFT JOIN
|
||||
day_serving
|
||||
ON
|
||||
day_serving.food_id = food.id
|
||||
AND day_serving.day = CURRENT_DATE;
|
||||
AND coalesce(day_serving.day, CURRENT_DATE) = CURRENT_DATE;
|
||||
|
||||
|
|
|
|||
18
src/set.sql
18
src/set.sql
|
|
@ -1,9 +1,9 @@
|
|||
UPDATE
|
||||
day_serving
|
||||
SET
|
||||
servings_eaten = MAX(?2, 0)
|
||||
WHERE
|
||||
food_id = ?1
|
||||
AND day = CURRENT_DATE
|
||||
RETURNING
|
||||
servings_eaten
|
||||
INSERT OR REPLACE INTO
|
||||
day_serving (day, food_id, servings_eaten)
|
||||
VALUES (
|
||||
CURRENT_DATE,
|
||||
?1,
|
||||
MAX(?2, 0)
|
||||
)
|
||||
RETURNING servings_eaten;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue