[open-ils-commits] [GIT] Evergreen ILS branch master updated. 40b5853bd226041d991c0c356db2e6d016bf2410

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  40b5853bd226041d991c0c356db2e6d016bf2410 (commit)
       via  d3b93e455bdd22738aae8aa3091b9faa0c7109dc (commit)
      from  6631e78645e9027c5dcda72e2adeee59556aee98 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40b5853bd226041d991c0c356db2e6d016bf2410
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Wed Sep 4 11:11:43 2019 -0700

    LP1832897 and LP1721036: stamping upgrade scripts
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8afa76e79f..12db6e1c8b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1173', :eg_version); -- berick/khuckins/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1175', :eg_version); -- gmcharlt/berick/miker/sandbergja
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1174.schema.asset.copy_tag.url.sql b/Open-ILS/src/sql/Pg/upgrade/1174.schema.asset.copy_tag.url.sql
new file mode 100644
index 0000000000..700d355c43
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1174.schema.asset.copy_tag.url.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1174', :eg_version);
+
+ALTER TABLE asset.copy_tag
+          ADD COLUMN url TEXT;
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.carousels.sql b/Open-ILS/src/sql/Pg/upgrade/1175.schema.carousels.sql
similarity index 97%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.carousels.sql
rename to Open-ILS/src/sql/Pg/upgrade/1175.schema.carousels.sql
index 9dd366952e..5ea5acf4ff 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.carousels.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1175.schema.carousels.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1175', :eg_version);
 
 CREATE TABLE config.carousel_type (
     id                          SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset.copy_tag.url.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset.copy_tag.url.sql
deleted file mode 100644
index b7b26ceb09..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset.copy_tag.url.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-BEGIN;
-
---INSERT INTO config.upgrade_log (version, applied_to) VALUES ('XXXX', :eg_version);
-
-ALTER TABLE asset.copy_tag
-          ADD COLUMN url TEXT;
-
-COMMIT;

commit d3b93e455bdd22738aae8aa3091b9faa0c7109dc
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Wed Sep 4 10:57:32 2019 -0700

    LP1832897 (follow-up): Fixing oils_i18n_gettext key
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

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 2627a08eb5..f2c6e85de2 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -5658,7 +5658,7 @@ INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('book
 INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('reading_list', oils_i18n_gettext('reading_list', 'Reading List', 'cbrebt', 'label'));
 INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('template_merge',oils_i18n_gettext('template_merge','Template Merge Container', 'cbrebt', 'label'));
 INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('url_verify', oils_i18n_gettext('url_verify', 'URL Verification Queue', 'cbrebt', 'label'));
-INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('carousel', oils_i18n_gettext('url_verify', 'Carousel', 'cbrebt', 'label'));
+INSERT INTO container.biblio_record_entry_bucket_type (code,label) VALUES ('carousel', oils_i18n_gettext('carousel', 'Carousel', 'cbrebt', 'label'));
 
 INSERT INTO container.user_bucket_type (code,label) VALUES ('misc', oils_i18n_gettext('misc', 'Miscellaneous', 'cubt', 'label'));
 INSERT INTO container.user_bucket_type (code,label) VALUES ('folks', oils_i18n_gettext('folks', 'Friends', 'cubt', 'label'));

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql                         | 2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql                      | 2 +-
 Open-ILS/src/sql/Pg/upgrade/1174.schema.asset.copy_tag.url.sql    | 8 ++++++++
 .../{XXXX.schema.carousels.sql => 1175.schema.carousels.sql}      | 2 +-
 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset.copy_tag.url.sql    | 8 --------
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1174.schema.asset.copy_tag.url.sql
 rename Open-ILS/src/sql/Pg/upgrade/{XXXX.schema.carousels.sql => 1175.schema.carousels.sql} (97%)
 delete mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset.copy_tag.url.sql


hooks/post-receive
-- 
Evergreen ILS