[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 668f20aaad579908f5ed662f2feded04f41597f6
Evergreen Git
git at git.evergreen-ils.org
Wed Oct 4 11:54:05 EDT 2017
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, rel_2_12 has been updated
via 668f20aaad579908f5ed662f2feded04f41597f6 (commit)
via 58926d081ce8333c64cd1036452b7e80071d421a (commit)
via 514f7f430b4280fe1dbdea115e6f029869b73584 (commit)
from 7eff6f7b459faa2a3b238ff2cf67480c58017622 (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 668f20aaad579908f5ed662f2feded04f41597f6
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Wed Oct 4 12:10:31 2017 -0400
LP#1666512: stamp DB update
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index dd4a8dc..4f0c23a 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 ('1055', :eg_version); -- berick/phasefx
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1078', :eg_version); -- csharp/bshum/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql b/Open-ILS/src/sql/Pg/upgrade/1078.data.add_possibly_missing_billing_types.sql
similarity index 90%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
rename to Open-ILS/src/sql/Pg/upgrade/1078.data.add_possibly_missing_billing_types.sql
index 256c558..d5c4705 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1078.data.add_possibly_missing_billing_types.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1078', :eg_version); -- csharp/bshum/gmcharlt
-- The following billing types would not have been automatically added
-- in upgrade scripts between versions 1.2 and 1.4 (early 2009). We
commit 58926d081ce8333c64cd1036452b7e80071d421a
Author: Ben Shum <ben at evergreener.net>
Date: Thu Sep 14 23:16:32 2017 -0400
LP#1666512 - Only insert if not already existing
This repatch was requested by Galen Charlton to make it easier for
upgrades to avoid adding the entries or failing if the entries already
existed.
Also drops the unnecessary i18n tagging for the billing type names
since it does not work with applying upgrade scripts (only for sourcing
db.seed data for translation to PO file)
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
index a9d3d5c..256c558 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
@@ -7,11 +7,16 @@ SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-- add them here. It's okay if they fail, so this should probably be
-- run outside a transaction if added to the version-upgrade scripts.
-INSERT INTO config.billing_type (id, name, owner) VALUES
- ( 7, oils_i18n_gettext(7, 'Damaged Item', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
- ( 8, oils_i18n_gettext(8, 'Damaged Item Processing Fee', 'cbt', 'name'), 1);
-INSERT INTO config.billing_type (id, name, owner) VALUES
- ( 9, oils_i18n_gettext(9, 'Notification Fee', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner)
+ SELECT 7, 'Damaged Item', 1
+ WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item');
+
+INSERT INTO config.billing_type (id, name, owner)
+ SELECT 8, 'Damaged Item Processing Fee', 1
+ WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Damaged Item Processing Fee');
+
+INSERT INTO config.billing_type (id, name, owner)
+ SELECT 9, 'Notification Fee', 1
+ WHERE NOT EXISTS (SELECT 1 FROM config.billing_type WHERE name = 'Notification Fee');
COMMIT;
commit 514f7f430b4280fe1dbdea115e6f029869b73584
Author: Chris Sharp <csharp at georgialibraries.org>
Date: Tue Feb 21 08:03:55 2017 -0500
LP#1666512 - Add billing types from 2009-era features.
For systems that were running Evergreen 1.2 or so and upgraded to 1.4
or so, there were billing types added that did not make it into an
upgrade script. We add them here just in case you don't have them.
Systems installed since Evergreen 1.4 are probably not affected.
Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
new file mode 100644
index 0000000..a9d3d5c
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add_possibly_missing_billing_types.sql
@@ -0,0 +1,17 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+-- The following billing types would not have been automatically added
+-- in upgrade scripts between versions 1.2 and 1.4 (early 2009). We
+-- add them here. It's okay if they fail, so this should probably be
+-- run outside a transaction if added to the version-upgrade scripts.
+
+INSERT INTO config.billing_type (id, name, owner) VALUES
+ ( 7, oils_i18n_gettext(7, 'Damaged Item', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+ ( 8, oils_i18n_gettext(8, 'Damaged Item Processing Fee', 'cbt', 'name'), 1);
+INSERT INTO config.billing_type (id, name, owner) VALUES
+ ( 9, oils_i18n_gettext(9, 'Notification Fee', 'cbt', 'name'), 1);
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
...078.data.add_possibly_missing_billing_types.sql | 22 ++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1078.data.add_possibly_missing_billing_types.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list