From 0d14120a22e2a25b638469df3bf55c8f9eec9773 Mon Sep 17 00:00:00 2001 From: charlie garrett-jones Date: Wed, 5 May 2021 09:56:31 -0700 Subject: [PATCH] BHBC-1013 v3 - removed survey.is_FOIPA --- database/src/migrations/release.0.13/biohub.sql | 5 +---- database/src/migrations/release.0.13/smoketest_release.sql | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/database/src/migrations/release.0.13/biohub.sql b/database/src/migrations/release.0.13/biohub.sql index 23c5b52e7e..c35b75eca0 100644 --- a/database/src/migrations/release.0.13/biohub.sql +++ b/database/src/migrations/release.0.13/biohub.sql @@ -2,7 +2,7 @@ -- ER/Studio Data Architect SQL Code Generation -- Project : BioHub.DM1 -- --- Date Created : Tuesday, May 04, 2021 14:44:42 +-- Date Created : Wednesday, May 05, 2021 09:38:08 -- Target DBMS : PostgreSQL 10.x-12.x -- @@ -1419,7 +1419,6 @@ CREATE TABLE survey( start_date date NOT NULL, lead_first_name varchar(50) NOT NULL, lead_last_name varchar(50) NOT NULL, - is_foippa boolean NOT NULL, end_date date, location_description varchar(3000), location_name varchar(300) NOT NULL, @@ -1453,8 +1452,6 @@ COMMENT ON COLUMN survey.lead_first_name IS 'The first name of the person who is ; COMMENT ON COLUMN survey.lead_last_name IS 'The last name of the person who is the lead for the survey.' ; -COMMENT ON COLUMN survey.is_foippa IS 'Defines when Freedom of Information and Protection of Privacy Act (FOIPPA) Requirements are met. When set to TRUE then FOIPPA requirements are met.' -; COMMENT ON COLUMN survey.end_date IS 'The end date of the survey.' ; COMMENT ON COLUMN survey.location_description IS 'The location description.' diff --git a/database/src/migrations/release.0.13/smoketest_release.sql b/database/src/migrations/release.0.13/smoketest_release.sql index c8921728c6..cfe1a6a387 100644 --- a/database/src/migrations/release.0.13/smoketest_release.sql +++ b/database/src/migrations/release.0.13/smoketest_release.sql @@ -1,4 +1,4 @@ --- \i +-- smoketest_release.sql -- run as db super user \c biohub @@ -115,8 +115,8 @@ begin assert __count = 1, 'FAIL project_first_nation'; -- surveys - insert into survey (p_id, name, objectives, location_name, location_description, species, start_date, lead_first_name, lead_last_name, is_foippa, geometry) - values (__p_id, 'survey name', 'survey objectives', 'survey location name', 'survey location description', 'survey species', now(), 'lead first', 'lead last', true, ST_Transform(ST_GeomFromKML('-124.320874799971,48.9077923120772 -124.322396203914,48.9065111298094 -124.324678309828,48.905390095325 -124.327360785201,48.9057904647837 -124.32844178274,48.9074319795644 -124.328962263036,48.9093937899119 -124.32912241082,48.9102746027211 -124.326880341851,48.9101544918834 -124.32359731229,48.9088733096156 -124.320874799971,48.9077923120772'), 3005)) returning id into __s_id; + insert into survey (p_id, name, objectives, location_name, location_description, species, start_date, lead_first_name, lead_last_name, geometry) + values (__p_id, 'survey name', 'survey objectives', 'survey location name', 'survey location description', 'survey species', now(), 'lead first', 'lead last', ST_Transform(ST_GeomFromKML('-124.320874799971,48.9077923120772 -124.322396203914,48.9065111298094 -124.324678309828,48.905390095325 -124.327360785201,48.9057904647837 -124.32844178274,48.9074319795644 -124.328962263036,48.9093937899119 -124.32912241082,48.9102746027211 -124.326880341851,48.9101544918834 -124.32359731229,48.9088733096156 -124.320874799971,48.9077923120772'), 3005)) returning id into __s_id; select count(1) into __count from survey; assert __count = 1, 'FAIL survey'; insert into survey_proprietor (s_id, fn_id, prt_id, rationale,disa_required)