Rough upgrade, sans reingests of bibs and authorities

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
index 7a865a8..e08f2a4 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.12.6-3.0.0-upgrade-db.sql
@@ -2241,7 +2241,8 @@ INSERT INTO asset.copy_vis_attr_cache (target_copy, record, vis_attr_vector)
             cn.record,
             asset.calculate_copy_visibility_attribute_set(cp.id)
       FROM  asset.copy cp
-            JOIN asset.call_number cn ON (cp.call_number = cn.id);
+            JOIN asset.call_number cn ON (cp.call_number = cn.id)
+      WHERE cp.deleted IS FALSE;
 
 -- updating vis cache for biblio.record_entry deferred to end
 
@@ -6786,67 +6787,67 @@ ALTER TABLE biblio.record_entry ENABLE TRIGGER  z_opac_vis_mat_view_tgr;
 
 COMMIT;
 
-\echo ---------------------------------------------------------------------
-\echo Reingest display fields.  This can be canceled via Ctrl-C and run at
-\echo a later time with the following (or similar) SQL:
-\echo
-\echo 'SELECT metabib.reingest_metabib_field_entries(id, TRUE, FALSE, TRUE, TRUE, '
-\echo '    (SELECT ARRAY_AGG(id)::INT[] FROM config.metabib_field WHERE display_field))'
-\echo '    FROM biblio.record_entry WHERE NOT deleted AND id > 0;'
-\echo
-\echo Note that if you cancel now, you will also need to do the authority reingest
-\echo further down in the upgrade script.
-
--- REINGEST DISPLAY ENTRIES
-SELECT metabib.reingest_metabib_field_entries(id, TRUE, FALSE, TRUE, TRUE, 
-    (SELECT ARRAY_AGG(id)::INT[] FROM config.metabib_field WHERE display_field))
-    FROM biblio.record_entry WHERE NOT deleted AND id > 0;
-
-
-\echo ---------------------------------------------------------------------
-\echo Reingest authority records. This can be canceled via Ctrl-C and run
-\echo at a later time; see the upgrade script.  Note that if you cancel now,
-\echo you should consult this upgrade script for the reingest actions required.
-BEGIN;
-
--- add the flag ingest.disable_authority_full_rec if it does not exist
-INSERT INTO config.internal_flag (name, enabled)
-SELECT 'ingest.disable_authority_full_rec', FALSE
-WHERE NOT EXISTS (SELECT 1 FROM config.internal_flag WHERE name = 'ingest.disable_authority_full_rec');
-
-CREATE TEMPORARY TABLE internal_flag_state AS
-    SELECT name, enabled
-    FROM config.internal_flag
-    WHERE name in (
-        'ingest.reingest.force_on_same_marc',
-        'ingest.disable_authority_auto_update',
-        'ingest.disable_authority_full_rec'
-    );
-
-UPDATE config.internal_flag
-SET enabled = TRUE
-WHERE name in (
-    'ingest.reingest.force_on_same_marc',
-    'ingest.disable_authority_auto_update',
-    'ingest.disable_authority_full_rec'
-);
-
-ALTER TABLE authority.record_entry DISABLE TRIGGER a_marcxml_is_well_formed;
-ALTER TABLE authority.record_entry DISABLE TRIGGER b_maintain_901;
-ALTER TABLE authority.record_entry DISABLE TRIGGER c_maintain_control_numbers;
-ALTER TABLE authority.record_entry DISABLE TRIGGER map_thesaurus_to_control_set;
-
-UPDATE authority.record_entry SET id = id WHERE NOT DELETED;
-
-ALTER TABLE authority.record_entry ENABLE TRIGGER a_marcxml_is_well_formed;
-ALTER TABLE authority.record_entry ENABLE TRIGGER b_maintain_901;
-ALTER TABLE authority.record_entry ENABLE TRIGGER c_maintain_control_numbers;
-ALTER TABLE authority.record_entry ENABLE TRIGGER map_thesaurus_to_control_set;
-
--- and restore
-UPDATE config.internal_flag a
-SET enabled = b.enabled
-FROM internal_flag_state b
-WHERE a.name = b.name;
+--\echo ---------------------------------------------------------------------
+--\echo Reingest display fields.  This can be canceled via Ctrl-C and run at
+--\echo a later time with the following (or similar) SQL:
+--\echo
+--\echo 'SELECT metabib.reingest_metabib_field_entries(id, TRUE, FALSE, TRUE, TRUE, '
+--\echo '    (SELECT ARRAY_AGG(id)::INT[] FROM config.metabib_field WHERE display_field))'
+--\echo '    FROM biblio.record_entry WHERE NOT deleted AND id > 0;'
+--\echo
+--\echo Note that if you cancel now, you will also need to do the authority reingest
+--\echo further down in the upgrade script.
+--
+---- REINGEST DISPLAY ENTRIES
+--SELECT metabib.reingest_metabib_field_entries(id, TRUE, FALSE, TRUE, TRUE, 
+--    (SELECT ARRAY_AGG(id)::INT[] FROM config.metabib_field WHERE display_field))
+--    FROM biblio.record_entry WHERE NOT deleted AND id > 0;
+--
+--
+--\echo ---------------------------------------------------------------------
+--\echo Reingest authority records. This can be canceled via Ctrl-C and run
+--\echo at a later time; see the upgrade script.  Note that if you cancel now,
+--\echo you should consult this upgrade script for the reingest actions required.
+--BEGIN;
+--
+---- add the flag ingest.disable_authority_full_rec if it does not exist
+--INSERT INTO config.internal_flag (name, enabled)
+--SELECT 'ingest.disable_authority_full_rec', FALSE
+--WHERE NOT EXISTS (SELECT 1 FROM config.internal_flag WHERE name = 'ingest.disable_authority_full_rec');
+--
+--CREATE TEMPORARY TABLE internal_flag_state AS
+--    SELECT name, enabled
+--    FROM config.internal_flag
+--    WHERE name in (
+--        'ingest.reingest.force_on_same_marc',
+--        'ingest.disable_authority_auto_update',
+--        'ingest.disable_authority_full_rec'
+--    );
+--
+--UPDATE config.internal_flag
+--SET enabled = TRUE
+--WHERE name in (
+--    'ingest.reingest.force_on_same_marc',
+--    'ingest.disable_authority_auto_update',
+--    'ingest.disable_authority_full_rec'
+--);
+--
+--ALTER TABLE authority.record_entry DISABLE TRIGGER a_marcxml_is_well_formed;
+--ALTER TABLE authority.record_entry DISABLE TRIGGER b_maintain_901;
+--ALTER TABLE authority.record_entry DISABLE TRIGGER c_maintain_control_numbers;
+--ALTER TABLE authority.record_entry DISABLE TRIGGER map_thesaurus_to_control_set;
+--
+--UPDATE authority.record_entry SET id = id WHERE NOT DELETED;
+--
+--ALTER TABLE authority.record_entry ENABLE TRIGGER a_marcxml_is_well_formed;
+--ALTER TABLE authority.record_entry ENABLE TRIGGER b_maintain_901;
+--ALTER TABLE authority.record_entry ENABLE TRIGGER c_maintain_control_numbers;
+--ALTER TABLE authority.record_entry ENABLE TRIGGER map_thesaurus_to_control_set;
+--
+---- and restore
+--UPDATE config.internal_flag a
+--SET enabled = b.enabled
+--FROM internal_flag_state b
+--WHERE a.name = b.name;
 
 COMMIT;

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
index bc5e5c9..1ec5bd9 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/3.0.6-3.1.0-upgrade-db.sql
@@ -551,14 +551,13 @@ UPDATE config.record_attr_definition SET tag = '041', sf_list = 'abdefgm' where
 
 SELECT evergreen.upgrade_deps_block_check('1094', :eg_version);
 
-SELECT metabib.reingest_record_attributes (record, '{item_lang}'::TEXT[])
-  FROM (SELECT  DISTINCT record
-          FROM  metabib.real_full_rec
-           WHERE tag = '041'
-                  AND subfield IN ('a','b','d','e','f','g','m')
-       ) x;
-
-
+-- Unnecessary per https://bugs.launchpad.net/evergreen/+bug/1769000
+--SELECT metabib.reingest_record_attributes (record, '{item_lang}'::TEXT[])
+--  FROM (SELECT  DISTINCT record
+--          FROM  metabib.real_full_rec
+--           WHERE tag = '041'
+--                  AND subfield IN ('a','b','d','e','f','g','m')
+--       ) x;
 
 SELECT evergreen.upgrade_deps_block_check('1095', :eg_version);
 
@@ -8932,28 +8931,28 @@ values ('circ.staff_placed_holds_fallback_to_ws_ou','Workstation OU fallback for
 
 COMMIT;
 
-\qecho 
-\qecho Reingesting all records.  This may take a while. 
-\qecho This command can be stopped (control-c) and rerun later if needed: 
-\qecho 
-\qecho DO $FUNC$
-\qecho DECLARE
-\qecho     same_marc BOOL;
-\qecho BEGIN
-\qecho     SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho     UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho     UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
-\qecho     UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
-\qecho END;
-\qecho $FUNC$;
-
-DO $FUNC$
-DECLARE
-    same_marc BOOL;
-BEGIN
-    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
-    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
-END;
-$FUNC$;
+--\qecho 
+--\qecho Reingesting all records.  This may take a while. 
+--\qecho This command can be stopped (control-c) and rerun later if needed: 
+--\qecho 
+--\qecho DO $FUNC$
+--\qecho DECLARE
+--\qecho     same_marc BOOL;
+--\qecho BEGIN
+--\qecho     SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho     UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho     UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
+--\qecho     UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+--\qecho END;
+--\qecho $FUNC$;
+--
+--DO $FUNC$
+--DECLARE
+--    same_marc BOOL;
+--BEGIN
+--    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE biblio.record_entry SET id=id WHERE not deleted AND id > 0;
+--    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+--END;
+--$FUNC$;

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql
new file mode 100644 (file)
index 0000000..3589a55
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/conifer_2.12-3.1-upgrade-db.sql
@@ -0,0 +1,12 @@
+\i 2.12.3-2.12.4-upgrade-db.sql
+\i 2.12.4-2.12.5-upgrade-db.sql
+\i 2.12.5-2.12.6-upgrade-db.sql
+\i 2.12.6-3.0.0-upgrade-db.sql
+\i 3.0.0-3.0.1-upgrade-db.sql
+\i 3.0.1-3.0.2-upgrade-db.sql
+\i 3.0.2-3.0.3-upgrade-db.sql
+\i 3.0.3-3.0.4-upgrade-db.sql
+\i 3.0.4-3.0.5-upgrade-db.sql
+\i 3.0.5-3.0.6-upgrade-db.sql
+\i 3.0.6-3.1.0-upgrade-db.sql
+\i 3.1.0-3.1.1-upgrade-db.sql