From b0a1c725e2b97e5108ad7071c8c9bd96e2ad4ef5 Mon Sep 17 00:00:00 2001
From: Dan Wells <dbw2@calvin.edu>
Date: Wed, 28 Feb 2018 16:30:26 -0500
Subject: [PATCH] LP#1744385: Stamping upgrade scripts for search and display
 infrastructure improvements

Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 Open-ILS/src/sql/Pg/002.schema.config.sql                       | 2 +-
 ...ield-seed-data.sql => 1100.data.display-field-seed-data.sql} | 2 +-
 ...ma.highlight_search.sql => 1101.schema.highlight_search.sql} | 2 ++
 ...n-change.sql => 1102.data.mods-title-punctuation-change.sql} | 2 ++
 ....virtual_index_defs.sql => 1103.data.virtual_index_defs.sql} | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)
 rename Open-ILS/src/sql/Pg/upgrade/{WWWW.data.display-field-seed-data.sql => 1100.data.display-field-seed-data.sql} (99%)
 rename Open-ILS/src/sql/Pg/upgrade/{XXXX.schema.highlight_search.sql => 1101.schema.highlight_search.sql} (99%)
 rename Open-ILS/src/sql/Pg/upgrade/{YYYY.data.mods-title-punctuation-change.sql => 1102.data.mods-title-punctuation-change.sql} (99%)
 rename Open-ILS/src/sql/Pg/upgrade/{ZZZZ.data.virtual_index_defs.sql => 1103.data.virtual_index_defs.sql} (97%)

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 09b59cf9ba..b2f85c7314 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 ('1099', :eg_version); -- gmcharlt/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1103', :eg_version);
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/WWWW.data.display-field-seed-data.sql b/Open-ILS/src/sql/Pg/upgrade/1100.data.display-field-seed-data.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/WWWW.data.display-field-seed-data.sql
rename to Open-ILS/src/sql/Pg/upgrade/1100.data.display-field-seed-data.sql
index 5ec2eeb6ea..e3160270b5 100644
--- a/Open-ILS/src/sql/Pg/upgrade/WWWW.data.display-field-seed-data.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1100.data.display-field-seed-data.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
--- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1100', :eg_version);
 
 -- NEW config.metabib_field entries
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.highlight_search.sql b/Open-ILS/src/sql/Pg/upgrade/1101.schema.highlight_search.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.highlight_search.sql
rename to Open-ILS/src/sql/Pg/upgrade/1101.schema.highlight_search.sql
index e0a91934ee..f2c9d34315 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.highlight_search.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1101.schema.highlight_search.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1101', :eg_version);
+
 ALTER TABLE config.metabib_field ALTER COLUMN xpath DROP NOT NULL;
 
 CREATE TABLE config.metabib_field_virtual_map (
diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.mods-title-punctuation-change.sql b/Open-ILS/src/sql/Pg/upgrade/1102.data.mods-title-punctuation-change.sql
similarity index 99%
rename from Open-ILS/src/sql/Pg/upgrade/YYYY.data.mods-title-punctuation-change.sql
rename to Open-ILS/src/sql/Pg/upgrade/1102.data.mods-title-punctuation-change.sql
index febf8323a6..5a101a3e6a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.mods-title-punctuation-change.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1102.data.mods-title-punctuation-change.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1102', :eg_version);
+
 update config.xml_transform set xslt = $XXXX$<?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://www.loc.gov/mods/v3" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc" version="1.0">
         <xsl:output encoding="UTF-8" indent="yes" method="xml"/>
diff --git a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.virtual_index_defs.sql b/Open-ILS/src/sql/Pg/upgrade/1103.data.virtual_index_defs.sql
similarity index 97%
rename from Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.virtual_index_defs.sql
rename to Open-ILS/src/sql/Pg/upgrade/1103.data.virtual_index_defs.sql
index 9e4e4250e5..5dffd22aad 100644
--- a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.virtual_index_defs.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1103.data.virtual_index_defs.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1103', :eg_version);
+
 INSERT INTO config.metabib_field (id, field_class, name, label, browse_field)
     VALUES (45, 'keyword', 'blob', 'All searchable fields', FALSE);
 
-- 
2.43.2