diff --git a/database/src/migrations/20210225205948_biohub_release.ts b/database/src/migrations/20210225205948_biohub_release.ts index 9a7b8dda8e..854ccf2dc6 100644 --- a/database/src/migrations/20210225205948_biohub_release.ts +++ b/database/src/migrations/20210225205948_biohub_release.ts @@ -5,7 +5,7 @@ import path from 'path'; const DB_USER_API_PASS = process.env.DB_USER_API_PASS; const DB_USER_API = process.env.DB_USER_API; -const DB_RELEASE = 'release.0.33'; +const DB_RELEASE = 'release.0.34'; /** * Apply biohub release changes. diff --git a/database/src/migrations/release.0.33/api_delete_occurrence_submission.sql b/database/src/migrations/release.0.34/api_delete_occurrence_submission.sql similarity index 100% rename from database/src/migrations/release.0.33/api_delete_occurrence_submission.sql rename to database/src/migrations/release.0.34/api_delete_occurrence_submission.sql diff --git a/database/src/migrations/release.0.33/api_delete_project.sql b/database/src/migrations/release.0.34/api_delete_project.sql similarity index 100% rename from database/src/migrations/release.0.33/api_delete_project.sql rename to database/src/migrations/release.0.34/api_delete_project.sql diff --git a/database/src/migrations/release.0.33/api_delete_survey.sql b/database/src/migrations/release.0.34/api_delete_survey.sql similarity index 100% rename from database/src/migrations/release.0.33/api_delete_survey.sql rename to database/src/migrations/release.0.34/api_delete_survey.sql diff --git a/database/src/migrations/release.0.33/api_get_context_system_user_role_id.sql b/database/src/migrations/release.0.34/api_get_context_system_user_role_id.sql similarity index 100% rename from database/src/migrations/release.0.33/api_get_context_system_user_role_id.sql rename to database/src/migrations/release.0.34/api_get_context_system_user_role_id.sql diff --git a/database/src/migrations/release.0.33/api_get_context_user_id.sql b/database/src/migrations/release.0.34/api_get_context_user_id.sql similarity index 100% rename from database/src/migrations/release.0.33/api_get_context_user_id.sql rename to database/src/migrations/release.0.34/api_get_context_user_id.sql diff --git a/database/src/migrations/release.0.33/api_get_eml_data_package.sql b/database/src/migrations/release.0.34/api_get_eml_data_package.sql similarity index 100% rename from database/src/migrations/release.0.33/api_get_eml_data_package.sql rename to database/src/migrations/release.0.34/api_get_eml_data_package.sql diff --git a/database/src/migrations/release.0.33/api_get_system_constant.sql b/database/src/migrations/release.0.34/api_get_system_constant.sql similarity index 100% rename from database/src/migrations/release.0.33/api_get_system_constant.sql rename to database/src/migrations/release.0.34/api_get_system_constant.sql diff --git a/database/src/migrations/release.0.33/api_get_system_metadata_constant.sql b/database/src/migrations/release.0.34/api_get_system_metadata_constant.sql similarity index 100% rename from database/src/migrations/release.0.33/api_get_system_metadata_constant.sql rename to database/src/migrations/release.0.34/api_get_system_metadata_constant.sql diff --git a/database/src/migrations/release.0.33/api_set_context.sql b/database/src/migrations/release.0.34/api_set_context.sql similarity index 100% rename from database/src/migrations/release.0.33/api_set_context.sql rename to database/src/migrations/release.0.34/api_set_context.sql diff --git a/database/src/migrations/release.0.33/api_user_is_administrator.sql b/database/src/migrations/release.0.34/api_user_is_administrator.sql similarity index 100% rename from database/src/migrations/release.0.33/api_user_is_administrator.sql rename to database/src/migrations/release.0.34/api_user_is_administrator.sql diff --git a/database/src/migrations/release.0.33/api_xml_string_replace.sql b/database/src/migrations/release.0.34/api_xml_string_replace.sql similarity index 100% rename from database/src/migrations/release.0.33/api_xml_string_replace.sql rename to database/src/migrations/release.0.34/api_xml_string_replace.sql diff --git a/database/src/migrations/release.0.33/biohub.sql b/database/src/migrations/release.0.34/biohub.sql similarity index 99% rename from database/src/migrations/release.0.33/biohub.sql rename to database/src/migrations/release.0.34/biohub.sql index 774e9c0a72..a67c9f5259 100644 --- a/database/src/migrations/release.0.33/biohub.sql +++ b/database/src/migrations/release.0.34/biohub.sql @@ -2,7 +2,7 @@ -- ER/Studio Data Architect SQL Code Generation -- Project : BioHub.DM1 -- --- Date Created : Tuesday, October 12, 2021 13:51:48 +-- Date Created : Tuesday, October 19, 2021 11:05:37 -- Target DBMS : PostgreSQL 10.x-12.x -- @@ -679,6 +679,7 @@ CREATE TABLE occurrence( occurrence_submission_id integer NOT NULL, taxonid varchar(3000), lifestage varchar(3000), + sex varchar(3000), vernacularname varchar(3000), eventdate TIMESTAMPTZ NOT NULL, individualcount varchar(3000), @@ -706,6 +707,8 @@ COMMENT ON COLUMN occurrence.taxonid IS 'A string representation of the value pr ; COMMENT ON COLUMN occurrence.lifestage IS 'A string representation of the value provided for the given Darwin Core term.' ; +COMMENT ON COLUMN occurrence.sex IS 'A string representation of the value provided for the given Darwin Core term.' +; COMMENT ON COLUMN occurrence.vernacularname IS 'A string representation of the value provided for the given Darwin Core term.' ; COMMENT ON COLUMN occurrence.eventdate IS 'A datetime representation of the value provided for the given Darwin Core term.' @@ -3312,16 +3315,16 @@ CREATE INDEX "Ref185170" ON occurrence_data_package(data_package_id) CREATE INDEX "Ref169174" ON occurrence_data_package(occurrence_id) ; -- --- INDEX: "Ref153160" +-- INDEX: "Ref192188" -- -CREATE INDEX "Ref153160" ON occurrence_submission(survey_id) +CREATE INDEX "Ref192188" ON occurrence_submission(template_methodology_species_id) ; -- --- INDEX: "Ref192188" +-- INDEX: "Ref153160" -- -CREATE INDEX "Ref192188" ON occurrence_submission(template_methodology_species_id) +CREATE INDEX "Ref153160" ON occurrence_submission(survey_id) ; -- -- INDEX: occurrence_submission_data_package_uk1 @@ -3678,16 +3681,16 @@ CREATE UNIQUE INDEX summary_submission_message_type_nuk1 ON summary_submission_m CREATE INDEX "Ref215206" ON summary_submission_message_type(summary_submission_message_class_id) ; -- --- INDEX: "Ref45147" +-- INDEX: "Ref190190" -- -CREATE INDEX "Ref45147" ON survey(project_id) +CREATE INDEX "Ref190190" ON survey(common_survey_methodology_id) ; -- --- INDEX: "Ref190190" +-- INDEX: "Ref45147" -- -CREATE INDEX "Ref190190" ON survey(common_survey_methodology_id) +CREATE INDEX "Ref45147" ON survey(project_id) ; -- -- INDEX: "Ref153168" @@ -3971,16 +3974,16 @@ ALTER TABLE occurrence_data_package ADD CONSTRAINT "Refoccurrence174" -- TABLE: occurrence_submission -- -ALTER TABLE occurrence_submission ADD CONSTRAINT "Refsurvey160" - FOREIGN KEY (survey_id) - REFERENCES survey(survey_id) -; - ALTER TABLE occurrence_submission ADD CONSTRAINT "Reftemplate_methodology_species188" FOREIGN KEY (template_methodology_species_id) REFERENCES template_methodology_species(template_methodology_species_id) ; +ALTER TABLE occurrence_submission ADD CONSTRAINT "Refsurvey160" + FOREIGN KEY (survey_id) + REFERENCES survey(survey_id) +; + -- -- TABLE: occurrence_submission_data_package @@ -4266,16 +4269,16 @@ ALTER TABLE summary_submission_message_type ADD CONSTRAINT "Refsummary_submissio -- TABLE: survey -- -ALTER TABLE survey ADD CONSTRAINT "Refproject147" - FOREIGN KEY (project_id) - REFERENCES project(project_id) -; - ALTER TABLE survey ADD CONSTRAINT "Refcommon_survey_methodology190" FOREIGN KEY (common_survey_methodology_id) REFERENCES common_survey_methodology(common_survey_methodology_id) ; +ALTER TABLE survey ADD CONSTRAINT "Refproject147" + FOREIGN KEY (project_id) + REFERENCES project(project_id) +; + -- -- TABLE: survey_attachment diff --git a/database/src/migrations/release.0.33/create_spatial_extensions.psql b/database/src/migrations/release.0.34/create_spatial_extensions.psql similarity index 100% rename from database/src/migrations/release.0.33/create_spatial_extensions.psql rename to database/src/migrations/release.0.34/create_spatial_extensions.psql diff --git a/database/src/migrations/release.0.33/dapi_custom_views.sql b/database/src/migrations/release.0.34/dapi_custom_views.sql similarity index 100% rename from database/src/migrations/release.0.33/dapi_custom_views.sql rename to database/src/migrations/release.0.34/dapi_custom_views.sql diff --git a/database/src/migrations/release.0.33/db_setup_up.sql b/database/src/migrations/release.0.34/db_setup_up.sql similarity index 100% rename from database/src/migrations/release.0.33/db_setup_up.sql rename to database/src/migrations/release.0.34/db_setup_up.sql diff --git a/database/src/migrations/release.0.33/populate_activity.sql b/database/src/migrations/release.0.34/populate_activity.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_activity.sql rename to database/src/migrations/release.0.34/populate_activity.sql diff --git a/database/src/migrations/release.0.33/populate_administrative_activity_status_type.sql b/database/src/migrations/release.0.34/populate_administrative_activity_status_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_administrative_activity_status_type.sql rename to database/src/migrations/release.0.34/populate_administrative_activity_status_type.sql diff --git a/database/src/migrations/release.0.33/populate_administrative_activity_type.sql b/database/src/migrations/release.0.34/populate_administrative_activity_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_administrative_activity_type.sql rename to database/src/migrations/release.0.34/populate_administrative_activity_type.sql diff --git a/database/src/migrations/release.0.33/populate_climate_change_initiatives.sql b/database/src/migrations/release.0.34/populate_climate_change_initiatives.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_climate_change_initiatives.sql rename to database/src/migrations/release.0.34/populate_climate_change_initiatives.sql diff --git a/database/src/migrations/release.0.33/populate_common_survey_methodology.sql b/database/src/migrations/release.0.34/populate_common_survey_methodology.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_common_survey_methodology.sql rename to database/src/migrations/release.0.34/populate_common_survey_methodology.sql diff --git a/database/src/migrations/release.0.33/populate_first_nations.sql b/database/src/migrations/release.0.34/populate_first_nations.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_first_nations.sql rename to database/src/migrations/release.0.34/populate_first_nations.sql diff --git a/database/src/migrations/release.0.33/populate_funding_source.sql b/database/src/migrations/release.0.34/populate_funding_source.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_funding_source.sql rename to database/src/migrations/release.0.34/populate_funding_source.sql diff --git a/database/src/migrations/release.0.33/populate_investment_action_category.sql b/database/src/migrations/release.0.34/populate_investment_action_category.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_investment_action_category.sql rename to database/src/migrations/release.0.34/populate_investment_action_category.sql diff --git a/database/src/migrations/release.0.33/populate_iucn_classifications.sql b/database/src/migrations/release.0.34/populate_iucn_classifications.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_iucn_classifications.sql rename to database/src/migrations/release.0.34/populate_iucn_classifications.sql diff --git a/database/src/migrations/release.0.33/populate_management_action_type.sql b/database/src/migrations/release.0.34/populate_management_action_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_management_action_type.sql rename to database/src/migrations/release.0.34/populate_management_action_type.sql diff --git a/database/src/migrations/release.0.33/populate_project_role.sql b/database/src/migrations/release.0.34/populate_project_role.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_project_role.sql rename to database/src/migrations/release.0.34/populate_project_role.sql diff --git a/database/src/migrations/release.0.33/populate_project_type.sql b/database/src/migrations/release.0.34/populate_project_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_project_type.sql rename to database/src/migrations/release.0.34/populate_project_type.sql diff --git a/database/src/migrations/release.0.33/populate_proprietor_type.sql b/database/src/migrations/release.0.34/populate_proprietor_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_proprietor_type.sql rename to database/src/migrations/release.0.34/populate_proprietor_type.sql diff --git a/database/src/migrations/release.0.33/populate_submission_message_class.sql b/database/src/migrations/release.0.34/populate_submission_message_class.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_submission_message_class.sql rename to database/src/migrations/release.0.34/populate_submission_message_class.sql diff --git a/database/src/migrations/release.0.33/populate_submission_message_type.sql b/database/src/migrations/release.0.34/populate_submission_message_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_submission_message_type.sql rename to database/src/migrations/release.0.34/populate_submission_message_type.sql diff --git a/database/src/migrations/release.0.33/populate_submission_status_type.sql b/database/src/migrations/release.0.34/populate_submission_status_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_submission_status_type.sql rename to database/src/migrations/release.0.34/populate_submission_status_type.sql diff --git a/database/src/migrations/release.0.33/populate_summary_parameter_code.sql b/database/src/migrations/release.0.34/populate_summary_parameter_code.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_summary_parameter_code.sql rename to database/src/migrations/release.0.34/populate_summary_parameter_code.sql diff --git a/database/src/migrations/release.0.33/populate_summary_submission_message_class.sql b/database/src/migrations/release.0.34/populate_summary_submission_message_class.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_summary_submission_message_class.sql rename to database/src/migrations/release.0.34/populate_summary_submission_message_class.sql diff --git a/database/src/migrations/release.0.33/populate_summary_submission_message_type.sql b/database/src/migrations/release.0.34/populate_summary_submission_message_type.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_summary_submission_message_type.sql rename to database/src/migrations/release.0.34/populate_summary_submission_message_type.sql diff --git a/database/src/migrations/release.0.33/populate_system_constant.sql b/database/src/migrations/release.0.34/populate_system_constant.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_system_constant.sql rename to database/src/migrations/release.0.34/populate_system_constant.sql diff --git a/database/src/migrations/release.0.33/populate_system_metadata_constant.sql b/database/src/migrations/release.0.34/populate_system_metadata_constant.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_system_metadata_constant.sql rename to database/src/migrations/release.0.34/populate_system_metadata_constant.sql diff --git a/database/src/migrations/release.0.33/populate_system_role.sql b/database/src/migrations/release.0.34/populate_system_role.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_system_role.sql rename to database/src/migrations/release.0.34/populate_system_role.sql diff --git a/database/src/migrations/release.0.33/populate_template.sql b/database/src/migrations/release.0.34/populate_template.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_template.sql rename to database/src/migrations/release.0.34/populate_template.sql diff --git a/database/src/migrations/release.0.33/populate_template_methodology_species.sql b/database/src/migrations/release.0.34/populate_template_methodology_species.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_template_methodology_species.sql rename to database/src/migrations/release.0.34/populate_template_methodology_species.sql diff --git a/database/src/migrations/release.0.33/populate_user_identity_source.sql b/database/src/migrations/release.0.34/populate_user_identity_source.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_user_identity_source.sql rename to database/src/migrations/release.0.34/populate_user_identity_source.sql diff --git a/database/src/migrations/release.0.33/populate_wldtaxonomic_units.sql b/database/src/migrations/release.0.34/populate_wldtaxonomic_units.sql similarity index 100% rename from database/src/migrations/release.0.33/populate_wldtaxonomic_units.sql rename to database/src/migrations/release.0.34/populate_wldtaxonomic_units.sql diff --git a/database/src/migrations/release.0.33/project_audit_triggers.sql b/database/src/migrations/release.0.34/project_audit_triggers.sql similarity index 100% rename from database/src/migrations/release.0.33/project_audit_triggers.sql rename to database/src/migrations/release.0.34/project_audit_triggers.sql diff --git a/database/src/migrations/release.0.33/project_dapi_views.sql b/database/src/migrations/release.0.34/project_dapi_views.sql similarity index 100% rename from database/src/migrations/release.0.33/project_dapi_views.sql rename to database/src/migrations/release.0.34/project_dapi_views.sql diff --git a/database/src/migrations/release.0.33/project_journal_triggers.sql b/database/src/migrations/release.0.34/project_journal_triggers.sql similarity index 100% rename from database/src/migrations/release.0.33/project_journal_triggers.sql rename to database/src/migrations/release.0.34/project_journal_triggers.sql diff --git a/database/src/migrations/release.0.33/smoketest_release.sql b/database/src/migrations/release.0.34/smoketest_release.sql similarity index 98% rename from database/src/migrations/release.0.33/smoketest_release.sql rename to database/src/migrations/release.0.34/smoketest_release.sql index 012a0ed607..9fdeb3d45d 100644 --- a/database/src/migrations/release.0.33/smoketest_release.sql +++ b/database/src/migrations/release.0.34/smoketest_release.sql @@ -153,7 +153,7 @@ begin insert into occurrence_submission (survey_id, source, event_timestamp) values (_survey_id, 'BIOHUB BATCH', now()-interval '1 day') returning occurrence_submission_id into _occurrence_submission_id; select count(1) into _count from occurrence_submission; assert _count = 1, 'FAIL occurrence_submission'; - insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '10 day'); + insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate, sex) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '10 day', 'male'); select count(1) into _count from occurrence; assert _count = 1, 'FAIL occurrence'; insert into submission_status (occurrence_submission_id, submission_status_type_id, event_timestamp) values (_occurrence_submission_id, (select submission_status_type_id from submission_status_type where name = 'Submitted'), now()-interval '1 day') returning submission_status_id into _submission_status_id; @@ -166,7 +166,7 @@ begin insert into occurrence_submission (survey_id, source, event_timestamp) values (_survey_id, 'BIOHUB BATCH', now()) returning occurrence_submission_id into _occurrence_submission_id; select count(1) into _count from occurrence_submission; assert _count = 2, 'FAIL occurrence_submission'; - insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '5 day'); + insert into occurrence (occurrence_submission_id, taxonid, lifestage, eventdate, sex) values (_occurrence_submission_id, 'M-ALAL', 'Adult', now()-interval '5 day', 'female'); select count(1) into _count from occurrence; assert _count = 2, 'FAIL occurrence'; insert into submission_status (occurrence_submission_id, submission_status_type_id, event_timestamp) values (_occurrence_submission_id, (select submission_status_type_id from submission_status_type where name = 'Submitted'), now()) returning submission_status_id into _submission_status_id; diff --git a/database/src/migrations/release.0.33/tr_audit_trigger.sql b/database/src/migrations/release.0.34/tr_audit_trigger.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_audit_trigger.sql rename to database/src/migrations/release.0.34/tr_audit_trigger.sql diff --git a/database/src/migrations/release.0.33/tr_journal_trigger.sql b/database/src/migrations/release.0.34/tr_journal_trigger.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_journal_trigger.sql rename to database/src/migrations/release.0.34/tr_journal_trigger.sql diff --git a/database/src/migrations/release.0.33/tr_occurrence_submission.sql b/database/src/migrations/release.0.34/tr_occurrence_submission.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_occurrence_submission.sql rename to database/src/migrations/release.0.34/tr_occurrence_submission.sql diff --git a/database/src/migrations/release.0.33/tr_permit.sql b/database/src/migrations/release.0.34/tr_permit.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_permit.sql rename to database/src/migrations/release.0.34/tr_permit.sql diff --git a/database/src/migrations/release.0.33/tr_project.sql b/database/src/migrations/release.0.34/tr_project.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_project.sql rename to database/src/migrations/release.0.34/tr_project.sql diff --git a/database/src/migrations/release.0.33/tr_project_funding_source.sql b/database/src/migrations/release.0.34/tr_project_funding_source.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_project_funding_source.sql rename to database/src/migrations/release.0.34/tr_project_funding_source.sql diff --git a/database/src/migrations/release.0.33/tr_survey.sql b/database/src/migrations/release.0.34/tr_survey.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_survey.sql rename to database/src/migrations/release.0.34/tr_survey.sql diff --git a/database/src/migrations/release.0.33/tr_survey_proprietor.sql b/database/src/migrations/release.0.34/tr_survey_proprietor.sql similarity index 100% rename from database/src/migrations/release.0.33/tr_survey_proprietor.sql rename to database/src/migrations/release.0.34/tr_survey_proprietor.sql diff --git a/database/src/migrations/release.0.33/vw_survey_status.sql b/database/src/migrations/release.0.34/vw_survey_status.sql similarity index 100% rename from database/src/migrations/release.0.33/vw_survey_status.sql rename to database/src/migrations/release.0.34/vw_survey_status.sql