restructure

diff --git a/data/import.sql b/data/import.sql
deleted file mode 100644 (file)
index adbbd65..0000000
--- a/data/import.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-.mode csv
-
-.import '| tail -n +2 nt_ver.csv' nt_ver
-
-.import '| tail -n +2 nt/nutr_def.csv' nutr_def
-.import '| tail -n +2 nt/fdgrp.csv' fdgrp
-.import '| tail -n +2 nt/food_des.csv' food_des
-
-
-.import '| tail -n +2 nt/src_cd.csv' src_cd
-.import '| tail -n +2 nt/deriv_cd.csv' deriv_cd
-.import '| tail -n +2 nt/nut_data.csv' nut_data
-
-
-.import '| tail -n +2 nt/lang_desc.csv' lang_desc
-.import '| tail -n +2 nt/langual.csv' langual
-
-.import '| tail -n +2 nt/data_src.csv' data_src
-.import '| tail -n +2 nt/datsrcln.csv' datsrcln
-
-.import '| tail -n +2 nt/serv_desc.csv' serv_desc
-.import '| tail -n +2 nt/serving.csv' serving
-
-.import '| tail -n +2 nt/footnote.csv' footnote
-
-.header on
-.mode column

diff --git a/data/nt_ver.csv b/data/nt_ver.csv
deleted file mode 100644 (file)
index 14c4492..0000000
--- a/data/nt_ver.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,version,created
-1,0.0.0,Wed 05 Aug 2020 07:09:35 PM EDT
-2,0.0.1,Wed 05 Aug 2020 08:14:52 PM EDT

diff --git a/data/format-sql.sh b/sql/format-sql.sh
similarity index 60%
rename from data/format-sql.sh
rename to sql/format-sql.sh
index 2c499b6d3b9346b181baf82edf7ccea8d5523326..07a986b10fe421535658cc1ddb4046c5ed16a99e 100755 (executable)
--- a/data/format-sql.sh
+++ b/sql/format-sql.sh
@@ -3,4 +3,4 @@
 cd "$(dirname "$0")"
 
 pg_format -s 2 tables.sql -o tables.sql
-# pg_format -s 2 functions.sql -o functions.sql
+# pg_format -s 2 functions.sql -o import.sql

diff --git a/sql/import.sql b/sql/import.sql
new file mode 100644 (file)
index 0000000..f7e52b9
--- /dev/null
+++ b/sql/import.sql
@@ -0,0 +1,27 @@
+.mode csv
+
+.import '| tail -n +2 nt_ver.csv' nt_ver
+
+.import '| tail -n +2 ../data/nt/nutr_def.csv' nutr_def
+.import '| tail -n +2 ../data/nt/fdgrp.csv' fdgrp
+.import '| tail -n +2 ../data/nt/food_des.csv' food_des
+
+
+.import '| tail -n +2 ../data/nt/src_cd.csv' src_cd
+.import '| tail -n +2 ../data/nt/deriv_cd.csv' deriv_cd
+.import '| tail -n +2 ../data/nt/nut_data.csv' nut_data
+
+
+.import '| tail -n +2 ../data/nt/lang_desc.csv' lang_desc
+.import '| tail -n +2 ../data/nt/langual.csv' langual
+
+.import '| tail -n +2 ../data/nt/data_src.csv' data_src
+.import '| tail -n +2 ../data/nt/datsrcln.csv' datsrcln
+
+.import '| tail -n +2 ../data/nt/serv_desc.csv' serv_desc
+.import '| tail -n +2 ../data/nt/serving.csv' serving
+
+.import '| tail -n +2 ../data/nt/footnote.csv' footnote
+
+.header on
+.mode column

diff --git a/data/tables.sql b/sql/tables.sql
similarity index 98%
rename from data/tables.sql
rename to sql/tables.sql
index af2f378fa96b054d90391386decd00c3a3ed7032..b0df1722ba92240240d4335a53d8b926dcc3fcf6 100644 (file)
--- a/data/tables.sql
+++ b/sql/tables.sql
@@ -49,8 +49,8 @@ CREATE TABLE food_des (
   refuse int,
   sci_name text,
   n_factor FLOAT,
-  pro_factor_ FLOAT,
-  fat_factor_ FLOAT,
+  pro_factor FLOAT,
+  fat_factor FLOAT,
   cho_factor FLOAT,
   FOREIGN KEY (fdgrp_id) REFERENCES fdgrp (id)
 );