From 2f82fd8bbe0f4eb129410a576e70be4defd62d21 Mon Sep 17 00:00:00 2001 From: atz Date: Mon, 2 Aug 2010 19:16:02 +0000 Subject: [PATCH] 0356 fixup - the updates otherwise failed for syntax or dependent constraints git-svn-id: svn://svn.open-ils.org/ILS/trunk@17063 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/015.schema.staging.sql | 2 +- Open-ILS/src/sql/Pg/080.schema.money.sql | 2 +- .../upgrade/0356.schema.missing-pkey-constraints.sql | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/sql/Pg/015.schema.staging.sql b/Open-ILS/src/sql/Pg/015.schema.staging.sql index f85b56d93b..893650d10a 100644 --- a/Open-ILS/src/sql/Pg/015.schema.staging.sql +++ b/Open-ILS/src/sql/Pg/015.schema.staging.sql @@ -47,7 +47,7 @@ CREATE TABLE staging.billing_address_stage ( LIKE staging.mailing_address_stage INCLUDING DEFAULTS ); -ALTER TABLE staging.billing_address_stage ADD CONSTRAINT PRIMARY KEY (row_id); +ALTER TABLE staging.billing_address_stage ADD PRIMARY KEY (row_id); CREATE TABLE staging.statcat_stage ( row_id BIGSERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/080.schema.money.sql b/Open-ILS/src/sql/Pg/080.schema.money.sql index 9dcf8ef787..e227a18da3 100644 --- a/Open-ILS/src/sql/Pg/080.schema.money.sql +++ b/Open-ILS/src/sql/Pg/080.schema.money.sql @@ -259,7 +259,7 @@ CREATE TABLE money.materialized_billable_xact_summary AS CREATE OR REPLACE VIEW money.billable_xact_summary AS SELECT * FROM money.materialized_billable_xact_summary; -ALTER TABLE money.materialized_billable_xact_summary ADD CONSTRAINT PRIMARY KEY (id); +ALTER TABLE money.materialized_billable_xact_summary ADD PRIMARY KEY (id); CREATE INDEX money_mat_summary_usr_idx ON money.materialized_billable_xact_summary (usr); CREATE INDEX money_mat_summary_xact_start_idx ON money.materialized_billable_xact_summary (xact_start); diff --git a/Open-ILS/src/sql/Pg/upgrade/0356.schema.missing-pkey-constraints.sql b/Open-ILS/src/sql/Pg/upgrade/0356.schema.missing-pkey-constraints.sql index e1e53ca187..e79680d806 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0356.schema.missing-pkey-constraints.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0356.schema.missing-pkey-constraints.sql @@ -2,13 +2,17 @@ BEGIN; INSERT INTO config.upgrade_log (version) VALUES ('0356'); -- miker -ALTER TABLE acq.edi_account DROP CONSTRAINT acq_edi_account_id_unique; -ALTER TABLE acq.edi_account ADD CONSTRAINT PRIMARY KEY (id); +ALTER TABLE acq.edi_account ADD PRIMARY KEY (id); +ALTER TABLE acq.edi_account DROP CONSTRAINT acq_edi_account_id_unique CASCADE; + +-- Now rebuild the constraints dropped via cascade. +ALTER TABLE acq.provider ADD CONSTRAINT provider_edi_default_fkey FOREIGN KEY (edi_default) REFERENCES acq.edi_account (id) DEFERRABLE INITIALLY DEFERRED; +ALTER TABLE acq.edi_message ADD CONSTRAINT edi_message_account_fkey FOREIGN KEY (account ) REFERENCES acq.edi_account (id) DEFERRABLE INITIALLY DEFERRED; DROP INDEX money.money_mat_summary_id_idx; -ALTER TABLE money.materialized_billable_xact_summary ADD CONSTRAINT PRIMARY KEY (id); +ALTER TABLE money.materialized_billable_xact_summary ADD PRIMARY KEY (id); -ALTER TABLE staging.billing_address_stage ADD CONSTRAINT PRIMARY KEY (row_id); +ALTER TABLE staging.billing_address_stage ADD PRIMARY KEY (row_id); COMMIT; -- 2.43.2