Hashed crosstab was dying with an SPI_finish error when the source SQL

produced no rows. Now it returns 0 rows instead. Adjusted regression
test for this case.

diff --git a/contrib/tablefunc/expected/tablefunc.out b/contrib/tablefunc/expected/tablefunc.out
index 281de5d266301c1997ce91c3fc76d36b8121cacd..472519f62cf6512f1202df01d7f27ee97c9ed853 100644 (file)
--- a/contrib/tablefunc/expected/tablefunc.out
+++ b/contrib/tablefunc/expected/tablefunc.out
@@ -193,6 +193,24 @@ SELECT * FROM crosstab(
   'SELECT DISTINCT rowdt, attribute FROM cth ORDER BY 2')
 AS c(rowid text, rowdt timestamp, temperature int4, test_result text, test_startdate timestamp, volts float8);
 ERROR:  provided "categories" SQL must return 1 column of at least one row
+-- if source query returns zero rows, get zero rows returned
+SELECT * FROM crosstab(
+  'SELECT rowid, rowdt, attribute, val FROM cth WHERE false ORDER BY 1',
+  'SELECT DISTINCT attribute FROM cth ORDER BY 1')
+AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text);
+ rowid | rowdt | temperature | test_result | test_startdate | volts 
+-------+-------+-------------+-------------+----------------+-------
+(0 rows)
+
+-- if source query returns zero rows, get zero rows returned even if category query generates no rows
+SELECT * FROM crosstab(
+  'SELECT rowid, rowdt, attribute, val FROM cth WHERE false ORDER BY 1',
+  'SELECT DISTINCT attribute FROM cth WHERE false ORDER BY 1')
+AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text);
+ rowid | rowdt | temperature | test_result | test_startdate | volts 
+-------+-------+-------------+-------------+----------------+-------
+(0 rows)
+
 --
 -- connectby
 --

diff --git a/contrib/tablefunc/sql/tablefunc.sql b/contrib/tablefunc/sql/tablefunc.sql
index 5292fc2bc785e591fac4cd5175cbe7eebebfeada..c464acbd3b4b3654985940939b022774a29f90af 100644 (file)
--- a/contrib/tablefunc/sql/tablefunc.sql
+++ b/contrib/tablefunc/sql/tablefunc.sql
@@ -88,6 +88,17 @@ SELECT * FROM crosstab(
   'SELECT DISTINCT rowdt, attribute FROM cth ORDER BY 2')
 AS c(rowid text, rowdt timestamp, temperature int4, test_result text, test_startdate timestamp, volts float8);
 
+-- if source query returns zero rows, get zero rows returned
+SELECT * FROM crosstab(
+  'SELECT rowid, rowdt, attribute, val FROM cth WHERE false ORDER BY 1',
+  'SELECT DISTINCT attribute FROM cth ORDER BY 1')
+AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text);
+
+-- if source query returns zero rows, get zero rows returned even if category query generates no rows
+SELECT * FROM crosstab(
+  'SELECT rowid, rowdt, attribute, val FROM cth WHERE false ORDER BY 1',
+  'SELECT DISTINCT attribute FROM cth WHERE false ORDER BY 1')
+AS c(rowid text, rowdt timestamp, temperature text, test_result text, test_startdate text, volts text);
 
 --
 -- connectby

diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 14862533c0942696cf44acb94d008155628c9f21..7ca4e86eb34244246405af8f0f1e1e227b06ce98 100644 (file)
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -831,15 +831,6 @@ load_categories_hash(char *cats_sql, MemoryContext per_query_ctx)
                        MemoryContextSwitchTo(SPIcontext);
                }
        }
-       else
-       {
-               /* no qualifying tuples */
-               SPI_finish();
-               ereport(ERROR,
-                               (errcode(ERRCODE_SYNTAX_ERROR),
-                                errmsg("provided \"categories\" SQL must " \
-                                               "return 1 column of at least one row")));
-       }
 
        if (SPI_finish() != SPI_OK_FINISH)
                /* internal error */
@@ -889,6 +880,15 @@ get_crosstab_tuplestore(char *sql,
                                        j;
                int                     result_ncols;
 
+               if (num_categories == 0)
+               {
+                       /* no qualifying category tuples */
+                       ereport(ERROR,
+                                       (errcode(ERRCODE_SYNTAX_ERROR),
+                                       errmsg("provided \"categories\" SQL must " \
+                                                       "return 1 column of at least one row")));
+               }
+
                /*
                 * The provided SQL query must always return at least three
                 * columns:
@@ -1004,11 +1004,6 @@ get_crosstab_tuplestore(char *sql,
                MemoryContextSwitchTo(SPIcontext);
 
        }
-       else
-       {
-               /* no qualifying tuples */
-               SPI_finish();
-       }
 
        if (SPI_finish() != SPI_OK_FINISH)
                /* internal error */