wip

diff --git a/sql/data/biometric_log.csv b/sql/data/biometric_log.csv
index e1a8fce0efe678af6540151e1bbc001aaafa74ba..f40a933d723f6a7fceffa764110a4800c6deaf3e 100644 (file)
--- a/sql/data/biometric_log.csv
+++ b/sql/data/biometric_log.csv
@@ -1,39 +1,39 @@
-id,guid,user_id,date,tags,notes
-1,7417256ddb67b9094955de0d653e4b91,1,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
-2,b6dc44db43f823a96bf14d378c4a6e10,2,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
-3,52614b2f5118caa7e1c33f5306ec7eee,1,Sun 28 Jun 2020 02:38:20 PM EDT,,
-4,ad4761f8458430bcf894919ffa0a60c8,2,Sun 28 Jun 2020 02:38:20 PM EDT,,
-5,ddeda6b7aa0990902c0ff7ca8868c298,1,Sun 28 Jun 2020 10:05:26 PM EDT,exercise,
-6,a8093d02eab44586e997b1c6f06024a5,2,Thu 02 Jul 2020 12:12:54 PM EDT,,doctor's office
-7,3b621d8701bc0662d8a99c8e255ae2df,1,Sat 04 Jul 2020 03:50:13 PM EDT,,
-8,4ff118cdb2f150c6dcaf63ea822133ee,2,Sat 04 Jul 2020 03:54:27 PM EDT,,
-9,b12d98910582378fd0bfe513db27dba2,2,Sun 05 Jul 2020 01:30:44 PM EDT,no THC,
-10,384729fed3c44775b5a6b83d9df441c1,1,Mon 06 Jul 2020 06:54:49 AM EDT,,
-11,a8e6660500e975e6974dc5e5b409674e,2,Sun 12 Jul 2020 12:29:11 PM EDT,THC,
-12,89d85a4c81b19ccc5b956574675e303b,2,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
-13,64f6ac68c4406082c2bd82f868b4e6ad,1,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
-14,d84f359570164f6f634c1f1ee428bf3f,3,Mon 13 Jul 2020 03:30:46 PM EDT,,
-15,e43c46b7905f0f43a93a5a32caaf1350,2,Fri 17 Jul 2020 02:02:12 PM EDT,,
-16,809ed86cf5f9ca733de44bd4dcafaa34,2,Fri 17 Jul 2020 03:14:37 PM EDT,THC,
-17,0c025c05a37fa891ac922990b915008a,1,Fri 17 Jul 2020 03:14:37 PM EDT,,
-18,4b7d0b88acd2b28555529185645c022e,2,Sat 08 Aug 2020 01:53:25 PM EDT,,
-19,da611fdf349a36fbfabdc39f0b5dd511,3,Thu 27 Aug 2020 12:44:37 PM EDT,,
-20,adc9cebc6ce0fe5caba725a20eaf3cf7,2,Fri 28 Aug 2020 03:40:56 PM EDT,,
-21,42c2437c8a7d8c6c9df58b874b188bba,1,Fri 28 Aug 2020 03:40:56 PM EDT,THC,1st dabs/2 weeks
-22,7bde0797bc4349091aa0c7c72e09abd2,2,Sun 06 Sep 2020 11:49:47 AM EDT,,
-23,b4b5b2a3c5185f787d428db4ae9d4884,1,Sun 06 Sep 2020 11:53:21 AM EDT,,
-24,c04eefe3c4c6e167d7bba4bb77d11f60,2,Sat 12 Sep 2020 12:15:53 PM EDT,,
-25,e866e51372616e77d110889513ab79e8,2,Sun 06 Sep 2020,,
-26,22e182dab0267ceecf537f10d76ccc7f,1,Sun 06 Sep 2020,,
-27,2881dc500b6f205b45da19fd60e6464b,2,Sat 12 Sep 2020,,
-28,360481648b356ac00ec2227805a02a5b,1,Sat 12 Sep 2020,,
-29,f3bf14d7924cd164be8e3cbc56aa795d,1,Sun 13 Sep 2020,,
-30,616bca3f62976021cc3b77e91a32de3b,1,Mon 14 Sep 2020,,
-31,60a75a93acb0cf77e9f2fe1a05e4d19d,1,Fri 18 Sep 2020 09:04:38 PM EDT,exercise,
-32,f4cf78ea8e2c7a03892e4b0268481b59,2,Thu 24 Sep 2020 05:05:51 PM EDT,illness,
-33,63239cac4d86f57a69cf9a9c7799a13c,1,Thu 24 Sep 2020 05:05:51 PM EDT,,
-34,0ebe7d5f9214f2e62c2952696caaadd9,2,Thu 24 Sep 2020,,
-35,7a4692cf15f960c1384210fb477367a9,1,Fri 25 Sep 2020,gym scale,
-36,67e1a2d244afb9924d1999d792264109,2,Sat 26 Sep 2020,,
-37,6f61f3010e4cae1e4d46cc85302ab4d6,2,Sat 26 Sep 2020 11:54:17 AM EDT,,
-38,180eed8bc3094f634895c13331cef858,1,Tue 29 Sep 2020 03:40:37 PM EDT,nude,
+id,guid,profile_id,created,updated,last_sync,date,tags,notes
+1,7417256ddb67b9094955de0d653e4b91,1,1601977400,1601977400,-1,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
+2,b6dc44db43f823a96bf14d378c4a6e10,2,1601977400,1601977400,-1,Sun 28 Jun 2020 02:07:01 PM EDT,exercise,
+3,52614b2f5118caa7e1c33f5306ec7eee,1,1601977400,1601977400,-1,Sun 28 Jun 2020 02:38:20 PM EDT,,
+4,ad4761f8458430bcf894919ffa0a60c8,2,1601977400,1601977400,-1,Sun 28 Jun 2020 02:38:20 PM EDT,,
+5,ddeda6b7aa0990902c0ff7ca8868c298,1,1601977400,1601977400,-1,Sun 28 Jun 2020 10:05:26 PM EDT,exercise,
+6,a8093d02eab44586e997b1c6f06024a5,2,1601977400,1601977400,-1,Thu 02 Jul 2020 12:12:54 PM EDT,,doctor's office
+7,3b621d8701bc0662d8a99c8e255ae2df,1,1601977400,1601977400,-1,Sat 04 Jul 2020 03:50:13 PM EDT,,
+8,4ff118cdb2f150c6dcaf63ea822133ee,2,1601977400,1601977400,-1,Sat 04 Jul 2020 03:54:27 PM EDT,,
+9,b12d98910582378fd0bfe513db27dba2,2,1601977400,1601977400,-1,Sun 05 Jul 2020 01:30:44 PM EDT,no THC,
+10,384729fed3c44775b5a6b83d9df441c1,1,1601977400,1601977400,-1,Mon 06 Jul 2020 06:54:49 AM EDT,,
+11,a8e6660500e975e6974dc5e5b409674e,2,1601977400,1601977400,-1,Sun 12 Jul 2020 12:29:11 PM EDT,THC,
+12,89d85a4c81b19ccc5b956574675e303b,2,1601977400,1601977400,-1,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
+13,64f6ac68c4406082c2bd82f868b4e6ad,1,1601977400,1601977400,-1,Sun 12 Jul 2020 02:44:25 PM EDT,THC,
+14,d84f359570164f6f634c1f1ee428bf3f,3,1601977400,1601977400,-1,Mon 13 Jul 2020 03:30:46 PM EDT,,
+15,e43c46b7905f0f43a93a5a32caaf1350,2,1601977400,1601977400,-1,Fri 17 Jul 2020 02:02:12 PM EDT,,
+16,809ed86cf5f9ca733de44bd4dcafaa34,2,1601977400,1601977400,-1,Fri 17 Jul 2020 03:14:37 PM EDT,THC,
+17,0c025c05a37fa891ac922990b915008a,1,1601977400,1601977400,-1,Fri 17 Jul 2020 03:14:37 PM EDT,,
+18,4b7d0b88acd2b28555529185645c022e,2,1601977400,1601977400,-1,Sat 08 Aug 2020 01:53:25 PM EDT,,
+19,da611fdf349a36fbfabdc39f0b5dd511,3,1601977400,1601977400,-1,Thu 27 Aug 2020 12:44:37 PM EDT,,
+20,adc9cebc6ce0fe5caba725a20eaf3cf7,2,1601977400,1601977400,-1,Fri 28 Aug 2020 03:40:56 PM EDT,,
+21,42c2437c8a7d8c6c9df58b874b188bba,1,1601977400,1601977400,-1,Fri 28 Aug 2020 03:40:56 PM EDT,THC,1st dabs/2 weeks
+22,7bde0797bc4349091aa0c7c72e09abd2,2,1601977400,1601977400,-1,Sun 06 Sep 2020 11:49:47 AM EDT,,
+23,b4b5b2a3c5185f787d428db4ae9d4884,1,1601977400,1601977400,-1,Sun 06 Sep 2020 11:53:21 AM EDT,,
+24,c04eefe3c4c6e167d7bba4bb77d11f60,2,1601977400,1601977400,-1,Sat 12 Sep 2020 12:15:53 PM EDT,,
+25,e866e51372616e77d110889513ab79e8,2,1601977400,1601977400,-1,Sun 06 Sep 2020,,
+26,22e182dab0267ceecf537f10d76ccc7f,1,1601977400,1601977400,-1,Sun 06 Sep 2020,,
+27,2881dc500b6f205b45da19fd60e6464b,2,1601977400,1601977400,-1,Sat 12 Sep 2020,,
+28,360481648b356ac00ec2227805a02a5b,1,1601977400,1601977400,-1,Sat 12 Sep 2020,,
+29,f3bf14d7924cd164be8e3cbc56aa795d,1,1601977400,1601977400,-1,Sun 13 Sep 2020,,
+30,616bca3f62976021cc3b77e91a32de3b,1,1601977400,1601977400,-1,Mon 14 Sep 2020,,
+31,60a75a93acb0cf77e9f2fe1a05e4d19d,1,1601977400,1601977400,-1,Fri 18 Sep 2020 09:04:38 PM EDT,exercise,
+32,f4cf78ea8e2c7a03892e4b0268481b59,2,1601977400,1601977400,-1,Thu 24 Sep 2020 05:05:51 PM EDT,illness,
+33,63239cac4d86f57a69cf9a9c7799a13c,1,1601977400,1601977400,-1,Thu 24 Sep 2020 05:05:51 PM EDT,,
+34,0ebe7d5f9214f2e62c2952696caaadd9,2,1601977400,1601977400,-1,Thu 24 Sep 2020,,
+35,7a4692cf15f960c1384210fb477367a9,1,1601977400,1601977400,-1,Fri 25 Sep 2020,gym scale,
+36,67e1a2d244afb9924d1999d792264109,2,1601977400,1601977400,-1,Sat 26 Sep 2020,,
+37,6f61f3010e4cae1e4d46cc85302ab4d6,2,1601977400,1601977400,-1,Sat 26 Sep 2020 11:54:17 AM EDT,,
+38,180eed8bc3094f634895c13331cef858,1,1601977400,1601977400,-1,Tue 29 Sep 2020 03:40:37 PM EDT,nude,

diff --git a/sql/data/food_log.csv b/sql/data/food_log.csv
index c640278bf591762545ddbb8adc1bbaa9f2a9bfbf..586c4cf671f5a27b9000aaf32d52a42688a04f9f 100644 (file)
--- a/sql/data/food_log.csv
+++ b/sql/data/food_log.csv
@@ -1,23 +1,23 @@
-id,guid,user_id,date,meal_id,food_id,grams
-1,365e2f316ea39c578a63ec0f59c0d0f0,1,2020-09-20,1,13047,100
-2,71d5d8cbbc591d22cb210ae6323249a1,1,2020-09-20,1,1270,28
-3,295f1cd568fc03b760ff9a3a985c4658,1,2020-09-20,1,9038,55
-4,30bb19b8d57492fee6cb1ebbdc9196a,1,2020-09-20,1,11251,20
-5,d2e64b1da42c2e12bd3dc9f029fb1bb5,1,2020-09-20,1,11529,35
-6,b169e76aa7ccd833a3f7d0e1a5f6935b,1,2020-09-20,1,11282,15
-7,2c53dca9604ea742c39184201d41eed4,1,2020-09-20,1,11828,210
-8,edad78872ae5d7e2a444756a336dce40,1,2020-09-20,1,28313,40
-9,c78bb27a7c756763d10d4bb7f860ba23,1,2020-09-20,1,9112,100
-10,490ffdd0063fcfc79ce5f825a7f2d370,1,2020-09-20,2,20137,140
-11,7fe9a33f24010f1738ddf73010041ced,1,2020-09-20,2,5062,100
-12,a54ddeafde280fd76a0cbbd63b9539e7,1,2020-09-20,2,12136,45
-13,6dfcfbbd5d0cb563343260d287cbdff5,1,2020-09-20,2,11821,50
-14,4704b0288bf626799dc2c09cbb75f28,1,2020-09-20,2,44005,15
-15,7053ec55502f3dccccf16d59c2a38873,1,2020-09-20,3,20545,150
-16,8f7d5caef9dac0d7102a4d90ae9f36c8,1,2020-09-20,3,16146,85
-17,79949cb0b9914d63892b89d91a4a4ad0,1,2020-09-20,3,1270,40
-18,85a4ab5a6da9fa84285dece0f2c7fa2a,1,2020-09-20,3,9037,60
-19,16f98e0382dece4799dd41325b292c70,1,2020-09-20,3,15076,100
-20,bcab83a1676a3ac8f6aadd63dd032e06,1,2020-09-20,3,11090,60
-21,44aa12a8695bfd84a513e24bb65896d9,1,2020-09-20,3,11938,35
-22,252045bc8ba3f133d4006d82a467b053,1,2020-09-20,3,11282,25
+id,guid,profile_id,created,updated,last_sync,date,meal_id,food_id,grams
+1,365e2f316ea39c578a63ec0f59c0d0f0,1,1601977400,1601977400,-1,2020-09-20,1,13047,100
+2,71d5d8cbbc591d22cb210ae6323249a1,1,1601977400,1601977400,-1,2020-09-20,1,1270,28
+3,295f1cd568fc03b760ff9a3a985c4658,1,1601977400,1601977400,-1,2020-09-20,1,9038,55
+4,30bb19b8d57492fee6cb1ebbdc9196a,1,1601977400,1601977400,-1,2020-09-20,1,11251,20
+5,d2e64b1da42c2e12bd3dc9f029fb1bb5,1,1601977400,1601977400,-1,2020-09-20,1,11529,35
+6,b169e76aa7ccd833a3f7d0e1a5f6935b,1,1601977400,1601977400,-1,2020-09-20,1,11282,15
+7,2c53dca9604ea742c39184201d41eed4,1,1601977400,1601977400,-1,2020-09-20,1,11828,210
+8,edad78872ae5d7e2a444756a336dce40,1,1601977400,1601977400,-1,2020-09-20,1,28313,40
+9,c78bb27a7c756763d10d4bb7f860ba23,1,1601977400,1601977400,-1,2020-09-20,1,9112,100
+10,490ffdd0063fcfc79ce5f825a7f2d370,1,1601977400,1601977400,-1,2020-09-20,2,20137,140
+11,7fe9a33f24010f1738ddf73010041ced,1,1601977400,1601977400,-1,2020-09-20,2,5062,100
+12,a54ddeafde280fd76a0cbbd63b9539e7,1,1601977400,1601977400,-1,2020-09-20,2,12136,45
+13,6dfcfbbd5d0cb563343260d287cbdff5,1,1601977400,1601977400,-1,2020-09-20,2,11821,50
+14,4704b0288bf626799dc2c09cbb75f28,1,1601977400,1601977400,-1,2020-09-20,2,44005,15
+15,7053ec55502f3dccccf16d59c2a38873,1,1601977400,1601977400,-1,2020-09-20,3,20545,150
+16,8f7d5caef9dac0d7102a4d90ae9f36c8,1,1601977400,1601977400,-1,2020-09-20,3,16146,85
+17,79949cb0b9914d63892b89d91a4a4ad0,1,1601977400,1601977400,-1,2020-09-20,3,1270,40
+18,85a4ab5a6da9fa84285dece0f2c7fa2a,1,1601977400,1601977400,-1,2020-09-20,3,9037,60
+19,16f98e0382dece4799dd41325b292c70,1,1601977400,1601977400,-1,2020-09-20,3,15076,100
+20,bcab83a1676a3ac8f6aadd63dd032e06,1,1601977400,1601977400,-1,2020-09-20,3,11090,60
+21,44aa12a8695bfd84a513e24bb65896d9,1,1601977400,1601977400,-1,2020-09-20,3,11938,35
+22,252045bc8ba3f133d4006d82a467b053,1,1601977400,1601977400,-1,2020-09-20,3,11282,25

diff --git a/sql/data/profiles.csv b/sql/data/profiles.csv
index d0356e262296f81d26dfae091f34fd1235f9a405..4bd3da46c96e3dc08cb3deb934ba9c6549c58364 100644 (file)
--- a/sql/data/profiles.csv
+++ b/sql/data/profiles.csv
@@ -1,4 +1,4 @@
-id,name,guid,created,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_id,bf_id
-1,Shane,a0fdac7ab369de43f029a460879c854f,1601067725,1,MALE,1993-01-01,2,78,0.12,1,1
-2,Mark,7abf05c84beb849628a44336acfe7a5b,1601068574,1,MALE,1957-01-01,2,72,0.14,1,1
-3,Rocky,2454c8ab7c575cd2610f9977ed3b2b61,1601068718,1,DOG,2007-08-01,2,7.3,,1,1
+id,name,guid,created,updated,last_sync,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_id,bf_id
+1,Shane,a0fdac7ab369de43f029a460879c854f,1601067725,1601067725,-1,1,MALE,1993-01-01,2,78,0.12,1,1
+2,Mark,7abf05c84beb849628a44336acfe7a5b,1601068574,1601068574,-1,1,MALE,1957-01-01,2,72,0.14,1,1
+3,Rocky,2454c8ab7c575cd2610f9977ed3b2b61,1601068718,1601068718,-1,1,DOG,2007-08-01,2,7.3,,1,1

diff --git a/sql/data/rda.csv b/sql/data/rda.csv
index 117fe94f50d3ddc343ec7baf54ccc2e23fbb7f76..27caf10e901fd851a7747977a98048cda84b5a9f 100644 (file)
--- a/sql/data/rda.csv
+++ b/sql/data/rda.csv
@@ -1,80 +1,80 @@
-user_id,nutr_id,rda,synced
-3,203,18,1
-3,204,25,1
-3,205,60,1
-3,208,501,1
-3,269,15,1
-3,291,9,1
-3,301,300,1
-3,303,4,1
-3,304,100,1
-3,305,250,1
-3,306,1300,1
-3,307,350,1
-3,309,3,1
-3,312,0.2,1
-3,315,0.6,1
-3,317,15,1
-3,318,1000,1
-3,320,250,1
-3,324,100,1
-3,328,5,1
-3,337,900,1
-3,338,2000,1
-3,401,30,1
-3,404,0.3,1
-3,405,0.35,1
-3,406,4,1
-3,410,1.25,1
-3,415,0.4,1
-3,417,100,1
-3,418,0.6,1
-3,421,110,1
-3,430,30,1
-3,501,0.1,1
-3,502,0.3,1
-3,503,0.5,1
-3,504,1,1
-3,505,0.8,1
-3,506,0.3,1
-3,508,0.3,1
-3,509,0.4,1
-3,510,0.5,1
-3,511,0.3,1
-3,512,0.2,1
-3,513,0.3,1
-3,514,0.3,1
-3,515,0.5,1
-3,516,0.2,1
-3,517,0.2,1
-3,518,0.4,1
-3,601,50,1
-3,605,0,1
-3,606,7,1
-3,621,0.1,1
-3,629,0.05,1
-3,645,10,1
-3,646,6,1
-3,710,8,1
-3,711,4,1
-3,713,11,1
-3,731,5,1
-3,734,10,1
-3,735,5,1
-3,736,5,1
-3,737,2,1
-3,738,1,1
-3,749,10,1
-3,750,10,1
-3,751,10,1
-3,752,10,1
-3,753,15,1
-3,759,20,1
-3,762,15,1
-3,770,8,1
-3,773,5,1
-3,785,5,1
-3,786,1.5,1
-3,788,0.5,1
-3,789,5,1
-3,851,0.3,1
+profile_id,created,updated,last_sync,nutr_id,rda
+3,1601978681,1601978681,-1,203,18
+3,1601978681,1601978681,-1,204,25
+3,1601978681,1601978681,-1,205,60
+3,1601978681,1601978681,-1,208,501
+3,1601978681,1601978681,-1,269,15
+3,1601978681,1601978681,-1,291,9
+3,1601978681,1601978681,-1,301,300
+3,1601978681,1601978681,-1,303,4
+3,1601978681,1601978681,-1,304,100
+3,1601978681,1601978681,-1,305,250
+3,1601978681,1601978681,-1,306,1300
+3,1601978681,1601978681,-1,307,350
+3,1601978681,1601978681,-1,309,3
+3,1601978681,1601978681,-1,312,0.2
+3,1601978681,1601978681,-1,315,0.6
+3,1601978681,1601978681,-1,317,15
+3,1601978681,1601978681,-1,318,1000
+3,1601978681,1601978681,-1,320,250
+3,1601978681,1601978681,-1,324,100
+3,1601978681,1601978681,-1,328,5
+3,1601978681,1601978681,-1,337,900
+3,1601978681,1601978681,-1,338,2000
+3,1601978681,1601978681,-1,401,30
+3,1601978681,1601978681,-1,404,0.3
+3,1601978681,1601978681,-1,405,0.35
+3,1601978681,1601978681,-1,406,4
+3,1601978681,1601978681,-1,410,1.25
+3,1601978681,1601978681,-1,415,0.4
+3,1601978681,1601978681,-1,417,100
+3,1601978681,1601978681,-1,418,0.6
+3,1601978681,1601978681,-1,421,110
+3,1601978681,1601978681,-1,430,30
+3,1601978681,1601978681,-1,501,0.1
+3,1601978681,1601978681,-1,502,0.3
+3,1601978681,1601978681,-1,503,0.5
+3,1601978681,1601978681,-1,504,1
+3,1601978681,1601978681,-1,505,0.8
+3,1601978681,1601978681,-1,506,0.3
+3,1601978681,1601978681,-1,508,0.3
+3,1601978681,1601978681,-1,509,0.4
+3,1601978681,1601978681,-1,510,0.5
+3,1601978681,1601978681,-1,511,0.3
+3,1601978681,1601978681,-1,512,0.2
+3,1601978681,1601978681,-1,513,0.3
+3,1601978681,1601978681,-1,514,0.3
+3,1601978681,1601978681,-1,515,0.5
+3,1601978681,1601978681,-1,516,0.2
+3,1601978681,1601978681,-1,517,0.2
+3,1601978681,1601978681,-1,518,0.4
+3,1601978681,1601978681,-1,601,50
+3,1601978681,1601978681,-1,605,0
+3,1601978681,1601978681,-1,606,7
+3,1601978681,1601978681,-1,621,0.1
+3,1601978681,1601978681,-1,629,0.05
+3,1601978681,1601978681,-1,645,10
+3,1601978681,1601978681,-1,646,6
+3,1601978681,1601978681,-1,710,8
+3,1601978681,1601978681,-1,711,4
+3,1601978681,1601978681,-1,713,11
+3,1601978681,1601978681,-1,731,5
+3,1601978681,1601978681,-1,734,10
+3,1601978681,1601978681,-1,735,5
+3,1601978681,1601978681,-1,736,5
+3,1601978681,1601978681,-1,737,2
+3,1601978681,1601978681,-1,738,1
+3,1601978681,1601978681,-1,749,10
+3,1601978681,1601978681,-1,750,10
+3,1601978681,1601978681,-1,751,10
+3,1601978681,1601978681,-1,752,10
+3,1601978681,1601978681,-1,753,15
+3,1601978681,1601978681,-1,759,20
+3,1601978681,1601978681,-1,762,15
+3,1601978681,1601978681,-1,770,8
+3,1601978681,1601978681,-1,773,5
+3,1601978681,1601978681,-1,785,5
+3,1601978681,1601978681,-1,786,1.5
+3,1601978681,1601978681,-1,788,0.5
+3,1601978681,1601978681,-1,789,5
+3,1601978681,1601978681,-1,851,0.3

diff --git a/sql/data/recipe_log.csv b/sql/data/recipe_log.csv
index 4e01438f7fa2903c35667c8a20136794d49045ae..c19e152b4de73fd5ba99981b78ae7a293b429890 100644 (file)
--- a/sql/data/recipe_log.csv
+++ b/sql/data/recipe_log.csv
@@ -1,2 +1,2 @@
-id,guid,user_id,date,meal_id,recipe_id,grams
-1,6ca4cf9c1b7e7b71ca084d7b704eb29c,1,2020-09-26,1,1,315
+id,guid,profile_id,created,updated,last_sync,date,meal_id,recipe_id,grams
+1,6ca4cf9c1b7e7b71ca084d7b704eb29c,1,1601977400,1601977400,-1,2020-09-26,1,1,315

diff --git a/sql/data/recipes.csv b/sql/data/recipes.csv
index 1cabfd084c8a58090141aace7b572867ae62bcbf..b83e68ecab6280aabb2f248ab7f7fc0c9721f3bc 100644 (file)
--- a/sql/data/recipes.csv
+++ b/sql/data/recipes.csv
@@ -1,6 +1,6 @@
-id,guid,created,name
-1,72217324e92840852242c165aa778a67,1601235568,Burrito bowl (Everyday)
-2,21613decf46873f07027886907d2a4ad,1601235568,"Burger (Grass fed, Beef)"
-3,b4d0016ca8d8d0c2cbc9aa715944637f,1601235568,Baked potato wedges
-4,fe653c350987bffbca2a738889009e4f,1601235568,Buckwheat pancake (w/ syrup)
-5,8359446f074f8ee8ed3f26b4b3c66b3f,1601235568,Blueberry-hemp Smoothie
+id,guid,created,updated,last_sync,name
+1,72217324e92840852242c165aa778a67,1601235568,1601235568,-1,Burrito bowl (Everyday)
+2,21613decf46873f07027886907d2a4ad,1601235568,1601235568,-1,"Burger (Grass fed, Beef)"
+3,b4d0016ca8d8d0c2cbc9aa715944637f,1601235568,1601235568,-1,Baked potato wedges
+4,fe653c350987bffbca2a738889009e4f,1601235568,1601235568,-1,Buckwheat pancake (w/ syrup)
+5,8359446f074f8ee8ed3f26b4b3c66b3f,1601235568,1601235568,-1,Blueberry-hemp Smoothie

diff --git a/sql/functions.sql b/sql/functions.sql
index 8a6f3744cb62205e4a77257d5d18000131293245..cd375c1fecb60422a734b2948129c67e4e2be630 100644 (file)
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -166,3 +166,14 @@ FROM
 GROUP BY
   id;
 
+--------------------------------
+-- Last sync
+--------------------------------
+
+SELECT
+  max((
+    SELECT
+      last_sync FROM biometric_log), (
+    SELECT
+      last_sync FROM biometric_log));
+

diff --git a/sql/tables.sql b/sql/tables.sql
index 1e6036921dd72669b82163fa0bbcbcd516a53500..c545bbf92c4f1ec90674dc216788e11feb3fc4d7 100644 (file)
--- a/sql/tables.sql
+++ b/sql/tables.sql
@@ -45,6 +45,8 @@ CREATE TABLE profiles (
   name text NOT NULL UNIQUE,
   guid text NOT NULL DEFAULT (lower(hex (randomblob (16)))) UNIQUE,
   created int DEFAULT (strftime ('%s', 'now')),
+  updated int DEFAULT (strftime ('%s', 'now')),
+  last_sync int DEFAULT - 1,
   eula int DEFAULT 0,
   gender text,
   dob date,
@@ -76,7 +78,7 @@ CREATE TABLE biometric_log (
   profile_id int NOT NULL,
   created int DEFAULT (strftime ('%s', 'now')),
   updated int DEFAULT (strftime ('%s', 'now')),
-  synced int DEFAULT -1,
+  last_sync int DEFAULT - 1,
   date int DEFAULT (strftime ('%s', 'now')),
   tags text,
   notes text,
@@ -101,6 +103,8 @@ CREATE TABLE recipes (
   id integer PRIMARY KEY AUTOINCREMENT,
   guid text NOT NULL DEFAULT (lower(hex (randomblob (16)))) UNIQUE,
   created int DEFAULT (strftime ('%s', 'now')),
+  updated int DEFAULT (strftime ('%s', 'now')),
+  last_sync int DEFAULT - 1,
   name text NOT NULL
 );
 
@@ -129,6 +133,9 @@ CREATE TABLE food_log (
   id integer PRIMARY KEY AUTOINCREMENT,
   guid text NOT NULL DEFAULT (lower(hex (randomblob (16)))) UNIQUE,
   profile_id int NOT NULL,
+  created int DEFAULT (strftime ('%s', 'now')),
+  updated int DEFAULT (strftime ('%s', 'now')),
+  last_sync int DEFAULT - 1,
   date date DEFAULT CURRENT_DATE,
   meal_id int NOT NULL,
   food_id int NOT NULL, -- TODO: enforce FK constraint across two DBs?
@@ -141,6 +148,9 @@ CREATE TABLE recipe_log (
   id integer PRIMARY KEY AUTOINCREMENT,
   guid text NOT NULL DEFAULT (lower(hex (randomblob (16)))) UNIQUE,
   profile_id int NOT NULL,
+  created int DEFAULT (strftime ('%s', 'now')),
+  updated int DEFAULT (strftime ('%s', 'now')),
+  last_sync int DEFAULT - 1,
   date date DEFAULT CURRENT_DATE,
   meal_id int NOT NULL,
   recipe_id int NOT NULL,
@@ -157,10 +167,12 @@ CREATE TABLE recipe_log (
 
 CREATE TABLE rda (
   profile_id int NOT NULL,
+  created int DEFAULT (strftime ('%s', 'now')),
+  updated int DEFAULT (strftime ('%s', 'now')),
+  last_sync int DEFAULT - 1,
   -- TODO: enforce FK constraint across two DBs?
   nutr_id int NOT NULL,
   rda real NOT NULL,
-  synced int DEFAULT 0,
   PRIMARY KEY (profile_id, nutr_id),
   FOREIGN KEY (profile_id) REFERENCES profiles (id) ON UPDATE CASCADE
 );