From: Mike Rylander Date: Tue, 16 Aug 2011 15:14:58 +0000 (-0400) Subject: Stamped upgrade scripts for LP#790329 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e3fd5900b8743458c48876a87304087c1d4c025f;p=working%2FEvergreen.git Stamped upgrade scripts for LP#790329 Signed-off-by: Mike Rylander --- diff --git a/Open-ILS/src/sql/Pg/upgrade/0602.schema.lp790329_opac_copy_count.sql b/Open-ILS/src/sql/Pg/upgrade/0602.schema.lp790329_opac_copy_count.sql index fe805531d7..98782717eb 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0602.schema.lp790329_opac_copy_count.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0602.schema.lp790329_opac_copy_count.sql @@ -1,4 +1,4 @@ -- Placeholder for 2.0-only changes -SELECT evergreen.upgrade_deps_block_check('0601', :eg_version); +INSERT INTO config.upgrade_log (version) VALUES ('0602'); diff --git a/Open-ILS/src/sql/Pg/upgrade/0603.schema.lp790329_opac_lasso_counts.sql b/Open-ILS/src/sql/Pg/upgrade/0603.schema.lp790329_opac_lasso_counts.sql new file mode 100644 index 0000000000..ae25bcefd7 --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0603.schema.lp790329_opac_lasso_counts.sql @@ -0,0 +1,46 @@ +-- Evergreen DB patch XXXX.lp790329_opac_lasso_counts.sql +-- +-- Resolves an error in calculating copy counts for org lassos +-- Per LP 790329 +-- +BEGIN; + + +-- check whether patch can be applied +INSERT INTO config.upgrade_log (version) VALUES ('0603'); + +-- FIXME: add/check SQL statements to perform the upgrade +CREATE OR REPLACE FUNCTION asset.opac_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$ +DECLARE + ans RECORD; + trans INT; +BEGIN + SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid; + + FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP + RETURN QUERY + SELECT -1, + ans.id, + COUNT( av.id ), + SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ), + COUNT( av.id ), + trans + FROM + actor.org_unit_descendants(ans.id) d + JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id) + JOIN asset.copy cp ON (cp.id = av.copy_id) + GROUP BY 1,2,6; + + IF NOT FOUND THEN + RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans; + END IF; + + END LOOP; + + RETURN; +END; +$f$ LANGUAGE PLPGSQL; + + + +COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/0604.schema.lp790329_staff_opac_lasso_counts.sql b/Open-ILS/src/sql/Pg/upgrade/0604.schema.lp790329_staff_opac_lasso_counts.sql new file mode 100644 index 0000000000..7053c8c98d --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/0604.schema.lp790329_staff_opac_lasso_counts.sql @@ -0,0 +1,42 @@ +-- Evergreen DB patch XXXX.lp790329_staff_opac_lasso_counts.sql +-- +-- Staff record copy counts also triggered an SQL error for org lassos +-- Per LP790329 +-- +BEGIN; + +-- check whether patch can be applied +INSERT INTO config.upgrade_log (version) VALUES ('0604'); + +CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$ +DECLARE + ans RECORD; + trans INT; +BEGIN + SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid; + + FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP + RETURN QUERY + SELECT -1, + ans.id, + COUNT( cp.id ), + SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ), + COUNT( cp.id ), + trans + FROM + actor.org_unit_descendants(ans.id) d + JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted) + JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted) + GROUP BY 1,2,6; + + IF NOT FOUND THEN + RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans; + END IF; + + END LOOP; + + RETURN; +END; +$f$ LANGUAGE PLPGSQL; + +COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_opac_lasso_counts.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_opac_lasso_counts.sql deleted file mode 100644 index da3241eac1..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_opac_lasso_counts.sql +++ /dev/null @@ -1,46 +0,0 @@ --- Evergreen DB patch XXXX.lp790329_opac_lasso_counts.sql --- --- Resolves an error in calculating copy counts for org lassos --- Per LP 790329 --- -BEGIN; - - --- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); - --- FIXME: add/check SQL statements to perform the upgrade -CREATE OR REPLACE FUNCTION asset.opac_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$ -DECLARE - ans RECORD; - trans INT; -BEGIN - SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid; - - FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP - RETURN QUERY - SELECT -1, - ans.id, - COUNT( av.id ), - SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ), - COUNT( av.id ), - trans - FROM - actor.org_unit_descendants(ans.id) d - JOIN asset.opac_visible_copies av ON (av.record = rid AND av.circ_lib = d.id) - JOIN asset.copy cp ON (cp.id = av.copy_id) - GROUP BY 1,2,6; - - IF NOT FOUND THEN - RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans; - END IF; - - END LOOP; - - RETURN; -END; -$f$ LANGUAGE PLPGSQL; - - - -COMMIT; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_staff_opac_lasso_counts.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_staff_opac_lasso_counts.sql deleted file mode 100644 index 70b81ac232..0000000000 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.lp790329_staff_opac_lasso_counts.sql +++ /dev/null @@ -1,42 +0,0 @@ --- Evergreen DB patch XXXX.lp790329_staff_opac_lasso_counts.sql --- --- Staff record copy counts also triggered an SQL error for org lassos --- Per LP790329 --- -BEGIN; - --- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); - -CREATE OR REPLACE FUNCTION asset.staff_lasso_record_copy_count (i_lasso INT, rid BIGINT) RETURNS TABLE (depth INT, org_unit INT, visible BIGINT, available BIGINT, unshadow BIGINT, transcendant INT) AS $f$ -DECLARE - ans RECORD; - trans INT; -BEGIN - SELECT 1 INTO trans FROM biblio.record_entry b JOIN config.bib_source src ON (b.source = src.id) WHERE src.transcendant AND b.id = rid; - - FOR ans IN SELECT u.org_unit AS id FROM actor.org_lasso_map AS u WHERE lasso = i_lasso LOOP - RETURN QUERY - SELECT -1, - ans.id, - COUNT( cp.id ), - SUM( CASE WHEN cp.status IN (0,7,12) THEN 1 ELSE 0 END ), - COUNT( cp.id ), - trans - FROM - actor.org_unit_descendants(ans.id) d - JOIN asset.copy cp ON (cp.circ_lib = d.id AND NOT cp.deleted) - JOIN asset.call_number cn ON (cn.record = rid AND cn.id = cp.call_number AND NOT cn.deleted) - GROUP BY 1,2,6; - - IF NOT FOUND THEN - RETURN QUERY SELECT -1, ans.id, 0::BIGINT, 0::BIGINT, 0::BIGINT, trans; - END IF; - - END LOOP; - - RETURN; -END; -$f$ LANGUAGE PLPGSQL; - -COMMIT;