From 143f5175cd1bb6206c9a84b62513881b53c839db Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Wed, 25 Sep 2019 07:38:50 -0400 Subject: [PATCH] update DB upgrade scripts to accommodate what we have already applied --- .../Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql | 512 ++++++++++----------- .../Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql | 6 +- 2 files changed, 259 insertions(+), 259 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql index 47e69d75d1..b7aae84a09 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.2.5-3.3.0-upgrade-db.sql @@ -87,170 +87,170 @@ $func$ LANGUAGE PLPGSQL; SELECT evergreen.upgrade_deps_block_check('1139', :eg_version); -ALTER TABLE actor.usr ADD COLUMN guardian TEXT; - -CREATE INDEX actor_usr_guardian_idx - ON actor.usr (evergreen.lowercase(guardian)); -CREATE INDEX actor_usr_guardian_unaccent_idx - ON actor.usr (evergreen.unaccent_and_squash(guardian)); - --- Modify auditor tables accordingly. -SELECT auditor.update_auditors(); - --- clear the guardian field on delete -CREATE OR REPLACE FUNCTION actor.usr_delete( - src_usr IN INTEGER, - dest_usr IN INTEGER -) RETURNS VOID AS $$ -DECLARE - old_profile actor.usr.profile%type; - old_home_ou actor.usr.home_ou%type; - new_profile actor.usr.profile%type; - new_home_ou actor.usr.home_ou%type; - new_name text; - new_dob actor.usr.dob%type; -BEGIN - SELECT - id || '-PURGED-' || now(), - profile, - home_ou, - dob - INTO - new_name, - old_profile, - old_home_ou, - new_dob - FROM - actor.usr - WHERE - id = src_usr; - -- - -- Quit if no such user - -- - IF old_profile IS NULL THEN - RETURN; - END IF; - -- - perform actor.usr_purge_data( src_usr, dest_usr ); - -- - -- Find the root grp_tree and the root org_unit. This would be simpler if we - -- could assume that there is only one root. Theoretically, someday, maybe, - -- there could be multiple roots, so we take extra trouble to get the right ones. - -- - SELECT - id - INTO - new_profile - FROM - permission.grp_ancestors( old_profile ) - WHERE - parent is null; - -- - SELECT - id - INTO - new_home_ou - FROM - actor.org_unit_ancestors( old_home_ou ) - WHERE - parent_ou is null; - -- - -- Truncate date of birth - -- - IF new_dob IS NOT NULL THEN - new_dob := date_trunc( 'year', new_dob ); - END IF; - -- - UPDATE - actor.usr - SET - card = NULL, - profile = new_profile, - usrname = new_name, - email = NULL, - passwd = random()::text, - standing = DEFAULT, - ident_type = - ( - SELECT MIN( id ) - FROM config.identification_type - ), - ident_value = NULL, - ident_type2 = NULL, - ident_value2 = NULL, - net_access_level = DEFAULT, - photo_url = NULL, - prefix = NULL, - first_given_name = new_name, - guardian = NULL, - family_name = new_name, - suffix = NULL, - alias = NULL, - guardian = NULL, - day_phone = NULL, - evening_phone = NULL, - other_phone = NULL, - mailing_address = NULL, - billing_address = NULL, - home_ou = new_home_ou, - dob = new_dob, - active = FALSE, - master_account = DEFAULT, - super_user = DEFAULT, - barred = FALSE, - deleted = TRUE, - juvenile = DEFAULT, - usrgroup = 0, - claims_returned_count = DEFAULT, - credit_forward_balance = DEFAULT, - last_xact_id = DEFAULT, - alert_message = NULL, - create_date = now(), - expire_date = now() - WHERE - id = src_usr; -END; -$$ LANGUAGE plpgsql; - -INSERT into config.org_unit_setting_type (name, label, description, datatype) -VALUES ( - 'ui.patron.edit.au.guardian.show', - oils_i18n_gettext( - 'ui.patron.edit.au.guardian.show', - 'GUI: Show guardian field on patron registration', - 'coust', 'label' - ), - oils_i18n_gettext( - 'ui.patron.edit.au.guardian.show', - 'The guardian field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.', - 'coust', 'description' - ), - 'bool' -), ( - 'ui.patron.edit.au.guardian.suggest', - oils_i18n_gettext( - 'ui.patron.edit.au.guardian.suggest', - 'GUI: Suggest guardian field on patron registration', - 'coust', 'label' - ), - oils_i18n_gettext( - 'ui.patron.edit.au.guardian.suggest', - 'The guardian field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.', - 'coust', 'description'), - 'bool' -), ( - 'ui.patron.edit.guardian_required_for_juv', - oils_i18n_gettext( - 'ui.patron.edit.guardian_required_for_juv', - 'GUI: Juvenile account requires parent/guardian', - 'coust', 'label' - ), - oils_i18n_gettext( - 'ui.patron.edit.guardian_required_for_juv', - 'Require a value for the parent/guardian field in the patron editor for patrons marked as juvenile', - 'coust', 'description'), - 'bool' -); +--ALTER TABLE actor.usr ADD COLUMN guardian TEXT; +-- +--CREATE INDEX actor_usr_guardian_idx +-- ON actor.usr (evergreen.lowercase(guardian)); +--CREATE INDEX actor_usr_guardian_unaccent_idx +-- ON actor.usr (evergreen.unaccent_and_squash(guardian)); +-- +---- Modify auditor tables accordingly. +--SELECT auditor.update_auditors(); +-- +---- clear the guardian field on delete +--CREATE OR REPLACE FUNCTION actor.usr_delete( +-- src_usr IN INTEGER, +-- dest_usr IN INTEGER +--) RETURNS VOID AS $$ +--DECLARE +-- old_profile actor.usr.profile%type; +-- old_home_ou actor.usr.home_ou%type; +-- new_profile actor.usr.profile%type; +-- new_home_ou actor.usr.home_ou%type; +-- new_name text; +-- new_dob actor.usr.dob%type; +--BEGIN +-- SELECT +-- id || '-PURGED-' || now(), +-- profile, +-- home_ou, +-- dob +-- INTO +-- new_name, +-- old_profile, +-- old_home_ou, +-- new_dob +-- FROM +-- actor.usr +-- WHERE +-- id = src_usr; +-- -- +-- -- Quit if no such user +-- -- +-- IF old_profile IS NULL THEN +-- RETURN; +-- END IF; +-- -- +-- perform actor.usr_purge_data( src_usr, dest_usr ); +-- -- +-- -- Find the root grp_tree and the root org_unit. This would be simpler if we +-- -- could assume that there is only one root. Theoretically, someday, maybe, +-- -- there could be multiple roots, so we take extra trouble to get the right ones. +-- -- +-- SELECT +-- id +-- INTO +-- new_profile +-- FROM +-- permission.grp_ancestors( old_profile ) +-- WHERE +-- parent is null; +-- -- +-- SELECT +-- id +-- INTO +-- new_home_ou +-- FROM +-- actor.org_unit_ancestors( old_home_ou ) +-- WHERE +-- parent_ou is null; +-- -- +-- -- Truncate date of birth +-- -- +-- IF new_dob IS NOT NULL THEN +-- new_dob := date_trunc( 'year', new_dob ); +-- END IF; +-- -- +-- UPDATE +-- actor.usr +-- SET +-- card = NULL, +-- profile = new_profile, +-- usrname = new_name, +-- email = NULL, +-- passwd = random()::text, +-- standing = DEFAULT, +-- ident_type = +-- ( +-- SELECT MIN( id ) +-- FROM config.identification_type +-- ), +-- ident_value = NULL, +-- ident_type2 = NULL, +-- ident_value2 = NULL, +-- net_access_level = DEFAULT, +-- photo_url = NULL, +-- prefix = NULL, +-- first_given_name = new_name, +-- guardian = NULL, +-- family_name = new_name, +-- suffix = NULL, +-- alias = NULL, +-- guardian = NULL, +-- day_phone = NULL, +-- evening_phone = NULL, +-- other_phone = NULL, +-- mailing_address = NULL, +-- billing_address = NULL, +-- home_ou = new_home_ou, +-- dob = new_dob, +-- active = FALSE, +-- master_account = DEFAULT, +-- super_user = DEFAULT, +-- barred = FALSE, +-- deleted = TRUE, +-- juvenile = DEFAULT, +-- usrgroup = 0, +-- claims_returned_count = DEFAULT, +-- credit_forward_balance = DEFAULT, +-- last_xact_id = DEFAULT, +-- alert_message = NULL, +-- create_date = now(), +-- expire_date = now() +-- WHERE +-- id = src_usr; +--END; +--$$ LANGUAGE plpgsql; +-- +--INSERT into config.org_unit_setting_type (name, label, description, datatype) +--VALUES ( +-- 'ui.patron.edit.au.guardian.show', +-- oils_i18n_gettext( +-- 'ui.patron.edit.au.guardian.show', +-- 'GUI: Show guardian field on patron registration', +-- 'coust', 'label' +-- ), +-- oils_i18n_gettext( +-- 'ui.patron.edit.au.guardian.show', +-- 'The guardian field will be shown on the patron registration screen. Showing a field makes it appear with required fields even when not required. If the field is required this setting is ignored.', +-- 'coust', 'description' +-- ), +-- 'bool' +--), ( +-- 'ui.patron.edit.au.guardian.suggest', +-- oils_i18n_gettext( +-- 'ui.patron.edit.au.guardian.suggest', +-- 'GUI: Suggest guardian field on patron registration', +-- 'coust', 'label' +-- ), +-- oils_i18n_gettext( +-- 'ui.patron.edit.au.guardian.suggest', +-- 'The guardian field will be suggested on the patron registration screen. Suggesting a field makes it appear when suggested fields are shown. If the field is shown or required this setting is ignored.', +-- 'coust', 'description'), +-- 'bool' +--), ( +-- 'ui.patron.edit.guardian_required_for_juv', +-- oils_i18n_gettext( +-- 'ui.patron.edit.guardian_required_for_juv', +-- 'GUI: Juvenile account requires parent/guardian', +-- 'coust', 'label' +-- ), +-- oils_i18n_gettext( +-- 'ui.patron.edit.guardian_required_for_juv', +-- 'Require a value for the parent/guardian field in the patron editor for patrons marked as juvenile', +-- 'coust', 'description'), +-- 'bool' +--); @@ -1170,98 +1170,98 @@ VALUES ( -SELECT evergreen.upgrade_deps_block_check('1153', :eg_version); - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.left_label.left_margin' - ,'Item Print Label - Left Margin for Spine Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.left_label.left_margin' - ,'Set the default left margin for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.left_label.left_margin'; - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.right_label.left_margin' - ,'Item Print Label - Left Margin for Pocket Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.right_label.left_margin' - ,'Set the default left margin for the item print Pocket Label (or in other words, the desired space between the two labels). Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.right_label.left_margin'; - - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.left_label.height' - ,'Item Print Label - Height for Spine Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.left_label.height' - ,'Set the default height for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.left_label.height'; - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.left_label.width' - ,'Item Print Label - Width for Spine Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.left_label.width' - ,'Set the default width for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.left_label.width'; - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.right_label.height' - ,'Item Print Label - Height for Pocket Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.right_label.height' - ,'Set the default height for the item print Pocket Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.right_label.height'; - -UPDATE config.org_unit_setting_type -SET label = oils_i18n_gettext( - 'webstaff.cat.label.right_label.width' - ,'Item Print Label - Width for Pocket Label' - ,'coust' - ,'label' - ), - description = oils_i18n_gettext( - 'webstaff.cat.label.right_label.width' - ,'Set the default width for the item print Pocket Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' - ,'coust' - ,'description' - ) -WHERE NAME = 'webstaff.cat.label.right_label.width'; +--SELECT evergreen.upgrade_deps_block_check('1153', :eg_version); +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.left_margin' +-- ,'Item Print Label - Left Margin for Spine Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.left_margin' +-- ,'Set the default left margin for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.left_label.left_margin'; +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.left_margin' +-- ,'Item Print Label - Left Margin for Pocket Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.left_margin' +-- ,'Set the default left margin for the item print Pocket Label (or in other words, the desired space between the two labels). Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.right_label.left_margin'; +-- +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.height' +-- ,'Item Print Label - Height for Spine Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.height' +-- ,'Set the default height for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.left_label.height'; +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.width' +-- ,'Item Print Label - Width for Spine Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.left_label.width' +-- ,'Set the default width for the item print Spine Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.left_label.width'; +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.height' +-- ,'Item Print Label - Height for Pocket Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.height' +-- ,'Set the default height for the item print Pocket Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.right_label.height'; +-- +--UPDATE config.org_unit_setting_type +--SET label = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.width' +-- ,'Item Print Label - Width for Pocket Label' +-- ,'coust' +-- ,'label' +-- ), +-- description = oils_i18n_gettext( +-- 'webstaff.cat.label.right_label.width' +-- ,'Set the default width for the item print Pocket Label. Please include a unit of measurement that is valid CSS. For example, "1in" or "2.5cm"' +-- ,'coust' +-- ,'description' +-- ) +--WHERE NAME = 'webstaff.cat.label.right_label.width'; SELECT evergreen.upgrade_deps_block_check('1155', :eg_version); diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql index 68140cecfa..caf0e45ba2 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/3.3.0-3.3.1-upgrade-db.sql @@ -92,6 +92,6 @@ COMMIT; -- No transaction needed. This can be run on a live, production server. SELECT evergreen.upgrade_deps_block_check('1161', :eg_version); -- jboyer/stompro/gmcharlt -CREATE INDEX CONCURRENTLY atev_template_output ON action_trigger.event (template_output); -CREATE INDEX CONCURRENTLY atev_async_output ON action_trigger.event (async_output); -CREATE INDEX CONCURRENTLY atev_error_output ON action_trigger.event (error_output); +--CREATE INDEX CONCURRENTLY atev_template_output ON action_trigger.event (template_output); +--CREATE INDEX CONCURRENTLY atev_async_output ON action_trigger.event (async_output); +--CREATE INDEX CONCURRENTLY atev_error_output ON action_trigger.event (error_output); -- 2.11.0