Merge pull request #1278 from PecanProject/dump-new-tables

dump new tables PecanProject/bety#403 PecanProject/bety#491
PecanProject · Mar 17, 2017 · d6ba37a · d6ba37a
2 parents 49fdca3 + a6cd83c
commit d6ba37a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/scripts/dump.bety.sh b/scripts/dump.bety.sh
@@ -100,7 +100,7 @@ USER_TABLES="users"
 # will be imported during creaton
 CLEAN_TABLES="benchmark_sets benchmarks"
 CLEAN_TABLES="${CLEAN_TABLES} citations covariates cultivars dbfiles"
-CLEAN_TABLES="${CLEAN_TABLES} ensembles entities formats inputs"
+CLEAN_TABLES="${CLEAN_TABLES} ensembles entities experiments formats inputs"
 CLEAN_TABLES="${CLEAN_TABLES} likelihoods machines managements metrics"
 CLEAN_TABLES="${CLEAN_TABLES} methods mimetypes models modeltypes"
 CLEAN_TABLES="${CLEAN_TABLES} pfts posteriors priors reference_runs"
@@ -112,18 +112,16 @@ CLEAN_TABLES="${CLEAN_TABLES} projects sitegroups"
 CHECK_TABLES="traits yields"
 
 # tables that have many to many relationships
-# Following tables that don't have id's yet and are not included
-#  - cultivars_pfts
-#  - trait_covariate_associations
 MANY_TABLES="benchmarks_benchmarks_reference_runs benchmarks_ensembles"
 MANY_TABLES="${MANY_TABLES} benchmarks_ensembles_scores benchmarks_metrics benchmark_sets_benchmark_reference_runs"
 MANY_TABLES="${MANY_TABLES} citations_sites citations_treatments"
-MANY_TABLES="${MANY_TABLES} current_posteriors"
+MANY_TABLES="${MANY_TABLES} cultivars_pfts current_posteriors"
+MANY_TABLES="${MANY_TABLES} experiments_sites experiments_treatments"
 MANY_TABLES="${MANY_TABLES} formats_variables inputs_runs"
 MANY_TABLES="${MANY_TABLES} managements_treatments modeltypes_formats"
 MANY_TABLES="${MANY_TABLES} pfts_priors pfts_species"
 MANY_TABLES="${MANY_TABLES} posterior_samples posteriors_ensembles"
-MANY_TABLES="${MANY_TABLES} sitegroups_sites"
+MANY_TABLES="${MANY_TABLES} sitegroups_sites trait_covariate_associations"
 
 # tables that should NOT be dumped
 IGNORE_TABLES="sessions"

diff --git a/scripts/load.bety.sh b/scripts/load.bety.sh
@@ -180,7 +180,7 @@ EMPTY_TABLES="formats machines mimetypes users"
 # will be imported during creaton. Order is semi important.
 CLEAN_TABLES="benchmark_sets benchmarks"
 CLEAN_TABLES="${CLEAN_TABLES} citations covariates cultivars"
-CLEAN_TABLES="${CLEAN_TABLES} ensembles entities formats inputs"
+CLEAN_TABLES="${CLEAN_TABLES} ensembles entities experiments formats inputs"
 CLEAN_TABLES="${CLEAN_TABLES} likelihoods machines managements metrics"
 CLEAN_TABLES="${CLEAN_TABLES} methods mimetypes models modeltypes"
 CLEAN_TABLES="${CLEAN_TABLES} pfts posteriors priors reference_runs"
@@ -193,18 +193,16 @@ CLEAN_TABLES="${CLEAN_TABLES} dbfiles"
 CHECK_TABLES="traits yields"
 
 # tables that have many to many relationships
-# Following tables that don't have id's yet and are not included
-#  - cultivars_pfts
-#  - trait_covariate_associations
 MANY_TABLES="benchmarks_benchmarks_reference_runs benchmarks_ensembles"
 MANY_TABLES="${MANY_TABLES} benchmarks_ensembles_scores benchmarks_metrics benchmark_sets_benchmark_reference_runs"
 MANY_TABLES="${MANY_TABLES} citations_sites citations_treatments"
-MANY_TABLES="${MANY_TABLES} current_posteriors"
+MANY_TABLES="${MANY_TABLES} cultivars_pfts current_posteriors"
+MANY_TABLES="${MANY_TABLES} experiments_sites experiments_treatments"
 MANY_TABLES="${MANY_TABLES} formats_variables inputs_runs"
 MANY_TABLES="${MANY_TABLES} managements_treatments modeltypes_formats"
 MANY_TABLES="${MANY_TABLES} pfts_priors pfts_species"
 MANY_TABLES="${MANY_TABLES} posterior_samples posteriors_ensembles"
-MANY_TABLES="${MANY_TABLES} sitegroups_sites"
+MANY_TABLES="${MANY_TABLES} sitegroups_sites trait_covariate_associations"
 
 # tables that should NOT be dumped
 IGNORE_TABLES="sessions"