LP#1772680: sort out seed data and upgrade for new RBdigital YAOUS

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index d44c5d9..e0bd23a 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -19485,7 +19485,57 @@ VALUES (
     )
 );
 
-
+INSERT INTO config.org_unit_setting_type
+    (name, label, description, grp, datatype) 
+VALUES (
+    'ebook_api.rbdigital.base_uri',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'RBDigital Base URI',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'Base URI for RBDigital API (defaults to https://api.rbdigital.com/v1). Using HTTPS here is strongly encouraged.',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.library_id',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'RBDigital Library ID',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'Identifier assigned to this library by RBDigital',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.basic_token',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'RBDigital Basic Token',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'Basic token for client authentication with RBDigital API (supplied by RBDigital)',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+);
 
 INSERT into config.org_unit_setting_type (name, label, description, datatype) 
 VALUES ( 

diff --git a/Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql b/Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql
deleted file mode 100644 (file)
index fab2dc9..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/1030.data.org-setting.ebook-api-rbdigital.sql
+++ /dev/null
@@ -1,63 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('1030', :eg_version);
-
-INSERT INTO config.org_unit_setting_type
-    (name, label, description, grp, datatype) 
-VALUES (
-    'ebook_api.rbdigital.base_uri',
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.base_uri',
-        'RBDigital Base URI',
-        'coust',
-        'label'
-    ),
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.base_uri',
-        'Base URI for RBDigital API (defaults to https://api.rbdigital.com/v1). Using HTTPS here is strongly encouraged.',
-        'coust',
-        'description'
-    ),
-    'ebook_api',
-    'string'
-),(
-    'ebook_api.rbdigital.library_id',
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.library_id',
-        'RBDigital Library ID',
-        'coust',
-        'label'
-    ),
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.library_id',
-        'Identifier assigned to this library by RBDigital',
-        'coust',
-        'description'
-    ),
-    'ebook_api',
-    'string'
-),(
-    'ebook_api.rbdigital.basic_token',
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.basic_token',
-        'RBDigital Basic Token',
-        'coust',
-        'label'
-    ),
-    oils_i18n_gettext(
-        'ebook_api.rbdigital.basic_token',
-        'Basic token for client authentication with RBDigital API (supplied by RBDigital)',
-        'coust',
-        'description'
-    ),
-    'ebook_api',
-    'string'
-);
-
-INSERT INTO actor.org_unit_setting (org_unit, name, value) 
-               VALUES  
-        (1, 'ebook_api.rbdigital.base_uri', '"api.rbdigital.com"'),
-        (1, 'ebook_api.rbdigital.basic_token', '"BF8DD41C-B286-4F60-9FF5-F4C5B3E57A11"'),
-        (1, 'ebook_api.rbdigital.library_id', '"3925"');
-COMMIT;
-

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql
new file mode 100644 (file)
index 0000000..4e525f3
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-setting.ebook-api-rbdigital.sql
@@ -0,0 +1,58 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.org_unit_setting_type
+    (name, label, description, grp, datatype) 
+VALUES (
+    'ebook_api.rbdigital.base_uri',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'RBDigital Base URI',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.base_uri',
+        'Base URI for RBDigital API (defaults to https://api.rbdigital.com/v1). Using HTTPS here is strongly encouraged.',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.library_id',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'RBDigital Library ID',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.library_id',
+        'Identifier assigned to this library by RBDigital',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+),(
+    'ebook_api.rbdigital.basic_token',
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'RBDigital Basic Token',
+        'coust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ebook_api.rbdigital.basic_token',
+        'Basic token for client authentication with RBDigital API (supplied by RBDigital)',
+        'coust',
+        'description'
+    ),
+    'ebook_api',
+    'string'
+);
+
+COMMIT;
+