Attached is a patch to fix some recently raised issues that exist in

contrib/tablefunc. Specifically it replaces the use of VIEWs (for needed
composite type creation) with use of CREATE TYPE. It also performs GRANT
EXECUTE ON FUNCTION foo() TO PUBLIC for all of the created functions. There
was also a cosmetic change to two regression files.

Joe Conway

3 files changed, 33 insertions, 22 deletions

diff --git a/contrib/tablefunc/expected/tablefunc.out b/contrib/tablefunc/expected/tablefunc.out
index 95e1b06f89..06d8b41e60 100644
--- a/contrib/tablefunc/expected/tablefunc.out
+++ b/contrib/tablefunc/expected/tablefunc.out
@@ -1,6 +1,6 @@
 --
 -- first, define the functions.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
+-- does not depend on contents of tablefunc.sql.
 --
 \set ECHO none
 --
diff --git a/contrib/tablefunc/sql/tablefunc.sql b/contrib/tablefunc/sql/tablefunc.sql
index 3d58d81407..25b430e4a0 100644
--- a/contrib/tablefunc/sql/tablefunc.sql
+++ b/contrib/tablefunc/sql/tablefunc.sql
@@ -1,6 +1,6 @@
 --
 -- first, define the functions.  Turn off echoing so that expected file
--- does not depend on contents of seg.sql.
+-- does not depend on contents of tablefunc.sql.
 --
 \set ECHO none
 \i tablefunc.sql
diff --git a/contrib/tablefunc/tablefunc.sql.in b/contrib/tablefunc/tablefunc.sql.in
index 92bb5927d1..504d8ee014 100644
--- a/contrib/tablefunc/tablefunc.sql.in
+++ b/contrib/tablefunc/tablefunc.sql.in
@@ -2,26 +2,29 @@ CREATE OR REPLACE FUNCTION normal_rand(int4, float8, float8, int4)
   RETURNS setof float8
   AS 'MODULE_PATHNAME','normal_rand' LANGUAGE 'c' VOLATILE STRICT;
 
-CREATE VIEW tablefunc_crosstab_2 AS
-  SELECT
-    ''::TEXT AS row_name,
-    ''::TEXT AS category_1,
-    ''::TEXT AS category_2;
-
-CREATE VIEW tablefunc_crosstab_3 AS
-  SELECT
-    ''::TEXT AS row_name,
-    ''::TEXT AS category_1,
-    ''::TEXT AS category_2,
-    ''::TEXT AS category_3;
-
-CREATE VIEW tablefunc_crosstab_4 AS
-  SELECT
-    ''::TEXT AS row_name,
-    ''::TEXT AS category_1,
-    ''::TEXT AS category_2,
-    ''::TEXT AS category_3,
-    ''::TEXT AS category_4;
+CREATE TYPE tablefunc_crosstab_2 AS
+(
+  row_name TEXT,
+  category_1 TEXT,
+  category_2 TEXT
+);
+
+CREATE TYPE tablefunc_crosstab_3 AS
+(
+  row_name TEXT,
+  category_1 TEXT,
+  category_2 TEXT,
+  category_3 TEXT
+);
+
+CREATE TYPE tablefunc_crosstab_4 AS
+(
+  row_name TEXT,
+  category_1 TEXT,
+  category_2 TEXT,
+  category_3 TEXT,
+  category_4 TEXT
+);
 
 CREATE OR REPLACE FUNCTION crosstab2(text)
   RETURNS setof tablefunc_crosstab_2
@@ -46,3 +49,11 @@ CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int,text)
 CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int)
   RETURNS setof record
   AS 'MODULE_PATHNAME','connectby_text' LANGUAGE 'c' STABLE STRICT;
+
+GRANT EXECUTE ON FUNCTION normal_rand(int4, float8, float8, int4) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION crosstab2(text) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION crosstab3(text) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION crosstab4(text) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION crosstab(text,int) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION connectby(text,text,text,text,int,text) TO PUBLIC;
+GRANT EXECUTE ON FUNCTION connectby(text,text,text,text,int) TO PUBLIC;