From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 26 Aug 2016 21:00:20 +0000 (-0400)
Subject: Stamp 0999 upgrade; remove merge conflict markers
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e07ac6c32679a87ecf2dcc5c4c11a01347871313;p=evergreen%2Ftadl.git

Stamp 0999 upgrade; remove merge conflict markers

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ca947ceb63..70af6ff05a 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 ('0998', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0999', :eg_version); -- gmc/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index f00d040c8d..2c45a7bc25 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -16350,7 +16350,6 @@ INSERT INTO actor.org_unit_setting (
     'true'
 );
 
-<<<<<<< HEAD
 INSERT INTO config.global_flag (name, enabled, label) VALUES (
     'ingest.disable_authority_auto_update_bib_meta',  FALSE, 
     oils_i18n_gettext(
@@ -16362,7 +16361,6 @@ INSERT INTO config.global_flag (name, enabled, label) VALUES (
     )
 );
 
-=======
 -- email checkout receipts
 INSERT INTO config.usr_setting_type (
     name,
@@ -16462,4 +16460,3 @@ INSERT INTO action_trigger.environment (
     currval('action_trigger.event_definition_id_seq'),
     'circ_lib'
 );
->>>>>>> a452d2f... LP#1356477: seed data for email checkout receipts
diff --git a/Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql b/Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql
new file mode 100644
index 0000000000..d166bedbc1
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0999.schema.staging-user-setting.sql
@@ -0,0 +1,14 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0999', :eg_version);
+
+CREATE TABLE staging.setting_stage (
+        row_id          BIGSERIAL PRIMARY KEY,
+        row_date        TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+        usrname         TEXT NOT NULL,
+        setting         TEXT NOT NULL,
+        value           TEXT NOT NULL,
+        complete        BOOL DEFAULT FALSE
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql
deleted file mode 100644
index 55908ad8a6..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/YYYY.schema.staging-user-setting.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN;
-
-CREATE TABLE staging.setting_stage (
-        row_id          BIGSERIAL PRIMARY KEY,
-        row_date        TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
-        usrname         TEXT NOT NULL,
-        setting         TEXT NOT NULL,
-        value           TEXT NOT NULL,
-        complete        BOOL DEFAULT FALSE
-);
-
-COMMIT;