Skip to content

Commit e37e448

Browse files
robertmhaasrobertmhaas
committed
Fix new create_function_3 regression tests not to rely on tuple order.
Per buildfarm.
1 parent cd30728 commit e37e448

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CREATE FUNCTION functest_A_3() RETURNS bool LANGUAGE 'sql'
1717
SELECT proname, prorettype::regtype, proargtypes::regtype[] FROM pg_proc
1818
WHERE oid in ('functest_A_1'::regproc,
1919
'functest_A_2'::regproc,
20-
'functest_A_3'::regproc);
20+
'functest_A_3'::regproc) ORDER BY proname;
2121
proname | prorettype | proargtypes
2222
--------------+------------+-------------------
2323
functest_a_1 | boolean | [0:1]={text,date}
@@ -40,7 +40,7 @@ SELECT proname, provolatile FROM pg_proc
4040
WHERE oid in ('functest_B_1'::regproc,
4141
'functest_B_2'::regproc,
4242
'functest_B_3'::regproc,
43-
'functest_B_4'::regproc);
43+
'functest_B_4'::regproc) ORDER BY proname;
4444
proname | provolatile
4545
--------------+-------------
4646
functest_b_1 | v
@@ -55,7 +55,7 @@ SELECT proname, provolatile FROM pg_proc
5555
WHERE oid in ('functest_B_1'::regproc,
5656
'functest_B_2'::regproc,
5757
'functest_B_3'::regproc,
58-
'functest_B_4'::regproc);
58+
'functest_B_4'::regproc) ORDER BY proname;
5959
proname | provolatile
6060
--------------+-------------
6161
functest_b_1 | v
@@ -76,7 +76,7 @@ CREATE FUNCTION functext_C_3(int) RETURNS bool LANGUAGE 'sql'
7676
SELECT proname, prosecdef FROM pg_proc
7777
WHERE oid in ('functext_C_1'::regproc,
7878
'functext_C_2'::regproc,
79-
'functext_C_3'::regproc);
79+
'functext_C_3'::regproc) ORDER BY proname;
8080
proname | prosecdef
8181
--------------+-----------
8282
functext_c_1 | f
@@ -90,7 +90,7 @@ ALTER FUNCTION functext_C_3(int) SECURITY DEFINER;
9090
SELECT proname, prosecdef FROM pg_proc
9191
WHERE oid in ('functext_C_1'::regproc,
9292
'functext_C_2'::regproc,
93-
'functext_C_3'::regproc);
93+
'functext_C_3'::regproc) ORDER BY proname;
9494
proname | prosecdef
9595
--------------+-----------
9696
functext_c_1 | f
@@ -113,7 +113,7 @@ ERROR: COST must be positive
113113
SELECT proname, procost FROM pg_proc
114114
WHERE oid in ('functext_D_1'::regproc,
115115
'functext_D_2'::regproc,
116-
'functext_D_3'::regproc);
116+
'functext_D_3'::regproc) ORDER BY proname;
117117
proname | procost
118118
--------------+---------
119119
functext_d_1 | 100
@@ -127,7 +127,7 @@ ALTER FUNCTION functext_D_3(int,int) COST 0.0001;
127127
SELECT proname, procost FROM pg_proc
128128
WHERE oid in ('functext_D_1'::regproc,
129129
'functext_D_2'::regproc,
130-
'functext_D_3'::regproc);
130+
'functext_D_3'::regproc) ORDER BY proname;
131131
proname | procost
132132
--------------+---------
133133
functext_d_1 | 100
@@ -144,7 +144,7 @@ CREATE FUNCTION functext_E_2(int) RETURNS bool LANGUAGE 'sql'
144144
LEAKPROOF AS 'SELECT $1 > 100';
145145
SELECT proname, proleakproof FROM pg_proc
146146
WHERE oid in ('functext_E_1'::regproc,
147-
'functext_E_2'::regproc);
147+
'functext_E_2'::regproc) ORDER BY proname;
148148
proname | proleakproof
149149
--------------+--------------
150150
functext_e_1 | f
@@ -155,7 +155,7 @@ ALTER FUNCTION functext_E_1(int) LEAKPROOF;
155155
ALTER FUNCTION functext_E_2(int) STABLE; -- unrelated change, no effect
156156
SELECT proname, proleakproof FROM pg_proc
157157
WHERE oid in ('functext_E_1'::regproc,
158-
'functext_E_2'::regproc);
158+
'functext_E_2'::regproc) ORDER BY proname;
159159
proname | proleakproof
160160
--------------+--------------
161161
functext_e_1 | t
@@ -413,7 +413,7 @@ SELECT proname, proisstrict FROM pg_proc
413413
WHERE oid in ('functext_F_1'::regproc,
414414
'functext_F_2'::regproc,
415415
'functext_F_3'::regproc,
416-
'functext_F_4'::regproc);
416+
'functext_F_4'::regproc) ORDER BY proname;
417417
proname | proisstrict
418418
--------------+-------------
419419
functext_f_1 | f
@@ -429,7 +429,7 @@ SELECT proname, proisstrict FROM pg_proc
429429
WHERE oid in ('functext_F_1'::regproc,
430430
'functext_F_2'::regproc,
431431
'functext_F_3'::regproc,
432-
'functext_F_4'::regproc);
432+
'functext_F_4'::regproc) ORDER BY proname;
433433
proname | proisstrict
434434
--------------+-------------
435435
functext_f_1 | f

‎src/test/regress/sql/create_function_3.sql

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CREATE FUNCTION functest_A_3() RETURNS bool LANGUAGE 'sql'
1919
SELECT proname, prorettype::regtype, proargtypes::regtype[] FROM pg_proc
2020
WHERE oid in ('functest_A_1'::regproc,
2121
'functest_A_2'::regproc,
22-
'functest_A_3'::regproc);
22+
'functest_A_3'::regproc) ORDER BY proname;
2323

2424
--
2525
-- IMMUTABLE | STABLE | VOLATILE
@@ -36,15 +36,15 @@ SELECT proname, provolatile FROM pg_proc
3636
WHERE oid in ('functest_B_1'::regproc,
3737
'functest_B_2'::regproc,
3838
'functest_B_3'::regproc,
39-
'functest_B_4'::regproc);
39+
'functest_B_4'::regproc) ORDER BY proname;
4040

4141
ALTER FUNCTION functest_B_2(int) VOLATILE;
4242
ALTER FUNCTION functest_B_3(int) COST 100; -- unrelated change, no effect
4343
SELECT proname, provolatile FROM pg_proc
4444
WHERE oid in ('functest_B_1'::regproc,
4545
'functest_B_2'::regproc,
4646
'functest_B_3'::regproc,
47-
'functest_B_4'::regproc);
47+
'functest_B_4'::regproc) ORDER BY proname;
4848

4949
--
5050
-- SECURITY DEFINER | INVOKER
@@ -58,15 +58,15 @@ CREATE FUNCTION functext_C_3(int) RETURNS bool LANGUAGE 'sql'
5858
SELECT proname, prosecdef FROM pg_proc
5959
WHERE oid in ('functext_C_1'::regproc,
6060
'functext_C_2'::regproc,
61-
'functext_C_3'::regproc);
61+
'functext_C_3'::regproc) ORDER BY proname;
6262

6363
ALTER FUNCTION functext_C_1(int) IMMUTABLE; -- unrelated change, no effect
6464
ALTER FUNCTION functext_C_2(int) SECURITY INVOKER;
6565
ALTER FUNCTION functext_C_3(int) SECURITY DEFINER;
6666
SELECT proname, prosecdef FROM pg_proc
6767
WHERE oid in ('functext_C_1'::regproc,
6868
'functext_C_2'::regproc,
69-
'functext_C_3'::regproc);
69+
'functext_C_3'::regproc) ORDER BY proname;
7070

7171
--
7272
-- COST
@@ -82,15 +82,15 @@ CREATE FUNCTION functext_D_4(int,int) RETURNS int LANGUAGE 'sql'
8282
SELECT proname, procost FROM pg_proc
8383
WHERE oid in ('functext_D_1'::regproc,
8484
'functext_D_2'::regproc,
85-
'functext_D_3'::regproc);
85+
'functext_D_3'::regproc) ORDER BY proname;
8686

8787
ALTER FUNCTION functext_D_1(int,int) STABLE; -- unrelated change, no effect
8888
ALTER FUNCTION functext_D_2(int,int) COST 50;
8989
ALTER FUNCTION functext_D_3(int,int) COST 0.0001;
9090
SELECT proname, procost FROM pg_proc
9191
WHERE oid in ('functext_D_1'::regproc,
9292
'functext_D_2'::regproc,
93-
'functext_D_3'::regproc);
93+
'functext_D_3'::regproc) ORDER BY proname;
9494

9595
--
9696
-- LEAKPROOF
@@ -101,13 +101,13 @@ CREATE FUNCTION functext_E_2(int) RETURNS bool LANGUAGE 'sql'
101101
LEAKPROOF AS 'SELECT $1 > 100';
102102
SELECT proname, proleakproof FROM pg_proc
103103
WHERE oid in ('functext_E_1'::regproc,
104-
'functext_E_2'::regproc);
104+
'functext_E_2'::regproc) ORDER BY proname;
105105

106106
ALTER FUNCTION functext_E_1(int) LEAKPROOF;
107107
ALTER FUNCTION functext_E_2(int) STABLE; -- unrelated change, no effect
108108
SELECT proname, proleakproof FROM pg_proc
109109
WHERE oid in ('functext_E_1'::regproc,
110-
'functext_E_2'::regproc);
110+
'functext_E_2'::regproc) ORDER BY proname;
111111

112112
-- list of built-in leakproof functions
113113
SELECT proname, prorettype::regtype, proargtypes::regtype[]
@@ -129,7 +129,7 @@ SELECT proname, proisstrict FROM pg_proc
129129
WHERE oid in ('functext_F_1'::regproc,
130130
'functext_F_2'::regproc,
131131
'functext_F_3'::regproc,
132-
'functext_F_4'::regproc);
132+
'functext_F_4'::regproc) ORDER BY proname;
133133

134134
ALTER FUNCTION functext_F_1(int) IMMUTABLE; -- unrelated change, no effect
135135
ALTER FUNCTION functext_F_2(int) STRICT;
@@ -138,7 +138,7 @@ SELECT proname, proisstrict FROM pg_proc
138138
WHERE oid in ('functext_F_1'::regproc,
139139
'functext_F_2'::regproc,
140140
'functext_F_3'::regproc,
141-
'functext_F_4'::regproc);
141+
'functext_F_4'::regproc) ORDER BY proname;
142142

143143
-- Cleanups
144144
DROP SCHEMA temp_func_test CASCADE;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy