[open-ils-commits] r19756 - trunk/Open-ILS/src/sql/Pg (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-03-15 17:05:49 -0400 (Tue, 15 Mar 2011)
New Revision: 19756

Modified:
   trunk/Open-ILS/src/sql/Pg/002.functions.aggregate.sql
Log:
With some hints from eeevil, tweaked 002.functions.aggregate.sql to work after some search_path mangling.  Haven't smoketested yet, just got past the eg_db_config --create-schema bit with this.



Modified: trunk/Open-ILS/src/sql/Pg/002.functions.aggregate.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.functions.aggregate.sql	2011-03-15 17:19:26 UTC (rev 19755)
+++ trunk/Open-ILS/src/sql/Pg/002.functions.aggregate.sql	2011-03-15 21:05:49 UTC (rev 19756)
@@ -66,7 +66,7 @@
 	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 @@
 $$ 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$