[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 6a89835cdb2fcb2e5dee43ea9058b0a0cf8e5643

[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, rel_3_1 has been updated
       via  6a89835cdb2fcb2e5dee43ea9058b0a0cf8e5643 (commit)
       via  d7b067f435f35ba97b459cb15adaa981eb4d2f24 (commit)
       via  93a4bed2fa510655ddb835061f76917c26643661 (commit)
      from  999c1b5fabc7d11de4f251b27512aa0babef9be6 (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 6a89835cdb2fcb2e5dee43ea9058b0a0cf8e5643
Author: Jason Stephenson <jason at sigio.com>
Date:   Thu Jun 20 11:37:02 2019 -0400

    Lp 1759343: Remove database upgrade script from 3.1 backport
    
    Evergreen 3.1 cannot store workstation settings in the database, so
    the database updates needed for Evergreen 3.2 and beyond are not
    needed in 3.1 and cause errors when building or upgrading the
    database.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
deleted file mode 100644
index ed749c986c..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
-
-COMMIT;
-

commit d7b067f435f35ba97b459cb15adaa981eb4d2f24
Author: Jason Stephenson <jason at sigio.com>
Date:   Thu Jun 20 11:35:59 2019 -0400

    Revert "LP1759343 (follow-up): Add bill annotation setting to seed data"
    
    This reverts commit 7f7c1291edb75c8e596eacf1c35eb5c46c684f21.
    
    This commit was backported to rel_3_1 where it does not work.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.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 f1b05e9ac7..a3d2412de2 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -18348,25 +18348,3 @@ VALUES (
     oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
 );
 
-INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
-VALUES (
-    'catalog.record.holds.prefetch', 'cat', 'bool',
-    oils_i18n_gettext(
-        'catalog.record.holds.prefetch',
-        'Pre-Fetch Record Holds',
-        'cwst', 'label'
-    )
-);
-
-INSERT INTO config.workstation_setting_type
-    (name, grp, datatype, label)
-VALUES (
-    'eg.grid.circ.patron.group_members', 'gui', 'object',
-    oils_i18n_gettext(
-    'eg.grid.circ.patron.group_members',
-    'Grid Config: circ.patron.group_members',
-    'cwst', 'label')
-);
-
-INSERT INTO config.workstation_setting_type (name,label,grp,datatype)
-VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');

commit 93a4bed2fa510655ddb835061f76917c26643661
Author: Jason Stephenson <jason at sigio.com>
Date:   Thu Jun 20 11:35:04 2019 -0400

    Revert "LP1759343: Stamping upgrade: annotate payment setting"
    
    This reverts commit d36620734f4f1ab10b70f48d4beef34fad18d36b.
    
    This commit was backported to rel_3_1 where it does not work.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 668e4a0163..5327949f13 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 ('1167', :eg_version); -- JBoyer/terran/sandbergja
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1157', :eg_version); -- berick/sandbergja/Dyrcona
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
similarity index 72%
rename from Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
rename to Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
index 67897181b4..ed749c986c 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('1167', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
 
 INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool');
 

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |  2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       | 22 ----------------------
 .../upgrade/1167.data.annotate_payment_setting.sql |  8 --------
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql


hooks/post-receive
-- 
Evergreen ILS