diff --git a/OConnor/resources/schemas/dbscripts/postgresql/oconnor-drop.sql b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-drop.sql index 9dfe4d9c..f138dcd2 100644 --- a/OConnor/resources/schemas/dbscripts/postgresql/oconnor-drop.sql +++ b/OConnor/resources/schemas/dbscripts/postgresql/oconnor-drop.sql @@ -9,6 +9,6 @@ -- NOTE: Don't remove any of these drop statements, even if we stop re-creating the view in *-create.sql. Drop statements must -- remain in place so we can correctly upgrade from older versions, which we commit to for two years after each release. -SELECT core.fn_dropifexists('max_virus_challenge_date', 'oconnor', 'VIEW', NULL); -SELECT core.fn_dropifexists('active_quotes', 'oconnor', 'VIEW', NULL); -SELECT core.fn_dropifexists('active_grants', 'oconnor', 'VIEW', NULL); +DROP VIEW IF EXISTS oconnor.max_virus_challenge_date; +DROP VIEW IF EXISTS oconnor.active_quotes; +DROP VIEW IF EXISTS oconnor.active_grants; diff --git a/OConnorExperiments/resources/schemas/dbscripts/postgresql/oconnorexperiments-0.00-14.30.sql b/OConnorExperiments/resources/schemas/dbscripts/postgresql/oconnorexperiments-0.00-14.30.sql index e31a23ab..3417f5f6 100644 --- a/OConnorExperiments/resources/schemas/dbscripts/postgresql/oconnorexperiments-0.00-14.30.sql +++ b/OConnorExperiments/resources/schemas/dbscripts/postgresql/oconnorexperiments-0.00-14.30.sql @@ -46,7 +46,7 @@ CREATE TABLE OConnorExperiments.ParentExperiments /* oconnorexperiments-13.10-13.20.sql */ -- drop ParentExperiments.Container FK to allow bulk folder delete -SELECT core.fn_dropifexists('ParentExperiments', 'OConnorExperiments', 'constraint', 'FK_ParentExperiments_Container'); +ALTER TABLE OConnorExperiments.ParentExperiments DROP CONSTRAINT IF EXISTS FK_ParentExperiments_Container; /* oconnorexperiments-13.20-13.30.sql */