LP#1831803: stamp schema update

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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 78798f0..3b4db98 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 ('1306', :eg_version); -- miker/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1307', :eg_version); -- jeffdavis/JBoyer/gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1307.schema.staged_search_cleanup.sql b/Open-ILS/src/sql/Pg/upgrade/1307.schema.staged_search_cleanup.sql
new file mode 100644 (file)
index 0000000..14d4e94
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1307.schema.staged_search_cleanup.sql
@@ -0,0 +1,27 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1307', :eg_version);
+
+DROP FUNCTION search.query_parser_fts (
+    INT,
+    INT,
+    TEXT,
+    INT[],
+    INT[],
+    INT,
+    INT,
+    INT,
+    BOOL,
+    BOOL,
+    BOOL,
+    INT 
+);
+
+DROP TABLE asset.opac_visible_copies;
+
+DROP FUNCTION IF EXISTS asset.refresh_opac_visible_copies_mat_view();
+
+DROP TYPE search.search_result;
+DROP TYPE search.search_args;
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.staged_search_cleanup.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.staged_search_cleanup.sql
deleted file mode 100644 (file)
index d0a2a5b..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.staged_search_cleanup.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-DROP FUNCTION search.query_parser_fts (
-    INT,
-    INT,
-    TEXT,
-    INT[],
-    INT[],
-    INT,
-    INT,
-    INT,
-    BOOL,
-    BOOL,
-    BOOL,
-    INT 
-);
-
-DROP TABLE asset.opac_visible_copies;
-
-DROP FUNCTION IF EXISTS asset.refresh_opac_visible_copies_mat_view();
-
-DROP TYPE search.search_result;
-DROP TYPE search.search_args;
-
-COMMIT;