From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 23 Sep 2009 16:06:41 +0000 (+0000)
Subject: fixed db upgrade script collision
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c410f73cc135c163464f1fe239ffd23fb351c2fb;p=contrib%2FConifer.git

fixed db upgrade script collision

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14117 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ca1c0dedac..a6481c37ff 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -51,7 +51,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0015');
+INSERT INTO config.upgrade_log (version) VALUES ('0016');
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0014.data.patron-claim-return-perm.sql b/Open-ILS/src/sql/Pg/upgrade/0014.data.patron-claim-return-perm.sql
deleted file mode 100644
index 3af57df714..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/0014.data.patron-claim-return-perm.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-BEGIN;
-
-INSERT INTO config.upgrade_log (version) VALUES ('0014');
-
-INSERT INTO permission.perm_list (code, description) VALUES (
-    'UPDATE_PATRON_CLAIM_RETURN_COUNT',
-    'Allows staff to manually change a patron''s claims returned count'
-);
-
-COMMIT;
-
diff --git a/Open-ILS/src/sql/Pg/upgrade/0016.data.patron-claim-return-perm.sql b/Open-ILS/src/sql/Pg/upgrade/0016.data.patron-claim-return-perm.sql
new file mode 100644
index 0000000000..194881f9cb
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0016.data.patron-claim-return-perm.sql
@@ -0,0 +1,11 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0016');
+
+INSERT INTO permission.perm_list (code, description) VALUES (
+    'UPDATE_PATRON_CLAIM_RETURN_COUNT',
+    'Allows staff to manually change a patron''s claims returned count'
+);
+
+COMMIT;
+