diff options
| author | Andres Freund <andres@anarazel.de> | 2016-09-12 18:15:10 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2016-09-12 18:15:10 -0700 |
| commit | 9f478b4f19d8e26300ae19e42c26343f5791e32a (patch) | |
| tree | ceca7034ef811c001a733d1a3525fd39cb2f5efc /src | |
| parent | bfe16d1a5dec0d23c917c37de646256c71e07ee8 (diff) | |
| download | postgresql-9f478b4f19d8e26300ae19e42c26343f5791e32a.tar.gz postgresql-9f478b4f19d8e26300ae19e42c26343f5791e32a.zip | |
Address portability issues in bfe16d1a5 test output.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/regress/expected/tsrf.out | 37 | ||||
| -rw-r--r-- | src/test/regress/sql/tsrf.sql | 8 |
2 files changed, 19 insertions, 26 deletions
diff --git a/src/test/regress/expected/tsrf.out b/src/test/regress/expected/tsrf.out index 983ce17c839..805e8db9f65 100644 --- a/src/test/regress/expected/tsrf.out +++ b/src/test/regress/expected/tsrf.out @@ -130,39 +130,32 @@ SELECT few.dataa, count(*), min(id), max(id), unnest('{1,1,3}'::int[]) FROM few (2 rows) -- check HAVING works when GROUP BY does [not] reference SRF output -SELECT dataa, generate_series(1,3), count(*) FROM few GROUP BY 1 HAVING count(*) > 1; +SELECT dataa, generate_series(1,1), count(*) FROM few GROUP BY 1 HAVING count(*) > 1; dataa | generate_series | count -------+-----------------+------- a | 1 | 2 - a | 2 | 2 - a | 3 | 2 -(3 rows) +(1 row) -SELECT dataa, generate_series(1,3), count(*) FROM few GROUP BY 1, 2 HAVING count(*) > 1; +SELECT dataa, generate_series(1,1), count(*) FROM few GROUP BY 1, 2 HAVING count(*) > 1; dataa | generate_series | count -------+-----------------+------- a | 1 | 2 - a | 2 | 2 - a | 3 | 2 -(3 rows) +(1 row) -- it's weird to have GROUP BYs that increase the number of results -SELECT few.dataa, count(*), min(id), max(id) FROM few GROUP BY few.dataa; - dataa | count | min | max --------+-------+-----+----- - b | 1 | 3 | 3 - a | 2 | 1 | 2 +SELECT few.dataa, count(*) FROM few WHERE dataa = 'a' GROUP BY few.dataa ORDER BY 2; + dataa | count +-------+------- + a | 2 +(1 row) + +SELECT few.dataa, count(*) FROM few WHERE dataa = 'a' GROUP BY few.dataa, unnest('{1,1,3}'::int[]) ORDER BY 2; + dataa | count +-------+------- + a | 2 + a | 4 (2 rows) -SELECT few.dataa, count(*), min(id), max(id) FROM few GROUP BY few.dataa, unnest('{1,1,3}'::int[]); - dataa | count | min | max --------+-------+-----+----- - b | 2 | 3 | 3 - a | 4 | 1 | 2 - b | 1 | 3 | 3 - a | 2 | 1 | 2 -(4 rows) - -- SRFs are not allowed in aggregate arguments SELECT min(generate_series(1, 3)) FROM few; ERROR: set-valued function called in context that cannot accept a set diff --git a/src/test/regress/sql/tsrf.sql b/src/test/regress/sql/tsrf.sql index 633dfd64c9e..524779581da 100644 --- a/src/test/regress/sql/tsrf.sql +++ b/src/test/regress/sql/tsrf.sql @@ -37,12 +37,12 @@ SELECT few.dataa, count(*), min(id), max(id), unnest('{1,1,3}'::int[]) FROM few SELECT few.dataa, count(*), min(id), max(id), unnest('{1,1,3}'::int[]) FROM few WHERE few.id = 1 GROUP BY few.dataa, 5; -- check HAVING works when GROUP BY does [not] reference SRF output -SELECT dataa, generate_series(1,3), count(*) FROM few GROUP BY 1 HAVING count(*) > 1; -SELECT dataa, generate_series(1,3), count(*) FROM few GROUP BY 1, 2 HAVING count(*) > 1; +SELECT dataa, generate_series(1,1), count(*) FROM few GROUP BY 1 HAVING count(*) > 1; +SELECT dataa, generate_series(1,1), count(*) FROM few GROUP BY 1, 2 HAVING count(*) > 1; -- it's weird to have GROUP BYs that increase the number of results -SELECT few.dataa, count(*), min(id), max(id) FROM few GROUP BY few.dataa; -SELECT few.dataa, count(*), min(id), max(id) FROM few GROUP BY few.dataa, unnest('{1,1,3}'::int[]); +SELECT few.dataa, count(*) FROM few WHERE dataa = 'a' GROUP BY few.dataa ORDER BY 2; +SELECT few.dataa, count(*) FROM few WHERE dataa = 'a' GROUP BY few.dataa, unnest('{1,1,3}'::int[]) ORDER BY 2; -- SRFs are not allowed in aggregate arguments SELECT min(generate_series(1, 3)) FROM few; |