From e9f5a82c1eb3ad2d5ec8f72382f27bd6e18c8e5b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 22 May 2019 20:14:34 +0000 Subject: [PATCH] JBAS-2285 Move auth check into 3.2 schema file Signed-off-by: Bill Erickson --- .../schema/deploy/2.12-3.2-db-upgrade-schema.sql | 31 +++++++++++++++++++++ KCLS/sql/schema/deploy/3.2-additions.sql | 32 ---------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql index de5d11e158..ce65b11daa 100644 --- a/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql +++ b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql @@ -6853,6 +6853,37 @@ BEGIN END; $f$ LANGUAGE PLPGSQL STABLE ROWS 1; +CREATE OR REPLACE FUNCTION + metabib.browse_authority_is_unauthorized (mbe_id BIGINT, field_class TEXT) + RETURNS TABLE (auth_tag CHARACTER(3), atag INTEGER, record BIGINT) AS +$$ + SELECT metabib.browse_authority_is_unauthorized( + mbe_id, (SELECT ARRAY_AGG(id) + FROM config.metabib_field WHERE field_class = $2) + ); +$$ LANGUAGE SQL; + +CREATE OR REPLACE FUNCTION + metabib.browse_authority_is_unauthorized (mbe_id BIGINT, fields INTEGER[]) + RETURNS TABLE (auth_tag CHARACTER(3), atag INTEGER, record BIGINT) AS +$$ + SELECT + acsaf.tag AS auth_tag, + ash.atag AS atag, + ash.record AS auth_record + FROM metabib.browse_entry_simple_heading_map mbeshm + JOIN authority.simple_heading ash ON (mbeshm.simple_heading = ash.id) + JOIN authority.control_set_authority_field acsaf + ON (acsaf.id = ash.atag AND acsaf.tag LIKE '4__') + JOIN authority.control_set_auth_field_metabib_field_map_refs refs_map + ON (acsaf.id = refs_map.authority_field) + JOIN config.metabib_field cmf ON + (cmf.id = refs_map.metabib_field AND cmf.id = ANY($2)) + WHERE mbeshm.entry = $1 + LIMIT 1 +$$ LANGUAGE SQL; + + --INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.0.4', :eg_version); --SELECT evergreen.upgrade_deps_block_check('1088', :eg_version); diff --git a/KCLS/sql/schema/deploy/3.2-additions.sql b/KCLS/sql/schema/deploy/3.2-additions.sql index 1138c5ad8b..6756ec07ae 100644 --- a/KCLS/sql/schema/deploy/3.2-additions.sql +++ b/KCLS/sql/schema/deploy/3.2-additions.sql @@ -174,38 +174,6 @@ BEGIN END IF; -- insert_on_deploy END $INSERT$; --- returns -CREATE OR REPLACE FUNCTION - metabib.browse_authority_is_unauthorized (mbe_id BIGINT, field_class TEXT) - RETURNS TABLE (auth_tag CHARACTER(3), atag INTEGER, record BIGINT) AS -$$ - SELECT metabib.browse_authority_is_unauthorized( - mbe_id, (SELECT ARRAY_AGG(id) - FROM config.metabib_field WHERE field_class = $2) - ); -$$ LANGUAGE SQL; - -CREATE OR REPLACE FUNCTION - metabib.browse_authority_is_unauthorized (mbe_id BIGINT, fields INTEGER[]) - RETURNS TABLE (auth_tag CHARACTER(3), atag INTEGER, record BIGINT) AS -$$ - SELECT - acsaf.tag AS auth_tag, - ash.atag AS atag, - ash.record AS auth_record - FROM metabib.browse_entry_simple_heading_map mbeshm - JOIN authority.simple_heading ash ON (mbeshm.simple_heading = ash.id) - JOIN authority.control_set_authority_field acsaf - ON (acsaf.id = ash.atag AND acsaf.tag LIKE '4__') - JOIN authority.control_set_auth_field_metabib_field_map_refs refs_map - ON (acsaf.id = refs_map.authority_field) - JOIN config.metabib_field cmf ON - (cmf.id = refs_map.metabib_field AND cmf.id = ANY($2)) - WHERE mbeshm.entry = $1 - LIMIT 1 -$$ LANGUAGE SQL; - - -- BACK-PORTING https://bugs.launchpad.net/evergreen/+bug/1811689 -- which is not yet merged to master, but needed for 3.2 upgrade. CREATE OR REPLACE FUNCTION reporter.enable_materialized_simple_record_trigger () RETURNS VOID AS $$ -- 2.11.0