From ccf3bc90a1eb30b106a6f78ba5e2a37e1ee8fe31 Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Mon, 14 Jan 2019 10:35:33 -0500 Subject: [PATCH] switch around order, update already existing setting --- .../src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql index 09367d0734..b0dcb59198 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-post-3.2-upgrade.sql @@ -451,9 +451,8 @@ TRUE ) ; - --- move parent/guardian field data to new field -UPDATE actor.usr SET guardian = ident_value2, ident_value2 = NULL WHERE NOT deleted AND ident_value2 IS NOT NULL AND ident_value2 <> ''; +-- allow multiple email addresses to be entered in patron reg form +UPDATE actor.org_unit_setting SET value = '"[^@<> ]+@[^@<> ]+\\.[^@.*<> ]{2,}"' WHERE name = 'ui.patron.edit.au.email.regex' and org_unit = 1; -- settings INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES @@ -463,8 +462,6 @@ INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES (1, 'ui.patron.edit.guardian_required_for_juv', 'true'), (1, 'ui.patron.edit.au.guardian.show', 'true'), (1, 'ui.patron.edit.au.guardian.suggest', 'true'), --- allow multiple email addresses to be entered in patron reg form -(1, 'ui.patron.edit.au.email.regex', '"[^@<> ]+@[^@<> ]+\\.[^@.*<> ]{2,}"'), -- date formatting for web client (1, 'webstaff.format.dates', '"MM/dd/yyyy"'), (1, 'webstaff.format.date_and_time', '"MM/dd/yyyy HH:mm"'), @@ -472,4 +469,8 @@ INSERT INTO actor.org_unit_setting (org_unit, name, value) VALUES (1, 'opac.email_record.allow_without_login', 'true') ; +-- move parent/guardian field data to new field +UPDATE actor.usr SET guardian = ident_value2, ident_value2 = NULL WHERE NOT deleted AND ident_value2 IS NOT NULL AND ident_value2 <> ''; + + COMMIT; -- 2.11.0