LP1771636: Stamping upgrade script

Signed-off-by: Michele Morgan <mmorgan@noblenet.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2b2428d..89de0a6 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 ('1326', :eg_version); -- khuckins/berick/phasefx/sandbergja/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1327', :eg_version); -- berick/jamundson/mmorgan
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1327.data.org-select-combo-names.sql b/Open-ILS/src/sql/Pg/upgrade/1327.data.org-select-combo-names.sql
new file mode 100644 (file)
index 0000000..7e3cc53
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1327.data.org-select-combo-names.sql
@@ -0,0 +1,15 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1327', :eg_version);
+
+INSERT into config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.orgselect.show_combined_names', 'gui', 'bool',
+    oils_i18n_gettext(
+        'eg.orgselect.show_combined_names',
+        'Library Selector Show Combined Names',
+        'cwst', 'label'
+    )
+);
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-select-combo-names.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-select-combo-names.sql
deleted file mode 100644 (file)
index 054330b..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.org-select-combo-names.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
-
-INSERT into config.workstation_setting_type (name, grp, datatype, label)
-VALUES (
-    'eg.orgselect.show_combined_names', 'gui', 'bool',
-    oils_i18n_gettext(
-        'eg.orgselect.show_combined_names',
-        'Library Selector Show Combined Names',
-        'cwst', 'label'
-    )
-);
-
-COMMIT;