Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0cd7878

Browse files
committed
Rename a function to avoid naming conflict in parallel regression tests.
Commit31a8918 added some tests inplpgsql.sql that used a function rather unthinkingly named "foo()".However, rangefuncs.sql has some much older tests that create a functionof that name, and since these test scripts run in parallel, there is achance of failures if the timing is just right. Use another name toavoid that. Per buildfarm (failure seen today on "hamerkop", butprobably it's happened before and not been noticed).
1 parent7919398 commit0cd7878

File tree

2 files changed

+64
-64
lines changed

2 files changed

+64
-64
lines changed

‎src/test/regress/expected/plpgsql.out‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3627,112 +3627,112 @@ drop table tabwithcols;
36273627
--
36283628
-- Tests for composite-type results
36293629
--
3630-
create typefootype as (x int, y varchar);
3630+
create typecompostype as (x int, y varchar);
36313631
-- test: use of variable of composite type in return statement
3632-
create or replace functionfoo() returnsfootype as $$
3632+
create or replace functioncompos() returnscompostype as $$
36333633
declare
3634-
vfootype;
3634+
vcompostype;
36353635
begin
36363636
v := (1, 'hello');
36373637
return v;
36383638
end;
36393639
$$ language plpgsql;
3640-
selectfoo();
3641-
foo
3640+
selectcompos();
3641+
compos
36423642
-----------
36433643
(1,hello)
36443644
(1 row)
36453645

36463646
-- test: use of variable of record type in return statement
3647-
create or replace functionfoo() returnsfootype as $$
3647+
create or replace functioncompos() returnscompostype as $$
36483648
declare
36493649
v record;
36503650
begin
36513651
v := (1, 'hello'::varchar);
36523652
return v;
36533653
end;
36543654
$$ language plpgsql;
3655-
selectfoo();
3656-
foo
3655+
selectcompos();
3656+
compos
36573657
-----------
36583658
(1,hello)
36593659
(1 row)
36603660

36613661
-- test: use of row expr in return statement
3662-
create or replace functionfoo() returnsfootype as $$
3662+
create or replace functioncompos() returnscompostype as $$
36633663
begin
36643664
return (1, 'hello'::varchar);
36653665
end;
36663666
$$ language plpgsql;
3667-
selectfoo();
3668-
foo
3667+
selectcompos();
3668+
compos
36693669
-----------
36703670
(1,hello)
36713671
(1 row)
36723672

36733673
-- this does not work currently (no implicit casting)
3674-
create or replace functionfoo() returnsfootype as $$
3674+
create or replace functioncompos() returnscompostype as $$
36753675
begin
36763676
return (1, 'hello');
36773677
end;
36783678
$$ language plpgsql;
3679-
selectfoo();
3679+
selectcompos();
36803680
ERROR: returned record type does not match expected record type
36813681
DETAIL: Returned type unknown does not match expected type character varying in column 2.
3682-
CONTEXT: PL/pgSQL functionfoo() while casting return value to function's return type
3682+
CONTEXT: PL/pgSQL functioncompos() while casting return value to function's return type
36833683
-- ... but this does
3684-
create or replace functionfoo() returnsfootype as $$
3684+
create or replace functioncompos() returnscompostype as $$
36853685
begin
3686-
return (1, 'hello')::footype;
3686+
return (1, 'hello')::compostype;
36873687
end;
36883688
$$ language plpgsql;
3689-
selectfoo();
3690-
foo
3689+
selectcompos();
3690+
compos
36913691
-----------
36923692
(1,hello)
36933693
(1 row)
36943694

3695-
drop functionfoo();
3695+
drop functioncompos();
36963696
-- test: return a row expr as record.
3697-
create or replace functionfoorec() returns record as $$
3697+
create or replace functioncomposrec() returns record as $$
36983698
declare
36993699
v record;
37003700
begin
37013701
v := (1, 'hello');
37023702
return v;
37033703
end;
37043704
$$ language plpgsql;
3705-
selectfoorec();
3706-
foorec
3705+
selectcomposrec();
3706+
composrec
37073707
-----------
37083708
(1,hello)
37093709
(1 row)
37103710

37113711
-- test: return row expr in return statement.
3712-
create or replace functionfoorec() returns record as $$
3712+
create or replace functioncomposrec() returns record as $$
37133713
begin
37143714
return (1, 'hello');
37153715
end;
37163716
$$ language plpgsql;
3717-
selectfoorec();
3718-
foorec
3717+
selectcomposrec();
3718+
composrec
37193719
-----------
37203720
(1,hello)
37213721
(1 row)
37223722

3723-
drop functionfoorec();
3723+
drop functioncomposrec();
37243724
-- test: row expr in RETURN NEXT statement.
3725-
create or replace functionfoo() returns setoffootype as $$
3725+
create or replace functioncompos() returns setofcompostype as $$
37263726
begin
37273727
for i in 1..3
37283728
loop
37293729
return next (1, 'hello'::varchar);
37303730
end loop;
3731-
return next null::footype;
3732-
return next (2, 'goodbye')::footype;
3731+
return next null::compostype;
3732+
return next (2, 'goodbye')::compostype;
37333733
end;
37343734
$$ language plpgsql;
3735-
select * fromfoo();
3735+
select * fromcompos();
37363736
x | y
37373737
---+---------
37383738
1 | hello
@@ -3742,18 +3742,18 @@ select * from foo();
37423742
2 | goodbye
37433743
(5 rows)
37443744

3745-
drop functionfoo();
3745+
drop functioncompos();
37463746
-- test: use invalid expr in return statement.
3747-
create or replace functionfoo() returnsfootype as $$
3747+
create or replace functioncompos() returnscompostype as $$
37483748
begin
37493749
return 1 + 1;
37503750
end;
37513751
$$ language plpgsql;
3752-
selectfoo();
3752+
selectcompos();
37533753
ERROR: cannot return non-composite value from function returning composite type
3754-
CONTEXT: PL/pgSQL functionfoo() line 3 at RETURN
3755-
drop functionfoo();
3756-
drop typefootype;
3754+
CONTEXT: PL/pgSQL functioncompos() line 3 at RETURN
3755+
drop functioncompos();
3756+
drop typecompostype;
37573757
--
37583758
-- Tests for 8.4's new RAISE features
37593759
--

‎src/test/regress/sql/plpgsql.sql‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2941,22 +2941,22 @@ drop table tabwithcols;
29412941
-- Tests for composite-type results
29422942
--
29432943

2944-
createtypefootypeas (xint, yvarchar);
2944+
createtypecompostypeas (xint, yvarchar);
29452945

29462946
-- test: use of variable of composite type in return statement
2947-
create or replacefunctionfoo() returnsfootypeas $$
2947+
create or replacefunctioncompos() returnscompostypeas $$
29482948
declare
2949-
vfootype;
2949+
vcompostype;
29502950
begin
29512951
v := (1,'hello');
29522952
return v;
29532953
end;
29542954
$$ language plpgsql;
29552955

2956-
selectfoo();
2956+
selectcompos();
29572957

29582958
-- test: use of variable of record type in return statement
2959-
create or replacefunctionfoo() returnsfootypeas $$
2959+
create or replacefunctioncompos() returnscompostypeas $$
29602960
declare
29612961
v record;
29622962
begin
@@ -2965,39 +2965,39 @@ begin
29652965
end;
29662966
$$ language plpgsql;
29672967

2968-
selectfoo();
2968+
selectcompos();
29692969

29702970
-- test: use of row expr in return statement
2971-
create or replacefunctionfoo() returnsfootypeas $$
2971+
create or replacefunctioncompos() returnscompostypeas $$
29722972
begin
29732973
return (1,'hello'::varchar);
29742974
end;
29752975
$$ language plpgsql;
29762976

2977-
selectfoo();
2977+
selectcompos();
29782978

29792979
-- this does not work currently (no implicit casting)
2980-
create or replacefunctionfoo() returnsfootypeas $$
2980+
create or replacefunctioncompos() returnscompostypeas $$
29812981
begin
29822982
return (1,'hello');
29832983
end;
29842984
$$ language plpgsql;
29852985

2986-
selectfoo();
2986+
selectcompos();
29872987

29882988
-- ... but this does
2989-
create or replacefunctionfoo() returnsfootypeas $$
2989+
create or replacefunctioncompos() returnscompostypeas $$
29902990
begin
2991-
return (1,'hello')::footype;
2991+
return (1,'hello')::compostype;
29922992
end;
29932993
$$ language plpgsql;
29942994

2995-
selectfoo();
2995+
selectcompos();
29962996

2997-
dropfunctionfoo();
2997+
dropfunctioncompos();
29982998

29992999
-- test: return a row expr as record.
3000-
create or replacefunctionfoorec() returns recordas $$
3000+
create or replacefunctioncomposrec() returns recordas $$
30013001
declare
30023002
v record;
30033003
begin
@@ -3006,46 +3006,46 @@ begin
30063006
end;
30073007
$$ language plpgsql;
30083008

3009-
selectfoorec();
3009+
selectcomposrec();
30103010

30113011
-- test: return row expr in return statement.
3012-
create or replacefunctionfoorec() returns recordas $$
3012+
create or replacefunctioncomposrec() returns recordas $$
30133013
begin
30143014
return (1,'hello');
30153015
end;
30163016
$$ language plpgsql;
30173017

3018-
selectfoorec();
3018+
selectcomposrec();
30193019

3020-
dropfunctionfoorec();
3020+
dropfunctioncomposrec();
30213021

30223022
-- test: row expr in RETURN NEXT statement.
3023-
create or replacefunctionfoo() returns setoffootypeas $$
3023+
create or replacefunctioncompos() returns setofcompostypeas $$
30243024
begin
30253025
for iin1..3
30263026
loop
30273027
return next (1,'hello'::varchar);
30283028
end loop;
3029-
return nextnull::footype;
3030-
return next (2,'goodbye')::footype;
3029+
return nextnull::compostype;
3030+
return next (2,'goodbye')::compostype;
30313031
end;
30323032
$$ language plpgsql;
30333033

3034-
select*fromfoo();
3034+
select*fromcompos();
30353035

3036-
dropfunctionfoo();
3036+
dropfunctioncompos();
30373037

30383038
-- test: use invalid expr in return statement.
3039-
create or replacefunctionfoo() returnsfootypeas $$
3039+
create or replacefunctioncompos() returnscompostypeas $$
30403040
begin
30413041
return1+1;
30423042
end;
30433043
$$ language plpgsql;
30443044

3045-
selectfoo();
3045+
selectcompos();
30463046

3047-
dropfunctionfoo();
3048-
droptypefootype;
3047+
dropfunctioncompos();
3048+
droptypecompostype;
30493049

30503050
--
30513051
-- Tests for 8.4's new RAISE features

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp