From b9300820ed38aed7bc090ffe04b283b15f93812b Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 2 Jun 2010 17:17:50 +0000 Subject: [PATCH] Avoid schema creation failure by ensuring metabib exists before referencing rule is created git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16558 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/sql/Pg/010.schema.biblio.sql | 3 --- Open-ILS/src/sql/Pg/800.fkeys.sql | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/sql/Pg/010.schema.biblio.sql b/Open-ILS/src/sql/Pg/010.schema.biblio.sql index 00c82af9aa..e55cecdca4 100644 --- a/Open-ILS/src/sql/Pg/010.schema.biblio.sql +++ b/Open-ILS/src/sql/Pg/010.schema.biblio.sql @@ -48,9 +48,6 @@ CREATE INDEX biblio_record_entry_edit_date_idx ON biblio.record_entry ( edit_dat CREATE INDEX biblio_record_entry_fp_idx ON biblio.record_entry ( fingerprint ); CREATE UNIQUE INDEX biblio_record_unique_tcn ON biblio.record_entry (tcn_value) WHERE deleted IS FALSE; -CREATE RULE protect_bib_rec_delete AS ON DELETE TO biblio.record_entry DO INSTEAD (UPDATE biblio.record_entry SET deleted = TRUE WHERE OLD.id = biblio.record_entry.id; DELETE FROM metabib.metarecord_source_map WHERE source = OLD.id); - - CREATE TABLE biblio.record_note ( id BIGSERIAL PRIMARY KEY, record BIGINT NOT NULL, diff --git a/Open-ILS/src/sql/Pg/800.fkeys.sql b/Open-ILS/src/sql/Pg/800.fkeys.sql index 7faa1ee36e..a92932281a 100644 --- a/Open-ILS/src/sql/Pg/800.fkeys.sql +++ b/Open-ILS/src/sql/Pg/800.fkeys.sql @@ -97,4 +97,6 @@ ALTER TABLE action.circulation ADD CONSTRAINT action_circulation_target_copy_fke ALTER TABLE config.billing_type ADD CONSTRAINT config_billing_type_owner_fkey FOREIGN KEY (owner) REFERENCES actor.org_unit (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED; +CREATE RULE protect_bib_rec_delete AS ON DELETE TO biblio.record_entry DO INSTEAD (UPDATE biblio.record_entry SET deleted = TRUE WHERE OLD.id = biblio.record_entry.id; DELETE FROM metabib.metarecord_source_map WHERE source = OLD.id); + COMMIT; -- 2.11.0