Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BHBC-1342_V3 #530

Merged
merged 17 commits into from
Sep 21, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cedc2b6
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
Sep 1, 2021
d3f3a50
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
Sep 2, 2021
80cb69b
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
Sep 2, 2021
fddcb24
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 3, 2021
ec3c747
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 8, 2021
957bd09
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 14, 2021
521c808
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 15, 2021
3dc913c
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 16, 2021
945b7ee
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 17, 2021
d3e4cbd
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 20, 2021
e0fcd4e
Merge branch 'dev' of https://github.com/bcgov/biohubbc into dev
cgarrettjones Sep 21, 2021
6821bab
BHBC-1343_V2
cgarrettjones Sep 21, 2021
9458677
BHBC-1343_V2
cgarrettjones Sep 21, 2021
c3b9e74
Merge branch 'BHBC-1342_V3' of https://github.com/bcgov/biohubbc into…
cgarrettjones Sep 21, 2021
bec342e
Merge branch 'BHBC-1342_V3' of https://github.com/bcgov/biohubbc into…
cgarrettjones Sep 21, 2021
b871553
Merge branch 'BHBC-1342_V3' of https://github.com/bcgov/biohubbc into…
cgarrettjones Sep 21, 2021
c30f0f6
Merge branch 'dev' into BHBC-1342_V3
anissa-agahchen Sep 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions database/src/migrations/20210225205948_biohub_release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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.26';
const DB_RELEASE = 'release.0.28';

/**
* Apply biohub release changes.
Expand Down Expand Up @@ -95,9 +95,6 @@ export async function up(knex: Knex): Promise<void> {
path.join(__dirname, DB_RELEASE, 'populate_common_survey_methodology.sql')
);
const populate_template = fs.readFileSync(path.join(__dirname, DB_RELEASE, 'populate_template.sql'));
const populate_summary_parameter_method_code = fs.readFileSync(
path.join(__dirname, DB_RELEASE, 'populate_summary_parameter_method_code.sql')
);
const populate_summary_parameter_code = fs.readFileSync(
path.join(__dirname, DB_RELEASE, 'populate_summary_parameter_code.sql')
);
Expand Down Expand Up @@ -188,7 +185,6 @@ export async function up(knex: Knex): Promise<void> {
${populate_system_metadata_constant}
${populate_common_survey_methodology}
${populate_template}
${populate_summary_parameter_method_code}
${populate_summary_parameter_code}

-- temporary external interface tables
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ declare
delete from project_funding_source where project_id = p_project_id;
delete from project_iucn_action_classification where project_id = p_project_id;
delete from project_attachment where project_id = p_project_id;
delete from author where project_report_attachment_id in (select project_report_attachment_id from project_report_attachment where project_id = p_project_id);
delete from project_report_attachment where project_id = p_project_id;
delete from project_first_nation where project_id = p_project_id;
delete from project_participation where project_id = p_project_id;
delete from project where project_id = p_project_id;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ $$
-- 2021-06-18 initial release
-- [email protected]
-- 2021-06-21 added occurrence submission delete
-- [email protected]
-- 2021-09-21 added survey summary submission delete
-- *******************************************************************
declare
_occurrence_submission_id occurrence_submission.occurrence_submission_id%type;
Expand All @@ -25,8 +27,8 @@ begin
call api_delete_occurrence_submission(_occurrence_submission_id);
end loop;

delete from survey_summary_detail where survey_summary_general_id in (select survey_summary_general_id from survey_summary_general where survey_id = p_survey_id);
delete from survey_summary_general where survey_id = p_survey_id;
delete from survey_summary_detail where survey_summary_submission_id in (select survey_summary_submission_id from survey_summary_submission where survey_id = p_survey_id);
delete from survey_summary_submission where survey_id = p_survey_id;
delete from survey_proprietor where survey_id = p_survey_id;
delete from survey_attachment where survey_id = p_survey_id;
delete from study_species where survey_id = p_survey_id;
Expand Down
Loading