Skip to content

Commit 531a7bc

Browse files
cvvergaracvvergara
committed
(pgtap/tools) using new functions on tools files
1 parent 2f6959c commit 531a7bc

File tree

6 files changed

+36
-59
lines changed

6 files changed

+36
-59
lines changed

‎tools/testers/astar_pgtap_tests.sql‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ BEGIN
3131
END IF;
3232

3333
IF min_version('3.6.0') AND fn IN('pgr_astar', 'pgr_bdastar') THEN
34-
RETURN QUERY SELECT set_eq(
35-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
34+
RETURN QUERY SELECT function_args_eq(fn,
3635
$$VALUES
3736
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
3837
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
3938
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
4039
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
4140
('{"","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[])
42-
$$, 'Column names');
41+
$$);
4342

4443
RETURN QUERY SELECT function_types_eq(fn,
4544
format($$VALUES
@@ -51,15 +50,14 @@ BEGIN
5150
$$,the_type_numb));
5251

5352
ELSIF min_version('3.2.0') THEN
54-
RETURN QUERY SELECT set_eq(
55-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
53+
RETURN QUERY SELECT function_args_eq(fn,
5654
$$VALUES
5755
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","node","edge","cost","agg_cost"}'::TEXT[]),
5856
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
5957
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","node","edge","cost","agg_cost"}'::TEXT[]),
6058
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
6159
('{"","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[])
62-
$$, 'Old column names');
60+
$$);
6361

6462
RETURN QUERY SELECT function_types_eq(fn,
6563
format($$VALUES
@@ -70,14 +68,13 @@ BEGIN
7068
('{text,text,bool,int4,%1$s,%1$s,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[])
7169
$$,the_type_numb));
7270
ELSE
73-
RETURN QUERY SELECT set_eq(
74-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
71+
RETURN QUERY SELECT function_args_eq(fn,
7572
$$VALUES
7673
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","node","edge","cost","agg_cost"}'::TEXT[]),
7774
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
7875
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","node","edge","cost","agg_cost"}'::TEXT[]),
7976
('{"","","","directed","heuristic","factor","epsilon","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[])
80-
$$, 'Before combinations column names');
77+
$$);
8178

8279
RETURN QUERY SELECT function_types_eq(fn,
8380
format($$VALUES
@@ -124,8 +121,7 @@ BEGIN
124121
END IF;
125122

126123
IF min_version('3.2.0') THEN
127-
RETURN QUERY SELECT set_eq(
128-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
124+
RETURN QUERY SELECT function_args_eq(fn,
129125
$$VALUES
130126
('{"","","directed","heuristic","factor","epsilon","start_vid","end_vid","agg_cost"}'::TEXT[]),
131127
('{"","","","directed","heuristic","factor","epsilon","start_vid","end_vid","agg_cost"}'::TEXT[]),
@@ -143,8 +139,7 @@ BEGIN
143139
('{text,text,bool,int4,%1$s,%1$s,int8,int8,float8}'::TEXT[])
144140
$$,the_type_numb));
145141
ELSE
146-
RETURN QUERY SELECT set_eq(
147-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
142+
RETURN QUERY SELECT function_args_eq(fn,
148143
$$VALUES
149144
('{"","","","directed","heuristic","factor","epsilon","start_vid","end_vid","agg_cost"}'::TEXT[]),
150145
('{"","","","directed","heuristic","factor","epsilon","start_vid","end_vid","agg_cost"}'::TEXT[]),
@@ -183,14 +178,13 @@ BEGIN
183178

184179
RETURN QUERY SELECT function_returns(fn, ARRAY['text','anyarray','boolean','integer',the_type_name,the_type_name],'setof record');
185180

186-
RETURN QUERY SELECT set_eq(
187-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
181+
RETURN QUERY SELECT function_args_eq(fn,
188182
$$VALUES
189183
('{"","","directed","heuristic","factor","epsilon","start_vid","end_vid","agg_cost"}'::TEXT[])
190184
$$);
191185

192-
RETURN QUERY SELECT function_types_eq(fn,
193-
format($$VALUES
186+
RETURN QUERY SELECT function_types_eq(fn,
187+
format($$VALUES
194188
('{text,anyarray,bool,int4,%1$s,%1$s,int8,int8,float8}'::TEXT[])
195189
$$,the_type_numb));
196190

‎tools/testers/dijkstra_pgtap_tests.sql‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,11 @@ BEGIN
151151
IF (min_version('3.5.0') AND fn = 'pgr_dijkstra') THEN
152152
RETURN QUERY SELECT has_function(fn, ARRAY['text','text','boolean']);
153153
RETURN QUERY SELECT function_returns(fn, ARRAY['text','text','boolean'],'setof record');
154-
RETURN QUERY SELECT set_eq(
155-
format($$SELECT proargnames from pg_proc where proname = %1$L$$,fn),
154+
RETURN QUERY SELECT function_args_eq(fn,
156155
$$VALUES
157156
('{"","","directed","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
158157
('{"","","","directed","seq","path_seq","start_vid","end_vid","node","edge","cost","agg_cost"}'::TEXT[])
159-
$$,'proargnames');
158+
$$);
160159

161160
RETURN QUERY SELECT function_types_eq(fn,
162161
$$VALUES
@@ -174,8 +173,7 @@ IF (min_version('3.2.0') AND fn != 'pgr_dijkstra') OR (min_version('3.1.0') AND
174173
RETURN QUERY SELECT has_function(fn, ARRAY['text','text','boolean']);
175174
RETURN QUERY SELECT function_returns(fn, ARRAY['text','text','boolean'],'setof record');
176175

177-
RETURN QUERY SELECT set_eq(
178-
format($$SELECT proargnames from pg_proc where proname = %1$L$$,fn),
176+
RETURN QUERY SELECT function_args_eq(fn,
179177
$$VALUES
180178
('{"","","","directed","seq","path_seq","node","edge","cost","agg_cost"}'::TEXT[]),
181179
('{"","","","directed","seq","path_seq","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),
@@ -194,8 +192,7 @@ IF (min_version('3.2.0') AND fn != 'pgr_dijkstra') OR (min_version('3.1.0') AND
194192
$$);
195193

196194
ELSE
197-
RETURN QUERY SELECT set_eq(
198-
format($$SELECT proargnames from pg_proc where proname = %1$L$$,fn),
195+
RETURN QUERY SELECT function_args_eq(fn,
199196
$$VALUES
200197
('{"","","","directed","seq","path_seq","node","edge","cost","agg_cost"}'::TEXT[]),
201198
('{"","","","directed","seq","path_seq","end_vid","node","edge","cost","agg_cost"}'::TEXT[]),

‎tools/testers/flow_pgtap_tests.sql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ BEGIN
188188
RETURN QUERY SELECT CASE
189189
WHEN min_version('3.2.0') THEN
190190
collect_tap(
191-
set_eq(
192-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$, fn_name),
191+
192+
function_args_eq(fn_name,
193193
$$VALUES
194194
('{"","","","seq","edge","start_vid","end_vid","flow","residual_capacity"}'::TEXT[]),
195195
('{"","","","seq","edge","start_vid","end_vid","flow","residual_capacity"}'::TEXT[]),
@@ -209,8 +209,8 @@ BEGIN
209209
)
210210
ELSE
211211
collect_tap(
212-
set_eq(
213-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$, fn_name),
212+
213+
function_args_eq(fn_name,
214214
$$VALUES
215215
('{"","","","seq","edge","start_vid","end_vid","flow","residual_capacity"}'::TEXT[]),
216216
('{"","","","seq","edge","start_vid","end_vid","flow","residual_capacity"}'::TEXT[]),

‎tools/testers/spanningtree.sql‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ BEGIN
66
RETURN QUERY SELECT has_function(fn, ARRAY['text']);
77
RETURN QUERY SELECT function_returns(fn, ARRAY['text'], 'setof record');
88

9-
RETURN QUERY SELECT set_eq(
10-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
9+
RETURN QUERY SELECT function_args_eq(fn,
1110
$$SELECT '{"","edge","cost"}'::TEXT[] $$
1211
);
1312

@@ -32,8 +31,7 @@ BEGIN
3231

3332
IF NOT min_version('3.7.0') THEN
3433

35-
RETURN QUERY SELECT set_eq(
36-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
34+
RETURN QUERY SELECT function_args_eq(fn,
3735
$$VALUES
3836
('{"","","max_depth","seq","depth","start_vid","node","edge","cost","agg_cost"}'::TEXT[])
3937
$$
@@ -48,8 +46,7 @@ BEGIN
4846

4947
ELSE
5048

51-
RETURN QUERY SELECT set_eq(
52-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
49+
RETURN QUERY SELECT function_args_eq(fn,
5350
$$VALUES
5451
('{"","","max_depth","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[])
5552
$$
@@ -86,8 +83,7 @@ BEGIN
8683

8784
IF NOT min_version('3.7.0') THEN
8885

89-
RETURN QUERY SELECT set_eq(
90-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
86+
RETURN QUERY SELECT function_args_eq(fn,
9187
$$VALUES
9288
('{"","","","seq","depth","start_vid","node","edge","cost","agg_cost"}'::TEXT[])
9389
$$
@@ -106,8 +102,7 @@ BEGIN
106102

107103
ELSE
108104

109-
RETURN QUERY SELECT set_eq(
110-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$,fn),
105+
RETURN QUERY SELECT function_args_eq(fn,
111106
$$VALUES
112107
('{"","","","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[])
113108
$$

‎tools/testers/tsp_pgtap_tests.sql‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@ BEGIN
179179
SELECT array['','start_id','end_id','seq','node','cost','agg_cost'];
180180

181181
RETURN QUERY
182-
SELECT bag_has(
183-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$, fn),
184-
'parameters', 'parameter names');
182+
SELECT function_args_eq(fn, 'parameters');
185183

186184
RETURN QUERY
187185
SELECT function_types_eq(fn,
@@ -218,16 +216,14 @@ BEGIN
218216

219217
-- parameter names
220218
RETURN QUERY
221-
SELECT set_eq(
222-
format($$SELECT proargnames FROM pg_proc WHERE proname = %1$L$$, fn),
219+
SELECT function_args_eq(fn,
223220
$$SELECT '{
224221
"","start_id","end_id",
225222
"max_processing_time",
226223
"tries_per_temperature", "max_changes_per_temperature",
227224
"max_consecutive_non_changes", "initial_temperature",
228225
"final_temperature", "cooling_factor",
229-
"randomize", "seq", "node", "cost", "agg_cost"}'::TEXT[]$$,
230-
fn || ' parameter names'
226+
"randomize", "seq", "node", "cost", "agg_cost"}'::TEXT[]$$
231227
);
232228

233229
RETURN QUERY

‎tools/testers/types_check.sql‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ BEGIN
8282

8383
IF fn = 'pgr_dijkstra' OR fn = 'pgr_withpoints' THEN
8484
RETURN QUERY
85-
SELECT bag_has(
86-
format($$SELECT proargnames from pg_proc where proname = %1$L$$, fn),
85+
SELECT function_args_eq(fn,
8786
format('VALUES (%1$L::TEXT[]),(%2$L::TEXT[]),(%3$L::TEXT[]),(%4$L::TEXT[])',
8887
-- one to one
8988
'{"' || array_to_string(
@@ -101,7 +100,7 @@ BEGIN
101100
'{"' || array_to_string(
102101
params_names || ARRAY['',''] || optional_params_names || return_params_names_start || startend_v || return_params_names_end,'","')
103102
|| '"}'
104-
),'proargnames ' || fn);
103+
));
105104

106105
RETURN QUERY
107106
SELECT function_types_eq(fn,
@@ -127,38 +126,36 @@ BEGIN
127126
IF (min_version('3.1.0') AND fn = 'pgr_dijkstra') OR (min_version('3.2.0') AND fn = 'pgr_withpoints') THEN
128127
-- combinations
129128
RETURN QUERY
130-
SELECT bag_has(
131-
format($$SELECT proargnames from pg_proc where proname = %1$L$$, fn),
129+
SELECT function_args_eq(fn,
132130
format('VALUES (%1$L::TEXT[])',
133131
'{"' || array_to_string(
134132
params_names || ARRAY[''] || optional_params_names || return_params_names_start || startend_v || return_params_names_end,'","')
135133
|| '"}'
136-
),'proargnames ' || fn);
134+
));
137135

138136
RETURN QUERY
139137
SELECT function_types_eq(fn,
140138
format('VALUES (%1$L::TEXT[])',
141139
'{' || array_to_string(
142140
params_numbers || 'text'::TEXT || optional_params_numbers || return_params_numbers_start || '{int8,int8}'::TEXT[] || return_params_numbers_end,',')
143141
|| '}'
144-
),'proallargtypes ' || fn);
142+
));
145143

146144
END IF;
147145
RETURN;
148146
END IF;
149147

150148
-- TODO should be set_eq when old signatures are removed
151149
RETURN QUERY
152-
SELECT bag_has(
153-
format($$SELECT proargnames from pg_proc where proname = %1$L$$, fn),
150+
SELECT function_args_has(fn,
154151
format('VALUES (%1$L::TEXT[]),(%2$L::TEXT[])',
155152
'{"' || array_to_string(
156153
params_names || ARRAY[''] || optional_params_names || return_params_names,'","')
157154
|| '"}',
158155
'{"' || array_to_string(
159156
params_names || ARRAY['',''] || optional_params_names || return_params_names,'","')
160157
|| '"}'
161-
),'proargnames ' || fn);
158+
));
162159

163160
RETURN QUERY
164161
SELECT function_types_has(fn,
@@ -238,15 +235,13 @@ BEGIN
238235
RETURN QUERY SELECT has_function(fn, params_types_words || optional_params_types_words);
239236
RETURN QUERY SELECT function_returns(fn, params_types_words || optional_params_types_words,'setof record');
240237

241-
RETURN QUERY SELECT set_eq(
242-
format($$SELECT proargnames from pg_proc where proname = %1$L$$, fn),
238+
RETURN QUERY SELECT function_args_eq(fn,
243239
format(
244240
$$VALUES (%1$L::TEXT[])$$,
245241
-- one via
246242
'{"' || array_to_string(
247243
params_names || optional_params_names || return_params_names,'","')
248-
|| '"}'),
249-
'proargnames ' || fn);
244+
|| '"}'));
250245

251246
RETURN QUERY SELECT function_types_eq(fn,
252247
format(

0 commit comments

Comments
 (0)