From ea8b6f60fe20f718d85c4a50ecc8b22bcf7efced Mon Sep 17 00:00:00 2001 From: Jason Stephenson Date: Wed, 2 Mar 2016 09:18:12 -0500 Subject: [PATCH] LP 1505286: Port New Functions to PostgreSQL 9.1 The functions search.facets_for_record_set and search.facets_for_metarecord_set that were added in the 0958 upgrade script from Launchpad Bug #1505286 are not compatible with PostgreSQL 9.1. This commit makes them compatible with Pg 9.1 for those who need it. Signed-off-by: Jason Stephenson Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/300.schema.staged_search.sql | 8 ++++---- Open-ILS/src/sql/Pg/upgrade/0958.schema.limit_facets.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql index e3f96c0052..d5a5f0bc06 100644 --- a/Open-ILS/src/sql/Pg/300.schema.staged_search.sql +++ b/Open-ILS/src/sql/Pg/300.schema.staged_search.sql @@ -440,9 +440,9 @@ CREATE OR REPLACE FUNCTION search.facets_for_record_set(ignore_facet_classes TEX FROM metabib.facet_entry mfae JOIN metabib.metarecord_source_map mmrsm ON (mfae.source = mmrsm.source) JOIN config.metabib_field cmf ON (cmf.id = mfae.field) - WHERE mmrsm.source IN (SELECT * FROM unnest(hits)) + WHERE mmrsm.source IN (SELECT * FROM unnest($2)) AND cmf.facet_field - AND cmf.field_class NOT IN (SELECT * FROM unnest(ignore_facet_classes)) + AND cmf.field_class NOT IN (SELECT * FROM unnest($1)) GROUP by 1, 2 ) all_facets WHERE rownum <= (SELECT COALESCE((SELECT value::INT FROM config.global_flag WHERE name = 'search.max_facets_per_field' AND enabled), 1000)); @@ -459,9 +459,9 @@ CREATE OR REPLACE FUNCTION search.facets_for_metarecord_set(ignore_facet_classes FROM metabib.facet_entry mfae JOIN metabib.metarecord_source_map mmrsm ON (mfae.source = mmrsm.source) JOIN config.metabib_field cmf ON (cmf.id = mfae.field) - WHERE mmrsm.metarecord IN (SELECT * FROM unnest(hits)) + WHERE mmrsm.metarecord IN (SELECT * FROM unnest($2)) AND cmf.facet_field - AND cmf.field_class NOT IN (SELECT * FROM unnest(ignore_facet_classes)) + AND cmf.field_class NOT IN (SELECT * FROM unnest($1)) GROUP by 1, 2 ) all_facets WHERE rownum <= (SELECT COALESCE((SELECT value::INT FROM config.global_flag WHERE name = 'search.max_facets_per_field' AND enabled), 1000)); diff --git a/Open-ILS/src/sql/Pg/upgrade/0958.schema.limit_facets.sql b/Open-ILS/src/sql/Pg/upgrade/0958.schema.limit_facets.sql index a68b448b9a..73d0a29cb5 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0958.schema.limit_facets.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0958.schema.limit_facets.sql @@ -13,9 +13,9 @@ CREATE OR REPLACE FUNCTION search.facets_for_record_set(ignore_facet_classes TEX FROM metabib.facet_entry mfae JOIN metabib.metarecord_source_map mmrsm ON (mfae.source = mmrsm.source) JOIN config.metabib_field cmf ON (cmf.id = mfae.field) - WHERE mmrsm.source IN (SELECT * FROM unnest(hits)) + WHERE mmrsm.source IN (SELECT * FROM unnest($2)) AND cmf.facet_field - AND cmf.field_class NOT IN (SELECT * FROM unnest(ignore_facet_classes)) + AND cmf.field_class NOT IN (SELECT * FROM unnest($1)) GROUP by 1, 2 ) all_facets WHERE rownum <= (SELECT COALESCE((SELECT value::INT FROM config.global_flag WHERE name = 'search.max_facets_per_field' AND enabled), 1000)); @@ -32,9 +32,9 @@ CREATE OR REPLACE FUNCTION search.facets_for_metarecord_set(ignore_facet_classes FROM metabib.facet_entry mfae JOIN metabib.metarecord_source_map mmrsm ON (mfae.source = mmrsm.source) JOIN config.metabib_field cmf ON (cmf.id = mfae.field) - WHERE mmrsm.metarecord IN (SELECT * FROM unnest(hits)) + WHERE mmrsm.metarecord IN (SELECT * FROM unnest($2)) AND cmf.facet_field - AND cmf.field_class NOT IN (SELECT * FROM unnest(ignore_facet_classes)) + AND cmf.field_class NOT IN (SELECT * FROM unnest($1)) GROUP by 1, 2 ) all_facets WHERE rownum <= (SELECT COALESCE((SELECT value::INT FROM config.global_flag WHERE name = 'search.max_facets_per_field' AND enabled), 1000)); -- 2.43.2