LP#1661346 - trim quotes from setting value

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>

diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql
index 0477fca..6013088 100644 (file)
--- a/Open-ILS/src/sql/Pg/reporter-schema.sql
+++ b/Open-ILS/src/sql/Pg/reporter-schema.sql
@@ -379,7 +379,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'
@@ -387,7 +387,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,
@@ -398,11 +398,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 c84662b..257aebd 100644 (file)
--- 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