From b051ae99087ebcc4adac220c91f7981c5e1280ae Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Thu, 10 Aug 2017 11:16:13 -0400 Subject: [PATCH] Stamping populariy parameter upgrade scripts Also, the org-count parameter function is adjusted to consistently find and count copies by circ lib. Because this parameter is about counting copies on the shelves of libraries, this makes more sense than owing library. Changed in consultation with Kathy Lussier. Signed-off-by: Mike Rylander --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/220.schema.rating.sql | 4 ++-- ...nhouse-use-badge.sql => 1052.data-inhouse-use-badge.sql} | 2 +- ...t-count-badge.sql => 1053.data.org-unit-count-badge.sql} | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{xxxx.data-inhouse-use-badge.sql => 1052.data-inhouse-use-badge.sql} (96%) rename Open-ILS/src/sql/Pg/upgrade/{yyyy.data.org-unit-count-badge.sql => 1053.data.org-unit-count-badge.sql} (82%) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 96e11701c5..f42d9e985f 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -90,7 +90,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 ('1051', :eg_version); -- berick/miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1053', :eg_version); -- kmlussier/miker CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/220.schema.rating.sql b/Open-ILS/src/sql/Pg/220.schema.rating.sql index 242ecb0576..b5e4fb37d4 100644 --- a/Open-ILS/src/sql/Pg/220.schema.rating.sql +++ b/Open-ILS/src/sql/Pg/220.schema.rating.sql @@ -950,13 +950,13 @@ BEGIN ); ANALYZE precalc_copy_filter_bib_list; + -- Use circ rather than owning lib here as that means "on the shelf at..." RETURN QUERY SELECT f.id::INT AS bib, COUNT(DISTINCT cp.circ_lib)::NUMERIC FROM asset.copy cp JOIN precalc_copy_filter_bib_list f ON (cp.id = f.copy) - JOIN asset.call_number cn ON (cn.id = cp.call_number) - WHERE cn.owning_lib = ANY (badge.orgs) GROUP BY 1; + WHERE cp.circ_lib = ANY (badge.orgs) GROUP BY 1; END; $f$ LANGUAGE PLPGSQL STRICT; diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data-inhouse-use-badge.sql b/Open-ILS/src/sql/Pg/upgrade/1052.data-inhouse-use-badge.sql similarity index 96% rename from Open-ILS/src/sql/Pg/upgrade/xxxx.data-inhouse-use-badge.sql rename to Open-ILS/src/sql/Pg/upgrade/1052.data-inhouse-use-badge.sql index 16d3f160bd..b47d39042e 100644 --- a/Open-ILS/src/sql/Pg/upgrade/xxxx.data-inhouse-use-badge.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1052.data-inhouse-use-badge.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1052', :eg_version); CREATE OR REPLACE FUNCTION rating.inhouse_over_time(badge_id INT) RETURNS TABLE (record BIGINT, value NUMERIC) AS $f$ diff --git a/Open-ILS/src/sql/Pg/upgrade/yyyy.data.org-unit-count-badge.sql b/Open-ILS/src/sql/Pg/upgrade/1053.data.org-unit-count-badge.sql similarity index 82% rename from Open-ILS/src/sql/Pg/upgrade/yyyy.data.org-unit-count-badge.sql rename to Open-ILS/src/sql/Pg/upgrade/1053.data.org-unit-count-badge.sql index 8eae7a217c..adb457fae6 100644 --- a/Open-ILS/src/sql/Pg/upgrade/yyyy.data.org-unit-count-badge.sql +++ b/Open-ILS/src/sql/Pg/upgrade/1053.data.org-unit-count-badge.sql @@ -1,6 +1,6 @@ BEGIN; --- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('1053', :eg_version); CREATE OR REPLACE FUNCTION rating.org_unit_count(badge_id INT) RETURNS TABLE (record INT, value NUMERIC) AS $f$ @@ -19,13 +19,13 @@ BEGIN ); ANALYZE precalc_copy_filter_bib_list; + -- Use circ rather than owning lib here as that means "on the shelf at..." RETURN QUERY SELECT f.id::INT AS bib, COUNT(DISTINCT cp.circ_lib)::NUMERIC FROM asset.copy cp JOIN precalc_copy_filter_bib_list f ON (cp.id = f.copy) - JOIN asset.call_number cn ON (cn.id = cp.call_number) - WHERE cn.owning_lib = ANY (badge.orgs) GROUP BY 1; + WHERE cp.circ_lib = ANY (badge.orgs) GROUP BY 1; END; $f$ LANGUAGE PLPGSQL STRICT; -- 2.43.2