LP1818153 Stamping DB upgrade - WS user activity

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 8c5113f..2d37ee2 100644 (file)
--- 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 ('1153', :eg_version); -- abowling/kmlussier/csharp
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1154', :eg_version); -- berick/mmorgan
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql b/Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql
new file mode 100644 (file)
index 0000000..7e286bd
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1154.data.websocket-activity-types.sql
@@ -0,0 +1,28 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1154', :eg_version);
+
+INSERT INTO config.usr_activity_type 
+    (id, ewhat, ehow, egroup, enabled, transient, label)
+VALUES (
+    25, 'login', 'ws-translator-v1', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(25, 'Login via Websocket V1', 'cuat', 'label')
+), (
+    26, 'login', 'ws-translator-v2', 'authen', TRUE, TRUE,
+    oils_i18n_gettext(26, 'Login via Websocket V2', 'cuat', 'label')
+), (
+    27, 'verify', 'ws-translator-v1', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(27, 'Verification via Websocket v1', 'cuat', 'label')
+), (
+    28, 'verify', 'ws-translator-v2', 'authz', TRUE, TRUE,
+    oils_i18n_gettext(28, 'Verifiation via Websocket V2', 'cuat', 'label')
+), (
+    29, 'login', NULL, 'authen', TRUE, TRUE,
+    oils_i18n_gettext(29, 'Generic Login', 'cuat', 'label')
+), (
+    30, 'verify', NULL, 'authz', TRUE, TRUE,
+    oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
+);
+
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
deleted file mode 100644 (file)
index 69e21e6..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.websocket-activity-types.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.usr_activity_type 
-    (id, ewhat, ehow, egroup, enabled, transient, label)
-VALUES (
-    25, 'login', 'ws-translator-v1', 'authen', TRUE, TRUE,
-    oils_i18n_gettext(25, 'Login via Websocket V1', 'cuat', 'label')
-), (
-    26, 'login', 'ws-translator-v2', 'authen', TRUE, TRUE,
-    oils_i18n_gettext(26, 'Login via Websocket V2', 'cuat', 'label')
-), (
-    27, 'verify', 'ws-translator-v1', 'authz', TRUE, TRUE,
-    oils_i18n_gettext(27, 'Verification via Websocket v1', 'cuat', 'label')
-), (
-    28, 'verify', 'ws-translator-v2', 'authz', TRUE, TRUE,
-    oils_i18n_gettext(28, 'Verifiation via Websocket V2', 'cuat', 'label')
-), (
-    29, 'login', NULL, 'authen', TRUE, TRUE,
-    oils_i18n_gettext(29, 'Generic Login', 'cuat', 'label')
-), (
-    30, 'verify', NULL, 'authz', TRUE, TRUE,
-    oils_i18n_gettext(30, 'Generic Verify', 'cuat', 'label')
-);
-
-
-COMMIT;