From 96fdd22910a21035997fd927a317b58c1ac663ca Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 14 Sep 2015 15:34:47 +0000 Subject: [PATCH] LP#1489955: tweak to work on PostgreSQL 9.1 Stored functions written in SQL cannot use parameter names in their bodies until Pg 9.2. Signed-off-by: Galen Charlton Signed-off-by: Jason Stephenson --- Open-ILS/src/sql/Pg/011.schema.authority.sql | 8 ++++---- ...schema.filter_authority_browse_search_by_thesaurus.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Open-ILS/src/sql/Pg/011.schema.authority.sql b/Open-ILS/src/sql/Pg/011.schema.authority.sql index 014b731f34..8322867060 100644 --- a/Open-ILS/src/sql/Pg/011.schema.authority.sql +++ b/Open-ILS/src/sql/Pg/011.schema.authority.sql @@ -884,9 +884,9 @@ CREATE OR REPLACE FUNCTION authority.simple_heading_search_rank( atag_list INT[] plainto_tsquery('keyword'::regconfig,$2) ptsq(term) WHERE ash.atag = ANY ($1) AND ash.index_vector @@ ptsq.term - AND CASE thesauruses + AND CASE $5 WHEN '' THEN TRUE - ELSE ash.thesaurus = ANY(regexp_split_to_array(thesauruses, ',')) + ELSE ash.thesaurus = ANY(regexp_split_to_array($5, ',')) END ORDER BY ts_rank_cd(ash.index_vector,ptsq.term,14)::numeric + CASE WHEN ash.sort_value LIKE t.term || '%' THEN 2 ELSE 0 END @@ -927,9 +927,9 @@ CREATE OR REPLACE FUNCTION authority.simple_heading_search_heading( atag_list IN plainto_tsquery('keyword'::regconfig,$2) ptsq(term) WHERE ash.atag = ANY ($1) AND ash.index_vector @@ ptsq.term - AND CASE thesauruses + AND CASE $5 WHEN '' THEN TRUE - ELSE ash.thesaurus = ANY(regexp_split_to_array(thesauruses, ',')) + ELSE ash.thesaurus = ANY(regexp_split_to_array($5, ',')) END ORDER BY ash.sort_value LIMIT $4 diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.filter_authority_browse_search_by_thesaurus.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.filter_authority_browse_search_by_thesaurus.sql index b9084ec1cb..b7f2be6361 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.filter_authority_browse_search_by_thesaurus.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.filter_authority_browse_search_by_thesaurus.sql @@ -514,9 +514,9 @@ CREATE OR REPLACE FUNCTION authority.simple_heading_search_rank( atag_list INT[] plainto_tsquery('keyword'::regconfig,$2) ptsq(term) WHERE ash.atag = ANY ($1) AND ash.index_vector @@ ptsq.term - AND CASE thesauruses + AND CASE $5 WHEN '' THEN TRUE - ELSE ash.thesaurus = ANY(regexp_split_to_array(thesauruses, ',')) + ELSE ash.thesaurus = ANY(regexp_split_to_array($5, ',')) END ORDER BY ts_rank_cd(ash.index_vector,ptsq.term,14)::numeric + CASE WHEN ash.sort_value LIKE t.term || '%' THEN 2 ELSE 0 END @@ -557,9 +557,9 @@ CREATE OR REPLACE FUNCTION authority.simple_heading_search_heading( atag_list IN plainto_tsquery('keyword'::regconfig,$2) ptsq(term) WHERE ash.atag = ANY ($1) AND ash.index_vector @@ ptsq.term - AND CASE thesauruses + AND CASE $5 WHEN '' THEN TRUE - ELSE ash.thesaurus = ANY(regexp_split_to_array(thesauruses, ',')) + ELSE ash.thesaurus = ANY(regexp_split_to_array($5, ',')) END ORDER BY ash.sort_value LIMIT $4 -- 2.43.2