From 07434952becc2f8783b6182f59ccace5fa8ed51b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 22 Aug 2011 16:28:37 -0400 Subject: [PATCH] Link z39.50 use_perm column to perm_list.id ... instead of code, to take full advantage of AutoFieldWidget linking, at least until perm_list.id is replaced wholesale w/ perm_list.code. Signed-off-by: Bill Erickson --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/800.fkeys.sql | 2 ++ Open-ILS/src/sql/Pg/upgrade/XXXX.schema.czs_use_perm_column.sql | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 8498819fed..c3c6eafb46 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -441,7 +441,7 @@ CREATE TABLE config.z3950_source ( record_format TEXT NOT NULL DEFAULT 'FI', transmission_format TEXT NOT NULL DEFAULT 'usmarc', auth BOOL NOT NULL DEFAULT TRUE, - use_perm TEXT REFERENCES permission.perm_list (code) + use_perm INT -- REFERENCES permission.perm_list (id) ); COMMENT ON TABLE config.z3950_source IS $$ diff --git a/Open-ILS/src/sql/Pg/800.fkeys.sql b/Open-ILS/src/sql/Pg/800.fkeys.sql index 4395c6421c..3777df3c39 100644 --- a/Open-ILS/src/sql/Pg/800.fkeys.sql +++ b/Open-ILS/src/sql/Pg/800.fkeys.sql @@ -122,4 +122,6 @@ ALTER TABLE config.barcode_completion ADD CONSTRAINT config_barcode_completion_o CREATE INDEX by_heading_and_thesaurus ON authority.record_entry (authority.normalize_heading(marc)) WHERE deleted IS FALSE or deleted = FALSE; CREATE INDEX by_heading ON authority.record_entry (authority.simple_normalize_heading(marc)) WHERE deleted IS FALSE or deleted = FALSE; +ALTER TABLE config.z3950_source ADD CONSTRAINT use_perm_fkey FOREIGN KEY (use_perm) REFERENCES permission.perm_list (id) ON UPDATE CASCADE ON DELETE RESTRICT DEFERRABLE INITIALLY DEFERRED; + COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.czs_use_perm_column.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.czs_use_perm_column.sql index be4bf19bd7..db1f077d8a 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.czs_use_perm_column.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.czs_use_perm_column.sql @@ -10,8 +10,8 @@ BEGIN; -- check whether patch can be applied SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -ALTER TABLE config.z3950_source - ADD COLUMN use_perm TEXT REFERENCES permission.perm_list (code) +ALTER TABLE config.z3950_source + ADD COLUMN use_perm INT REFERENCES permission.perm_list (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED; COMMENT ON COLUMN config.z3950_source.use_perm IS $$ If set, this permission is required for the source to be listed in the staff -- 2.11.0