From 71f5ed76fd221295e45f0f9293ab8ea39a7a44c3 Mon Sep 17 00:00:00 2001
From: Ben Shum <ben@evergreener.net>
Date: Tue, 20 Nov 2018 09:18:05 -0500
Subject: [PATCH] LP#1643709: Stamping upgrade scripts
Include placeholder 1137 for 3.1 version of the SQL function changed
vs. 1138 which contains the one for 3.2 and master and beyond.
Signed-off-by: Ben Shum <ben@evergreener.net>
---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
.../Pg/upgrade/1137.function.global.purge-usr-on-merge-3.1.sql | 9 +++++++++
...-on-merge.sql => 1138.function.global.purge-usr-on-merge.sql} | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1137.function.global.purge-usr-on-merge-3.1.sql
rename Open-ILS/src/sql/Pg/upgrade/{xxxx.function.global.purge-usr-on-merge.sql => 1138.function.global.purge-usr-on-merge.sql} (99%)
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 4a096039d4..b50f39d2bd 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 ('1136', :eg_version); -- csharp/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1138', :eg_version); -- rhamby/berick/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1137.function.global.purge-usr-on-merge-3.1.sql b/Open-ILS/src/sql/Pg/upgrade/1137.function.global.purge-usr-on-merge-3.1.sql
new file mode 100644
index 0000000000..568c2b56a6
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1137.function.global.purge-usr-on-merge-3.1.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1137', :eg_version);
+
+-- This is a placeholder for 1137 which will be a backported version of the
+-- actor.usr_merge function for rel_3_1. This script does nothing for
+-- rel_3_2 and later.
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.function.global.purge-usr-on-merge.sql b/Open-ILS/src/sql/Pg/upgrade/1138.function.global.purge-usr-on-merge.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/xxxx.function.global.purge-usr-on-merge.sql
rename to Open-ILS/src/sql/Pg/upgrade/1138.function.global.purge-usr-on-merge.sql
index 2e73fca2df..7ce3849ac6 100644
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.function.global.purge-usr-on-merge.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1138.function.global.purge-usr-on-merge.sql
@@ -1,6 +1,6 @@
BEGIN;
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1138', :eg_version);
CREATE OR REPLACE FUNCTION actor.usr_merge( src_usr INT, dest_usr INT, del_addrs BOOLEAN, del_cards BOOLEAN, deactivate_cards BOOLEAN ) RETURNS VOID AS $$
DECLARE
--
2.11.0