From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 2 Mar 2015 14:05:52 +0000 (+0000)
Subject: LP#1155313: pin upgrade script to 0914
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=93fd64fdc79bbbb9c1fe655c6ae743cea7a8bfc7;p=contrib%2FConifer.git

LP#1155313: pin upgrade script to 0914

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 97288b311d..5e1a8923ba 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('0913', :eg_version); -- remington/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0914', :eg_version); -- dpearl/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql b/Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
new file mode 100644
index 0000000000..2002771ded
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0914.schema.redo_vandelay_merge_profile_sequence.sql
@@ -0,0 +1,21 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0914', :eg_version);
+
+CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$
+    my $string = shift;            # Source string
+    my $pad = shift;               # string to fill.  Typically '0'. This should be a single character.
+    my $len = shift;               # length of resultant padded field
+    my $find = $len - 1;
+
+    while ($string =~ /(^|\D)(\d{1,$find})($|\D)/) {
+        my $padded = $2;
+        $padded = $pad x ($len - length($padded)) . $padded;
+        $string = $` . $1 . $padded . $3 . $';
+    }
+
+    return $string;
+$$ LANGUAGE PLPERLU;
+
+COMMIT;
+
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
deleted file mode 100644
index 7b79fc42ae..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lpad-number-repair.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-BEGIN;
-
-CREATE OR REPLACE FUNCTION evergreen.lpad_number_substrings( TEXT, TEXT, INT ) RETURNS TEXT AS $$
-    my $string = shift;            # Source string
-    my $pad = shift;               # string to fill.  Typically '0'. This should be a single character.
-    my $len = shift;               # length of resultant padded field
-    my $find = $len - 1;
-
-    while ($string =~ /(^|\D)(\d{1,$find})($|\D)/) {
-        my $padded = $2;
-        $padded = $pad x ($len - length($padded)) . $padded;
-        $string = $` . $1 . $padded . $3 . $';
-    }
-
-    return $string;
-$$ LANGUAGE PLPERLU;
-
-COMMIT;
-