use msre_id instead of grams on food_log

diff --git a/sql/data/food_log.csv b/sql/data/food_log.csv
index 986a00a709007e656b84a3049e192c6358475a5e..65808e328a8c6d04fdefee5cb3e2c184cdba870f 100644 (file)
--- a/sql/data/food_log.csv
+++ b/sql/data/food_log.csv
@@ -1,23 +1,23 @@
-id,profile_id,created,updated,date,meal_id,food_id,grams
-1,1,1601977400,1601977400,2020-09-20,1,13047,100
-2,1,1601977400,1601977400,2020-09-20,1,1270,28
-3,1,1601977400,1601977400,2020-09-20,1,9038,55
-4,1,1601977400,1601977400,2020-09-20,1,11251,20
-5,1,1601977400,1601977400,2020-09-20,1,11529,35
-6,1,1601977400,1601977400,2020-09-20,1,11282,15
-7,1,1601977400,1601977400,2020-09-20,1,11828,210
-8,1,1601977400,1601977400,2020-09-20,1,28313,40
-9,1,1601977400,1601977400,2020-09-20,1,9112,100
-10,1,1601977400,1601977400,2020-09-20,2,20137,140
-11,1,1601977400,1601977400,2020-09-20,2,5062,100
-12,1,1601977400,1601977400,2020-09-20,2,12136,45
-13,1,1601977400,1601977400,2020-09-20,2,11821,50
-14,1,1601977400,1601977400,2020-09-20,2,44005,15
-15,1,1601977400,1601977400,2020-09-20,3,20545,150
-16,1,1601977400,1601977400,2020-09-20,3,16146,85
-17,1,1601977400,1601977400,2020-09-20,3,1270,40
-18,1,1601977400,1601977400,2020-09-20,3,9037,60
-19,1,1601977400,1601977400,2020-09-20,3,15076,100
-20,1,1601977400,1601977400,2020-09-20,3,11090,60
-21,1,1601977400,1601977400,2020-09-20,3,11938,35
-22,1,1601977400,1601977400,2020-09-20,3,11282,25
+id,profile_id,created,updated,date,meal_id,food_id,msre_id,amt
+1,1,1601977400,1601977400,2020-09-20,1,13047,-1,100
+2,1,1601977400,1601977400,2020-09-20,1,1270,-1,28
+3,1,1601977400,1601977400,2020-09-20,1,9038,-1,55
+4,1,1601977400,1601977400,2020-09-20,1,11251,-1,20
+5,1,1601977400,1601977400,2020-09-20,1,11529,-1,35
+6,1,1601977400,1601977400,2020-09-20,1,11282,-1,15
+7,1,1601977400,1601977400,2020-09-20,1,11828,-1,210
+8,1,1601977400,1601977400,2020-09-20,1,28313,-1,40
+9,1,1601977400,1601977400,2020-09-20,1,9112,-1,100
+10,1,1601977400,1601977400,2020-09-20,2,20137,-1,140
+11,1,1601977400,1601977400,2020-09-20,2,5062,-1,100
+12,1,1601977400,1601977400,2020-09-20,2,12136,-1,45
+13,1,1601977400,1601977400,2020-09-20,2,11821,-1,50
+14,1,1601977400,1601977400,2020-09-20,2,44005,-1,15
+15,1,1601977400,1601977400,2020-09-20,3,20545,-1,150
+16,1,1601977400,1601977400,2020-09-20,3,16146,-1,85
+17,1,1601977400,1601977400,2020-09-20,3,1270,-1,40
+18,1,1601977400,1601977400,2020-09-20,3,9037,-1,60
+19,1,1601977400,1601977400,2020-09-20,3,15076,-1,100
+20,1,1601977400,1601977400,2020-09-20,3,11090,-1,60
+21,1,1601977400,1601977400,2020-09-20,3,11938,-1,35
+22,1,1601977400,1601977400,2020-09-20,3,11282,-1,25

diff --git a/sql/tables.sql b/sql/tables.sql
index 656b803b114890950921ff6978f0a5de8a8347c2..945e6dfad9c3956821de13f3f1b33dc4b7e2ef5c 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -152,7 +152,8 @@ CREATE TABLE food_log (
   date int DEFAULT (strftime ('%s', 'now')),
   meal_id int NOT NULL,
   food_id int NOT NULL,
-  grams real NOT NULL,
+  msre_id int NOT NULL,
+  amt real NOT NULL,
   FOREIGN KEY (profile_id) REFERENCES profiles (id) ON UPDATE CASCADE,
   FOREIGN KEY (meal_id) REFERENCES meal_name (id) ON UPDATE CASCADE
 );