From 015250ca4b48100d7610519af2f96785d1c58d5b Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Tue, 7 Feb 2017 09:29:58 -0500 Subject: [PATCH] LP#1661346 - trim quotes from setting value Signed-off-by: Chris Sharp --- Open-ILS/src/sql/Pg/reporter-schema.sql | 8 ++++---- Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql index 528efc31b7..a1784760d8 100644 --- a/Open-ILS/src/sql/Pg/reporter-schema.sql +++ b/Open-ILS/src/sql/Pg/reporter-schema.sql @@ -391,7 +391,7 @@ CREATE OR REPLACE VIEW reporter.currently_running AS WHERE s.start_time IS NOT NULL AND s.complete_time IS NULL; CREATE OR REPLACE VIEW reporter.user_setting_type_view AS - SELECT usr.id as usr_id, +SELECT usr.id as usr_id, (SELECT value FROM actor.usr_setting WHERE name = 'opac.default_phone' @@ -399,7 +399,7 @@ CREATE OR REPLACE VIEW reporter.user_setting_type_view AS (SELECT name FROM config.sms_carrier WHERE id::text IN ( - SELECT value + SELECT trim(both '"''' from value) FROM actor.usr_setting WHERE name = 'opac.default_sms_carrier' AND usr = usr.id)) AS default_sms_carrier, @@ -410,11 +410,11 @@ CREATE OR REPLACE VIEW reporter.user_setting_type_view AS (SELECT shortname FROM actor.org_unit WHERE id::text IN ( - SELECT value + SELECT trim(both '"''' from value) FROM actor.usr_setting WHERE name = 'opac.default_pickup_location' AND usr = usr.id)) AS default_pickup_location - FROM actor.usr usr; +FROM actor.usr usr; COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql index c84662b054..257aebd794 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.usr_setting_type_view.sql @@ -9,7 +9,7 @@ SELECT usr.id as usr_id, (SELECT name FROM config.sms_carrier WHERE id::text IN ( - SELECT value + SELECT trim(both '"''' from value) FROM actor.usr_setting WHERE name = 'opac.default_sms_carrier' AND usr = usr.id)) AS default_sms_carrier, @@ -20,7 +20,7 @@ SELECT usr.id as usr_id, (SELECT shortname FROM actor.org_unit WHERE id::text IN ( - SELECT value + SELECT trim(both '"''' from value) FROM actor.usr_setting WHERE name = 'opac.default_pickup_location' AND usr = usr.id)) AS default_pickup_location -- 2.11.0