From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 1 May 2017 19:04:56 +0000 (-0400)
Subject: LP#1684984: stamp DB update
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=06b170f908764312b59414ffce340c955fa94dfc;p=Evergreen.git

LP#1684984: stamp DB update

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 225067835f..97ef039fbc 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,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 ('1034', :eg_version); -- rhamby/gmcharlt/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1035', :eg_version); -- dyrcona/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1035.data.remove_ingest.disable_metabib_field_entry.sql b/Open-ILS/src/sql/Pg/upgrade/1035.data.remove_ingest.disable_metabib_field_entry.sql
new file mode 100644
index 0000000000..64c865a108
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1035.data.remove_ingest.disable_metabib_field_entry.sql
@@ -0,0 +1,13 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1035', :eg_version); -- dyrcona/gmcharlt
+
+-- Per Lp bug 1684984, the config.internal_flag,
+-- ingest.disable_metabib_field_entry, was made obsolete by the
+-- addition of the ingest.skip_browse_indexing,
+-- ingest.skip_search_indexing, and ingest.skip_facet_indexing flags.
+-- Since it is not used in the database, we delete it.
+DELETE FROM config.internal_flag
+WHERE name = 'ingest.disable_metabib_field_entry';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.remove_ingest.disable_metabib_field_entry.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.remove_ingest.disable_metabib_field_entry.sql
deleted file mode 100644
index 091c618a9b..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.remove_ingest.disable_metabib_field_entry.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
--- Per Lp bug 1684984, the config.internal_flag,
--- ingest.disable_metabib_field_entry, was made obsolete by the
--- addition of the ingest.skip_browse_indexing,
--- ingest.skip_search_indexing, and ingest.skip_facet_indexing flags.
--- Since it is not used in the database, we delete it.
-DELETE FROM config.internal_flag
-WHERE name = 'ingest.disable_metabib_field_entry';
-
-COMMIT;