Add version string for csp ignore proximity.

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 02ffe32..f5c66c7 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -95,6 +95,7 @@ INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0944', :eg_version
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.7.4-2.9.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.7.4-2.9.0-upgrade-db.sql
index 7ceb8ca..3cab5cb 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.7.4-2.9.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.7.4-2.9.0-upgrade-db.sql
@@ -2,7 +2,10 @@
 \set eg_version '''2.9.0'''
 BEGIN;
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.9.0', :eg_version);
+
+COMMIT;
+
+BEGIN;
 
 SELECT evergreen.upgrade_deps_block_check('0902', :eg_version);
 
@@ -24,6 +27,10 @@ CREATE TRIGGER hold_request_clear_map_tgr
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0903', :eg_version);
 
 INSERT INTO config.org_unit_setting_type
@@ -71,6 +78,10 @@ INSERT INTO config.org_unit_setting_type
          'bool');
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0907', :eg_version);
 
 INSERT into config.org_unit_setting_type
@@ -84,6 +95,10 @@ INSERT into config.org_unit_setting_type
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0909', :eg_version);
 
 ALTER TABLE vandelay.authority_match
@@ -455,6 +470,10 @@ $$ LANGUAGE PLPGSQL;
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0910', :eg_version);
 
 CREATE TABLE actor.usr_message (
@@ -532,6 +551,10 @@ WHERE aun.pub;
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0911', :eg_version);
 
 -- Auto-cancelled, no target
@@ -627,6 +650,10 @@ INSERT INTO action_trigger.environment (event_def, path) VALUES
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0912', :eg_version);
 
 ALTER TABLE asset.copy_location ADD COLUMN deleted BOOLEAN NOT NULL DEFAULT FALSE;
@@ -1436,6 +1463,10 @@ $$ LANGUAGE PLPGSQL;
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0915', :eg_version);
 
 INSERT INTO permission.perm_list (id, code, description) 
@@ -1463,6 +1494,10 @@ VALUES (
 );
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0916', :eg_version);
 
 CREATE OR REPLACE FUNCTION actor.convert_usr_note_to_message () RETURNS TRIGGER AS $$
@@ -1495,6 +1530,10 @@ $$ LANGUAGE PLPGSQL;
 -- index serial.record_entry.record
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0917', :eg_version);
 
 CREATE INDEX serial_record_entry_record_idx ON serial.record_entry ( record );
@@ -1502,16 +1541,28 @@ CREATE INDEX serial_record_entry_record_idx ON serial.record_entry ( record );
 -- index authority.simple_heading.record so that reingesting
 -- authority records does not require a sequential scan of ash
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0918', :eg_version);
 
 CREATE INDEX authority_simple_heading_record_idx ON authority.simple_heading (record);
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0919', :eg_version);
 
 ALTER TABLE acq.acq_lineitem_history DROP CONSTRAINT IF EXISTS acq_lineitem_history_queued_record_fkey;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0920', :eg_version);
 
 CREATE UNIQUE INDEX
@@ -1523,6 +1574,10 @@ CREATE UNIQUE INDEX
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0921', :eg_version);
 
 CREATE TABLE money.account_adjustment (
@@ -1616,6 +1671,10 @@ VALUES
  * speeding up vandelay.bib_queue deletions).
  */
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0922', :eg_version);
 
 CREATE INDEX acq_lineitem_history_queued_record_idx ON acq.acq_lineitem_history (queued_record);
@@ -1626,6 +1685,10 @@ CREATE INDEX import_item_record_idx ON vandelay.import_item (record);
 -- Include bib source in XML returned by unapi.bre.
 
 -- check whether patch can be applied
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0923', :eg_version);
 
 CREATE OR REPLACE FUNCTION unapi.cbs ( obj_id BIGINT, format TEXT,  ename TEXT, includes TEXT[], org TEXT, depth INT DEFAULT NULL, slimit HSTORE DEFAULT NULL, soffset HSTORE DEFAULT NULL, include_xmlns BOOL DEFAULT TRUE ) RETURNS XML AS $F$
@@ -1772,6 +1835,10 @@ $F$ LANGUAGE PLPGSQL STABLE;
 --
 
 -- check whether patch can be applied
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0924', :eg_version);
 
 -- function is being expanded and renamed, so drop the old version
@@ -1973,6 +2040,10 @@ CREATE OR REPLACE FUNCTION unapi.acn ( obj_id BIGINT, format TEXT,  ename TEXT,
 $F$ LANGUAGE SQL STABLE;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0925', :eg_version);
 
 CREATE OR REPLACE FUNCTION evergreen.limit_oustl() RETURNS TRIGGER AS $oustl_limit$
@@ -1997,6 +2068,10 @@ CREATE TRIGGER limit_logs_oust
     FOR EACH ROW EXECUTE PROCEDURE limit_oustl();
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0926', :eg_version);
 
 CREATE OR REPLACE FUNCTION acq.copy_fund_tags(
@@ -2314,6 +2389,10 @@ $$ LANGUAGE plpgsql;
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0927', :eg_version);
 
 CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
@@ -2324,6 +2403,10 @@ CREATE OR REPLACE VIEW extend_reporter.full_circ_count AS
    FROM asset.copy cp;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0928', :eg_version);
 
 CREATE OR REPLACE FUNCTION oils_xpath_tag_to_table(marc text, tag text, xpaths text[]) RETURNS SETOF record AS $function$
@@ -2370,6 +2453,10 @@ END;
 $function$ LANGUAGE PLPGSQL;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0929', :eg_version);
 
 INSERT INTO vandelay.import_error ( code, description ) VALUES (
@@ -2849,6 +2936,10 @@ END;
 $func$ LANGUAGE PLPGSQL;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0930', :eg_version);
 
 ALTER TABLE acq.invoice_item_type
@@ -2857,12 +2948,20 @@ ALTER TABLE acq.invoice_item_type
         CHECK (blanket IS FALSE OR prorate IS FALSE);
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0931', :eg_version);
 
 INSERT INTO acq.invoice_item_type (code, blanket, name) VALUES (
     'BLA', TRUE, oils_i18n_gettext('BLA', 'Blanket Order', 'aiit', 'name'));
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0932', :eg_version);
 
 UPDATE config.org_unit_setting_type 
@@ -2887,6 +2986,10 @@ UPDATE config.org_unit_setting_type
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0933', :eg_version);
 
 
@@ -3111,6 +3214,10 @@ CREATE OR REPLACE FUNCTION config.ou_marc_subfields(marc_format INTEGER, marc_re
 $func$ LANGUAGE SQL;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0934', :eg_version);
 
 INSERT INTO config.marc_format(id, code, name) VALUES (1, 'marc21', 'MARC 21');
@@ -24268,6 +24375,10 @@ VALUES (1, 'serial', '880', '6', $$Linkage$$,
 FALSE, FALSE, FALSE);
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0935', :eg_version);
 
 INSERT INTO permission.perm_list ( code, description ) VALUES
@@ -24279,6 +24390,10 @@ INSERT INTO permission.perm_list ( code, description ) VALUES
 -- work
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0936', :eg_version);
 
 CREATE OR REPLACE FUNCTION metabib.reingest_record_attributes (rid BIGINT, pattr_list TEXT[] DEFAULT NULL, prmarc TEXT DEFAULT NULL, rdeleted BOOL DEFAULT TRUE) RETURNS VOID AS $func$
@@ -24495,6 +24610,10 @@ END;
 $func$ LANGUAGE PLPGSQL;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0937', :eg_version);
 
 ALTER TABLE config.record_attr_definition
@@ -24504,6 +24623,10 @@ ALTER TABLE config.coded_value_map
     ADD COLUMN concept_uri TEXT;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0938', :eg_version);
 
 INSERT INTO config.record_attr_definition (name, label, format, xpath, vocabulary) VALUES (
@@ -24848,6 +24971,10 @@ WHERE  tag = '338' AND code = 'a' AND marc_record_type = 'biblio';
 
 END;
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0939', :eg_version);
 
 --create hook for actor.usr.expire_date
@@ -24901,6 +25028,10 @@ INSERT INTO action_trigger.environment (event_def, path) VALUES
     (CURRVAL('action_trigger.event_definition_id_seq'), 'home_ou.billing_address');
        
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0940', :eg_version);
 
 CREATE OR REPLACE FUNCTION evergreen.pg_statistics (tab TEXT, col TEXT) RETURNS TABLE(element TEXT, frequency INT) AS $$
@@ -24936,6 +25067,10 @@ $$ LANGUAGE PLPGSQL STABLE;
 
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0941', :eg_version);
 
 UPDATE authority.control_set_authority_field SET sf_list = REGEXP_REPLACE( sf_list, 'e', '', 'i') WHERE tag = '100' AND control_set = 1 AND  sf_list ILIKE '%e%';
@@ -24943,6 +25078,10 @@ UPDATE authority.control_set_authority_field SET sf_list = REGEXP_REPLACE( sf_li
 UPDATE authority.control_set_authority_field SET sf_list = REGEXP_REPLACE( sf_list, 'e', '', 'i') WHERE tag = '110' AND control_set = 1 AND  sf_list ILIKE '%e%';
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0942', :eg_version);
 
 CREATE OR REPLACE FUNCTION authority.extract_thesaurus( marcxml TEXT ) RETURNS TEXT AS $func$
@@ -25544,6 +25683,10 @@ FROM authority.record_entry b
 WHERE a.record = b.id;
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0943', :eg_version);
 
 INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Type', 'ldr', 'AUT', 6, 1, 'z');
@@ -25568,6 +25711,10 @@ INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, leng
 INSERT INTO config.marc21_ff_pos_map (fixed_field, tag, rec_type,start_pos, length, default_val) VALUES ('Source', '008', 'AUT', 39, 1, ' ');
 
 
+COMMIT;
+
+BEGIN;
+
 SELECT evergreen.upgrade_deps_block_check('0944', :eg_version);
 
 INSERT INTO permission.perm_list (id, code, description)
@@ -25583,7 +25730,11 @@ INSERT INTO permission.perm_list (id, code, description)
     );
 
 
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+COMMIT;
+
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('LLC', :eg_version);
 
 ALTER TABLE config.standing_penalty
       ADD COLUMN ignore_proximity INTEGER;