LP#1666933: fix to point schema update scripts

- remove a duplicate call to metabib.remap_metarecord_for_bib()
- ensure that the 'ebook_api' config.settings_group row is added
  before adding YAOUS types that depend on it

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

diff --git a/Open-ILS/src/sql/Pg/upgrade/1017.schema.update_fingerprinting.sql b/Open-ILS/src/sql/Pg/upgrade/1017.schema.update_fingerprinting.sql
index ad4fc47..aa36a3a 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/1017.schema.update_fingerprinting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1017.schema.update_fingerprinting.sql
@@ -76,10 +76,6 @@ ALTER TABLE biblio.record_entry DISABLE TRIGGER USER;
 UPDATE biblio.record_entry SET fingerprint = biblio.extract_fingerprint(marc) WHERE NOT deleted;
 ALTER TABLE biblio.record_entry ENABLE TRIGGER USER;
 
-SELECT metabib.remap_metarecord_for_bib(id, fingerprint)
-FROM biblio.record_entry
-WHERE NOT deleted;
-
 \qecho Remapping metarecords
 SELECT metabib.remap_metarecord_for_bib(id, fingerprint)
 FROM biblio.record_entry

diff --git a/Open-ILS/src/sql/Pg/upgrade/1027.data.org-setting.ebook-api-oneclickdigital.sql b/Open-ILS/src/sql/Pg/upgrade/1027.data.org-setting.ebook-api-oneclickdigital.sql
index ebe9b26..92a1df8 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/1027.data.org-setting.ebook-api-oneclickdigital.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1027.data.org-setting.ebook-api-oneclickdigital.sql
@@ -2,6 +2,9 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('1027', :eg_version);
 
+INSERT INTO config.settings_group (name, label)
+    VALUES ('ebook_api', 'Ebook API Integration');
+
 INSERT INTO config.org_unit_setting_type
     (name, label, description, grp, datatype) 
 VALUES (

diff --git a/Open-ILS/src/sql/Pg/upgrade/1028.data.org-setting.ebook-api-overdrive.sql b/Open-ILS/src/sql/Pg/upgrade/1028.data.org-setting.ebook-api-overdrive.sql
index 17778b2..2878bc2 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/1028.data.org-setting.ebook-api-overdrive.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1028.data.org-setting.ebook-api-overdrive.sql
@@ -2,9 +2,6 @@ BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('1028', :eg_version);
 
-INSERT INTO config.settings_group (name, label)
-    VALUES ('ebook_api', 'Ebook API Integration');
-
 INSERT INTO config.org_unit_setting_type
     (name, label, description, grp, datatype) 
 VALUES (