From: Jason Stephenson Date: Thu, 20 Jun 2019 15:35:04 +0000 (-0400) Subject: Revert "LP1759343: Stamping upgrade: annotate payment setting" X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=56fa8144be19d567702dfbe485808f5100e743d9;p=working%2FEvergreen.git 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 --- 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/1167.data.annotate_payment_setting.sql deleted file mode 100644 index 67897181b4..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/1167.data.annotate_payment_setting.sql +++ /dev/null @@ -1,8 +0,0 @@ -BEGIN; - -SELECT evergreen.upgrade_deps_block_check('1167', :eg_version); - -INSERT INTO config.workstation_setting_type (name,label,grp,datatype) VALUES ('eg.circ.bills.annotatepayment','Bills: Annotate Payment', 'circ', 'bool'); - -COMMIT; - 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 new file mode 100644 index 0000000000..ed749c986c --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.annotate_payment_setting.sql @@ -0,0 +1,8 @@ +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; +