From 17cfae7139d8d7d845b25ec9101ffbb5e36632aa Mon Sep 17 00:00:00 2001 From: Chris Sharp Date: Fri, 20 Nov 2015 23:05:05 -0500 Subject: [PATCH] PINES has already applied 0940 --- .../Pg/version-upgrade/2.8.2-2.8.3-upgrade-db.sql | 65 +++++++++++----------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.8.2-2.8.3-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.8.2-2.8.3-upgrade-db.sql index 3c7abaee9c..b12e6b5bd1 100644 --- a/Open-ILS/src/sql/Pg/version-upgrade/2.8.2-2.8.3-upgrade-db.sql +++ b/Open-ILS/src/sql/Pg/version-upgrade/2.8.2-2.8.3-upgrade-db.sql @@ -780,38 +780,39 @@ END; $func$ LANGUAGE PLPGSQL; -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 $$ -BEGIN - -- This query will die on PG < 9.2, but the function can be created. We just won't use it where we can't. - RETURN QUERY - SELECT e, - f - FROM (SELECT ROW_NUMBER() OVER (), - (f * 100)::INT AS f - FROM (SELECT UNNEST(most_common_elem_freqs) AS f - FROM pg_stats - WHERE tablename = tab - AND attname = col - )x - ) AS f - JOIN (SELECT ROW_NUMBER() OVER (), - e - FROM (SELECT UNNEST(most_common_elems::text::text[]) AS e - FROM pg_stats - WHERE tablename = tab - AND attname = col - )y - ) AS elems USING (row_number); -END; -$$ LANGUAGE PLPGSQL; - -CREATE OR REPLACE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$ -BEGIN - RETURN $1 @@ $2::query_int; -END; -$$ LANGUAGE PLPGSQL STABLE; +-- PINES has already applied this +-- 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 $$ +-- BEGIN +-- -- This query will die on PG < 9.2, but the function can be created. We just won't use it where we can't. +-- RETURN QUERY +-- SELECT e, +-- f +-- FROM (SELECT ROW_NUMBER() OVER (), +-- (f * 100)::INT AS f +-- FROM (SELECT UNNEST(most_common_elem_freqs) AS f +-- FROM pg_stats +-- WHERE tablename = tab +-- AND attname = col +-- )x +-- ) AS f +-- JOIN (SELECT ROW_NUMBER() OVER (), +-- e +-- FROM (SELECT UNNEST(most_common_elems::text::text[]) AS e +-- FROM pg_stats +-- WHERE tablename = tab +-- AND attname = col +-- )y +-- ) AS elems USING (row_number); +-- END; +-- $$ LANGUAGE PLPGSQL; +-- +-- CREATE OR REPLACE FUNCTION evergreen.query_int_wrapper (INT[],TEXT) RETURNS BOOL AS $$ +-- BEGIN +-- RETURN $1 @@ $2::query_int; +-- END; +-- $$ LANGUAGE PLPGSQL STABLE; COMMIT; -- 2.11.0