[open-ils-commits] [GIT] Evergreen ILS branch master updated. f0c5d6d855917efc05543db9ba985aeab2ecf6ac
Evergreen Git
git at git.evergreen-ils.org
Fri Feb 27 10:29:06 EST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via f0c5d6d855917efc05543db9ba985aeab2ecf6ac (commit)
via 86066c494609a05940e03d5e933447f597c74f80 (commit)
via d01ba8ed9d4ec7078036f2ce767ff4ac4597ce8e (commit)
from 0a3348f16ee9f8c3bba4da6951249914f88116b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f0c5d6d855917efc05543db9ba985aeab2ecf6ac
Author: Jason Etheridge <jason at esilibrary.com>
Date: Thu Feb 26 09:26:47 2015 -0500
LP#1425967: look for Business::CreditCard in settings-tester.pl
and not Business::CreditCard::Object
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/support-scripts/settings-tester.pl b/Open-ILS/src/support-scripts/settings-tester.pl
index 030ef05..6bb59f3 100755
--- a/Open-ILS/src/support-scripts/settings-tester.pl
+++ b/Open-ILS/src/support-scripts/settings-tester.pl
@@ -463,5 +463,5 @@ Parse::RecDescent
SRU
JSON::XS
UUID::Tiny
-Business::CreditCard::Object
+Business::CreditCard
Net::Z3950::Simple2ZOOM
commit 86066c494609a05940e03d5e933447f597c74f80
Author: Ben Shum <bshum at biblio.org>
Date: Fri Feb 27 10:25:48 2015 -0500
LP#1426133: Stamping upgrade script for set merge_profile_id_seq
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 7e49b70..97288b3 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 ('0912', :eg_version); -- jboyer/mmorgan/kmlussier/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0913', :eg_version); -- remington/bshum
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql b/Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql
similarity index 92%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql
rename to Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql
index bf0f5c9..a8b437a 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql
@@ -1,6 +1,6 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0913', :eg_version);
--stock evergreen comes with 2 merge profiles; move any custom profiles
UPDATE vandelay.merge_profile SET id = id + 100 WHERE id > 2;
commit d01ba8ed9d4ec7078036f2ce767ff4ac4597ce8e
Author: Remington Steed <rjs7 at calvin.edu>
Date: Thu Feb 26 16:21:48 2015 -0500
LP#1426133: Set merge_profile_id_seq explicitly
Many database tables need to explicitly set the id sequence (often to
100) to provide room for stock data with static ids. This commit does so
for vandelay.merge_profile, and also updates the ids of any non-stock
profiles (both in the merge_profile table and in related settings).
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Ben Shum <bshum at biblio.org>
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 5abcaaf..fa7fcc3 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -12646,6 +12646,8 @@ INSERT INTO vandelay.merge_profile (id, owner, name, replace_spec)
INSERT INTO vandelay.merge_profile (id, owner, name, preserve_spec)
VALUES (2, 1, oils_i18n_gettext(2, 'Full Overlay', 'vmp', 'name'), '901c');
+SELECT SETVAL('vandelay.merge_profile'::TEXT, 100);
+
-- user activity seed data --
INSERT INTO config.usr_activity_type (id, ewho, ewhat, ehow, egroup, label) VALUES
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql
new file mode 100644
index 0000000..bf0f5c9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.redo_vandelay_merge_profile_sequence.sql
@@ -0,0 +1,24 @@
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+--stock evergreen comes with 2 merge profiles; move any custom profiles
+UPDATE vandelay.merge_profile SET id = id + 100 WHERE id > 2;
+
+--update the same ids in org unit settings, stored in double quotes
+UPDATE actor.org_unit_setting
+ SET value = '"' || merge_profile_id+100 || '"'
+ FROM (
+ SELECT id, (regexp_matches(value, '"(\d+)"'))[1]::int as merge_profile_id FROM actor.org_unit_setting
+ WHERE name IN (
+ 'acq.upload.default.vandelay.low_quality_fall_thru_profile',
+ 'acq.upload.default.vandelay.merge_profile'
+ )
+ ) as foo
+ WHERE actor.org_unit_setting.id = foo.id
+ AND foo.merge_profile_id > 2;
+
+--set sequence's next value to 100, or more if necessary
+SELECT SETVAL('vandelay.merge_profile_id_seq', GREATEST(100, (SELECT MAX(id) FROM vandelay.merge_profile)));
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 2 +
...schema.redo_vandelay_merge_profile_sequence.sql | 24 ++++++++++++++++++++
Open-ILS/src/support-scripts/settings-tester.pl | 2 +-
4 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0913.schema.redo_vandelay_merge_profile_sequence.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list