From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 16 Mar 2011 04:34:45 +0000 (+0000)
Subject: Backport r19756 and r19758 for proper namespaces in aggregate functions
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d09f8dea5bd4c8fb14d5ba9979865517fe287d6d;p=working%2FEvergreen.git

Backport r19756 and r19758 for proper namespaces in aggregate functions

Schema creation and recreation tested with PostgreSQL 8.4 and 9.0 and
seems good. Fingers crossed.


git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_2_0@19762 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/sql/Pg/002.functions.aggregate.sql b/Open-ILS/src/sql/Pg/002.functions.aggregate.sql
index fb0c31129d..bf4fcfa387 100644
--- a/Open-ILS/src/sql/Pg/002.functions.aggregate.sql
+++ b/Open-ILS/src/sql/Pg/002.functions.aggregate.sql
@@ -21,7 +21,7 @@ DROP AGGREGATE IF EXISTS array_accum(anyelement) CASCADE;
 DROP AGGREGATE IF EXISTS public.first(anyelement) CASCADE;
 DROP AGGREGATE IF EXISTS public.last(anyelement) CASCADE;
 DROP AGGREGATE IF EXISTS public.agg_text(text) CASCADE;
-DROP AGGREGATE IF EXISTS public.agg_tsvector(tsvector) CASCADE;
+DROP AGGREGATE IF EXISTS public.agg_tsvector(pg_catalog.tsvector) CASCADE;
 
 CREATE AGGREGATE array_accum (
 	sfunc = array_append,
@@ -66,7 +66,7 @@ CREATE AGGREGATE public.agg_text (
 	stype	 = text
 );
 
-CREATE OR REPLACE FUNCTION public.tsvector_concat ( tsvector, tsvector ) RETURNS tsvector AS $$
+CREATE OR REPLACE FUNCTION tsvector_concat ( tsvector, tsvector ) RETURNS pg_catalog.tsvector AS $$
 SELECT
 	CASE	WHEN $1 IS NULL
 			THEN $2
@@ -77,9 +77,9 @@ SELECT
 $$ LANGUAGE SQL STABLE;
 
 CREATE AGGREGATE public.agg_tsvector (
-	sfunc	 = public.tsvector_concat,
-	basetype = tsvector,
-	stype	 = tsvector
+	sfunc	 = tsvector_concat,
+	basetype = pg_catalog.tsvector,
+	stype	 = pg_catalog.tsvector
 );
 
 CREATE OR REPLACE FUNCTION public.explode_array(anyarray) RETURNS SETOF anyelement AS $BODY$