summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Vondra2017-10-08 23:30:44 +0000
committerTomas Vondra2017-10-08 23:31:42 +0000
commit70f0423d8964acb1ed6102fecdef8610511c801e (patch)
treed6765dd0245f0d39a29be4986bf568a31d17b551
parent8d4f6790cb5c0770994516fa5811d6fef9a0a51f (diff)
Fix expected output for plpgsql test suite
Commit 7d55b3a318 accepted incorrect expected output for a number of tests in this suite. The issue might have been initially masked by existence of another .out file for this test. We seem to be producing the correct output, so just use expected output from upstream. Moreover, the table (INT4_TBL) is defined as replicated, so we don't need the explicit ORDER BY clauses as the ordering is stable anyway. So remove them, to make the the tests a bit closer to upstream.
-rw-r--r--src/test/regress/expected/plpgsql.out49
-rw-r--r--src/test/regress/sql/plpgsql.sql10
2 files changed, 37 insertions, 22 deletions
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index dcbe8de32f..6d256f44b8 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -3415,10 +3415,15 @@ begin
close c;
end;
$$ language plpgsql;
-select * from sc_test() order by 1;
- sc_test
----------
-(0 rows)
+select * from sc_test();
+ sc_test
+-------------
+ -2147483647
+ 2147483647
+ -123456
+ 123456
+ 0
+(5 rows)
create or replace function sc_test() returns setof integer as $$
declare
@@ -3434,7 +3439,7 @@ begin
close c;
end;
$$ language plpgsql;
-select * from sc_test() order by 1; -- fails because of NO SCROLL specification
+select * from sc_test(); -- fails because of NO SCROLL specification
ERROR: cursor can only scan forward
HINT: Declare it with SCROLL option to enable backward scan.
CONTEXT: PL/pgSQL function sc_test() line 7 at FETCH
@@ -3452,17 +3457,22 @@ begin
close c;
end;
$$ language plpgsql;
-select * from sc_test() order by 1;
- sc_test
----------
-(0 rows)
+select * from sc_test();
+ sc_test
+-------------
+ -2147483647
+ 2147483647
+ -123456
+ 123456
+ 0
+(5 rows)
create or replace function sc_test() returns setof integer as $$
declare
c refcursor;
x integer;
begin
- open c scroll for execute 'select f1 from int4_tbl order by 1';
+ open c scroll for execute 'select f1 from int4_tbl';
fetch last from c into x;
while found loop
return next x;
@@ -3472,16 +3482,19 @@ begin
end;
$$ language plpgsql;
select * from sc_test();
- sc_test
----------
-(0 rows)
+ sc_test
+-------------
+ -2147483647
+ -123456
+ 0
+(3 rows)
create or replace function sc_test() returns setof integer as $$
declare
c refcursor;
x integer;
begin
- open c scroll for execute 'select f1 from int4_tbl order by 1';
+ open c scroll for execute 'select f1 from int4_tbl';
fetch last from c into x;
while found loop
return next x;
@@ -3492,9 +3505,11 @@ begin
end;
$$ language plpgsql;
select * from sc_test();
- sc_test
----------
-(0 rows)
+ sc_test
+-------------
+ -2147483647
+ 123456
+(2 rows)
create or replace function sc_test() returns setof integer as $$
declare
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index 06a9d187bf..e48090207a 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -2861,7 +2861,7 @@ begin
end;
$$ language plpgsql;
-select * from sc_test() order by 1;
+select * from sc_test();
create or replace function sc_test() returns setof integer as $$
declare
@@ -2878,7 +2878,7 @@ begin
end;
$$ language plpgsql;
-select * from sc_test() order by 1; -- fails because of NO SCROLL specification
+select * from sc_test(); -- fails because of NO SCROLL specification
create or replace function sc_test() returns setof integer as $$
declare
@@ -2895,14 +2895,14 @@ begin
end;
$$ language plpgsql;
-select * from sc_test() order by 1;
+select * from sc_test();
create or replace function sc_test() returns setof integer as $$
declare
c refcursor;
x integer;
begin
- open c scroll for execute 'select f1 from int4_tbl order by 1';
+ open c scroll for execute 'select f1 from int4_tbl';
fetch last from c into x;
while found loop
return next x;
@@ -2919,7 +2919,7 @@ declare
c refcursor;
x integer;
begin
- open c scroll for execute 'select f1 from int4_tbl order by 1';
+ open c scroll for execute 'select f1 from int4_tbl';
fetch last from c into x;
while found loop
return next x;