[open-ils-commits] [GIT] Evergreen ILS branch rel_2_10 updated. 0a21c3aa5d349fa341896e0449f0e67d504dd5a8
Evergreen Git
git at git.evergreen-ils.org
Wed Nov 16 12:23:42 EST 2016
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_10 has been updated
via 0a21c3aa5d349fa341896e0449f0e67d504dd5a8 (commit)
via 5ef5ee2fa2d6cc12b1e4798cc902d91e772132af (commit)
via bc9436fca0fb4461f40e9e981b951fcca04bcda0 (commit)
via 3033d048beefa27928992efd129addb38958c266 (commit)
from 519ec1ccb0a148e2816f3b2e6587c16c561e1c4b (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 0a21c3aa5d349fa341896e0449f0e67d504dd5a8
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Nov 16 12:16:14 2016 -0500
LP#1618183: restamp backport of schema update script
Signed-off-by: Galen Charlton <gmc at 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 37c3137..8fdf4f2 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 ('1001', :eg_version); -- stompro/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1002', :eg_version); -- gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql b/Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-rel_2_10.sql
similarity index 84%
rename from Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
rename to Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-rel_2_10.sql
index c1bcfc1..cb4ea6e 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-rel_2_10.sql
@@ -2,7 +2,7 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('1000', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1002', :eg_version);
INSERT INTO config.i18n_locale (code,marc_code,name,description)
SELECT 'es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
commit 5ef5ee2fa2d6cc12b1e4798cc902d91e772132af
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Nov 16 11:56:16 2016 -0500
LP#1618183: make upgrade not die if es-ES locale already exists
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql b/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
index b221170..c1bcfc1 100644
--- a/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
@@ -5,7 +5,8 @@ BEGIN;
SELECT evergreen.upgrade_deps_block_check('1000', :eg_version);
INSERT INTO config.i18n_locale (code,marc_code,name,description)
- VALUES ('es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
- oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'description'));
+ SELECT 'es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
+ oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'description')
+ WHERE NOT EXISTS (SELECT 1 FROM config.i18n_locale WHERE code = 'es-ES');
COMMIT;
commit bc9436fca0fb4461f40e9e981b951fcca04bcda0
Author: Dan Wells <dbw2 at calvin.edu>
Date: Mon Aug 29 17:38:10 2016 -0400
Stamping upgrade script for Spanish locale seed data
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Conflicts:
Open-ILS/src/sql/Pg/002.schema.config.sql
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql b/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
similarity index 81%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql
rename to Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
index 1263431..b221170 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1000.data.add-spanish-to-i18n-locale.sql
@@ -2,7 +2,7 @@
BEGIN;
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1000', :eg_version);
INSERT INTO config.i18n_locale (code,marc_code,name,description)
VALUES ('es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
commit 3033d048beefa27928992efd129addb38958c266
Author: Ben Shum <ben at evergreener.net>
Date: Mon Aug 29 15:37:48 2016 -0400
LP#1618183: Add Spanish to config.i18n_locale
Add Spanish to this table so that it is an option for supported translations.
Signed-off-by: Ben Shum <ben at evergreener.net>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
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 0792b94..194c69c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -359,6 +359,9 @@ INSERT INTO config.i18n_locale (code,marc_code,name,description)
INSERT INTO config.i18n_locale (code,marc_code,name,description)
VALUES ('hy-AM', 'arm', oils_i18n_gettext('hy-AM', 'Armenian', 'i18n_l', 'name'),
oils_i18n_gettext('hy-AM', 'Armenian', 'i18n_l', 'description'));
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+ VALUES ('es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
+ oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'description'));
--INSERT INTO config.i18n_locale (code,marc_code,name,description)
-- VALUES ('es-US', 'spa', oils_i18n_gettext('es-US', 'Spanish (US)', 'i18n_l', 'name'),
-- oils_i18n_gettext('es-US', 'American Spanish', 'i18n_l', 'description'));
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql
new file mode 100644
index 0000000..1263431
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.add-spanish-to-i18n-locale.sql
@@ -0,0 +1,11 @@
+-- Add Spanish to config.i18n_locale table
+
+BEGIN;
+
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.i18n_locale (code,marc_code,name,description)
+ VALUES ('es-ES', 'spa', oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'name'),
+ oils_i18n_gettext('es-ES', 'Spanish', 'i18n_l', 'description'));
+
+COMMIT;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/950.data.seed-values.sql | 3 +++
...02.data.add-spanish-to-i18n-locale-rel_2_10.sql | 12 ++++++++++++
3 files changed, 16 insertions(+), 1 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1002.data.add-spanish-to-i18n-locale-rel_2_10.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list