log inserts and honor field names

diff --git a/sql/__init__.py b/sql/__init__.py
index f2568260d112824da59c25b8317e929f97ffa996..b8e2501ddab114b0db6a17a9d2891a16254357d0 100755 (executable)
--- a/sql/__init__.py
+++ b/sql/__init__.py
@@ -41,10 +41,13 @@ def build_ntsqlite(verbose=False):
         with open(file_path_full) as csv_file:
             reader = csv.DictReader(csv_file)
             values = ",".join("?" * len(reader.fieldnames))
+            fields = ",".join(reader.fieldnames)
             reader = csv.reader(csv_file)
-            query = "INSERT INTO {0} VALUES ({1});".format(  # nosec: B608
-                table_name, values
+            query = "INSERT INTO {0} ({1}) VALUES ({2});".format(  # nosec: B608
+                table_name, fields, values
             )
+            print(query)
+            print("\n")
             cur.executemany(query, reader)
 
     cur.close()

diff --git a/sql/data/profiles.csv b/sql/data/profiles.csv
index 5c70d60afba55bc43124bb4ccaec23429bfadad0..3ad8ba628457db70f87014ff8790578f09cbfe4f 100644 (file)
--- a/sql/data/profiles.csv
+++ b/sql/data/profiles.csv
@@ -1,2 +1,2 @@
-id,name,created,updated,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_id,bf_id,pwd_hash
+id,name,created,updated,eula,gender,dob,act_lvl,goal_wt,goal_bf,bmr_eq_id,bf_eq_id,pwd_hash
 1,New User,1601067725,1601067725,,MALE,2001-01-01,2,78,0.12,1,1,password

diff --git a/sql/data/version.csv b/sql/data/version.csv
index a99abb3d8cff1fdd614778baea9861971d0ddfe3..a27c2479a37359dd23973e53d0299dc6d1a35443 100644 (file)
--- a/sql/data/version.csv
+++ b/sql/data/version.csv
@@ -5,4 +5,5 @@ id,version,created,notes
 4,0.0.3,2021-05-24,general cleanup
 5,0.0.4,2021-06-17,"add custom foods tables (custom_foods, cf_dat)"
 6,0.0.5,2021-10-28,"update tables to support app (subset of original features)"
-7,1.0.0,2021-11-05,"remove test data"
\ No newline at end of file
+7,1.0.0,2021-11-05,"remove test data"
+8,1.0.1,2021-11-05,"use field headers from test data"
\ No newline at end of file