From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 10 Feb 2021 20:46:56 +0000 (-0500)
Subject: LP1474029 Stamping DB upgrade: expired staff no-login
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c118b746ed9a619ab42459782923e66e2a7a65df;p=working%2FEvergreen.git

LP1474029 Stamping DB upgrade: expired staff no-login

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index e11f361450..4b5622c650 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 ('1244', :eg_version); -- gmcharlt/rhamby
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1245', :eg_version); -- gmcharlt/terranm/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1245.data.block_expired_staff_login_flag.sql b/Open-ILS/src/sql/Pg/upgrade/1245.data.block_expired_staff_login_flag.sql
new file mode 100644
index 0000000000..ba232e785b
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1245.data.block_expired_staff_login_flag.sql
@@ -0,0 +1,17 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1245', :eg_version);
+
+INSERT INTO config.global_flag (name, value, enabled, label)
+VALUES (
+    'auth.block_expired_staff_login',
+    NULL,
+    FALSE,
+    oils_i18n_gettext(
+        'auth.block_expired_staff_login',
+        'Block the ability of expired user with the STAFF_LOGIN permission to log into Evergreen.',
+        'cgf', 'label'
+    )
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.block_expired_staff_login_flag.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.block_expired_staff_login_flag.sql
deleted file mode 100644
index b7ea9b12fc..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.block_expired_staff_login_flag.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.global_flag (name, value, enabled, label)
-VALUES (
-    'auth.block_expired_staff_login',
-    NULL,
-    FALSE,
-    oils_i18n_gettext(
-        'auth.block_expired_staff_login',
-        'Block the ability of expired user with the STAFF_LOGIN permission to log into Evergreen.',
-        'cgf', 'label'
-    )
-);
-
-COMMIT;