From 5f132d5f98d719c38a01070cfa75c31ba6227252 Mon Sep 17 00:00:00 2001 From: Lebbeous Fogle-Weekley Date: Fri, 20 May 2011 15:47:04 -0400 Subject: [PATCH] Fix bad seed data in an A/T template The action_trigger event def template for printing acq invoices was syntatically broken. The collapse filter isn't important per se, but it balances the extra [% END %] at the bottom of the template, and it was there originally, and I see no reason not to put it back. Incidentally, maybe the database upgrade script in the commit will be the first in master to successfully use the new evergreen.upgrade_deps_block_check() function ? Reported by Sally Fortin. Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 1 + .../Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index d7a2cdf62a..28799232c3 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -86,7 +86,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 ('0537', :eg_version); -- miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0538', :eg_version); -- senator 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 8daf489c20..e8f0f621cb 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -5409,6 +5409,7 @@ INSERT INTO action_trigger.event_definition ( 'ProcessTemplate', 'print-on-demand', $$ +[% FILTER collapse %] [%- SET invoice = target -%]
diff --git a/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql b/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql new file mode 100644 index 0000000000..43b5079118 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0538.data.at-event-def-acq-invoice-print.sql @@ -0,0 +1,10 @@ +BEGIN; + +SELECT evergreen.upgrade_deps_block_check('0538', :eg_version); -- senator + +UPDATE action_trigger.event_definition +SET template = '[% FILTER collapse %]' || template +WHERE id = 22 AND + SUBSTR(template, 0, 24) NOT LIKE '%FILTER collapse%'; + +COMMIT; -- 2.11.0