Skip to content

Commit 0cbd9c8

Browse files
cvvergaracvvergara
committed
Using traversal_types_check
1 parent e4657c6 commit 0cbd9c8

File tree

8 files changed

+41
-110
lines changed

8 files changed

+41
-110
lines changed

‎pgtap/dijkstra/driving_distance/types_check.pg‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(7);
22+
SELECT CASE WHEN min_version('3.6.0') THEN plan(7) ELSE plan(6) END;
2323

24-
SELECT has_function('pgr_drivingdistance');
25-
26-
SELECT has_function('pgr_drivingdistance', ARRAY['text','bigint','double precision','boolean']);
27-
SELECT has_function('pgr_drivingdistance', ARRAY['text','anyarray','double precision','boolean','boolean']);
28-
29-
SELECT function_returns('pgr_drivingdistance', ARRAY['text','bigint','double precision','boolean'],'setof record');
30-
SELECT function_returns('pgr_drivingdistance', ARRAY['text','anyarray','double precision','boolean','boolean'],'setof record');
31-
32-
SELECT CASE
33-
WHEN (min_version('3.6.0')) THEN
34-
collect_tap(
35-
36-
function_args_eq('pgr_drivingdistance',
37-
$$VALUES
38-
('{"","","","directed","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[]),
39-
('{"","","","directed","equicost","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[])
40-
$$),
41-
42-
function_types_eq('pgr_drivingdistance',
43-
$$VALUES
44-
('{text,int8,float8,bool,int8,int8,int8,int8,int8,int8,float8,float8}'::TEXT[]),
45-
('{text,anyarray,float8,bool,bool,int8,int8,int8,int8,int8,int8,float8,float8}'::TEXT[])
46-
$$))
47-
48-
ELSE
49-
collect_tap(
50-
function_args_eq('pgr_drivingdistance',
51-
$$VALUES
52-
('{"","","","directed","seq","node","edge","cost","agg_cost"}'::TEXT[]),
53-
('{"","","","directed","equicost","seq","from_v","node","edge","cost","agg_cost"}'::TEXT[])
54-
$$),
55-
56-
function_types_eq('pgr_drivingdistance',
57-
$$VALUES
58-
('{text,int8,float8,bool,int4,int8,int8,float8,float8}'::TEXT[]),
59-
('{text,anyarray,float8,bool,bool,int4,int8,int8,int8,float8,float8}'::TEXT[])
60-
$$))
61-
END;
24+
SELECT traversal_types_check('pgr_drivingdistance',
25+
opt_names => '{"",directed}'::TEXT[], opt_types => '{float8,bool}'::TEXT[],
26+
standard_v => '3.6.0');
6227

6328
SELECT finish();
6429
ROLLBACK;

‎pgtap/spanningTree/kruskal/kruskalBFS/types_check.pg‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(7);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(7) ELSE plan(6) END;
2323

24-
SELECT spannTree_bfs_types_check('pgr_kruskalbfs'::TEXT);
24+
SELECT traversal_types_check('pgr_kruskalbfs',
25+
opt_names => '{max_depth}'::TEXT[], opt_types => '{int8}'::TEXT[],
26+
standard_v => '3.7.0');
2527

2628
SELECT * FROM finish();
2729
ROLLBACK;

‎pgtap/spanningTree/kruskal/kruskalDD/types_check.pg‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(11);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(14) ELSE plan(12) END;
2323

24-
SELECT spanntree_dd_types_check('pgr_kruskaldd');
24+
SELECT traversal_types_check('pgr_kruskaldd',
25+
opt_names => '{""}'::TEXT[], opt_types => '{float8}'::TEXT[],
26+
standard_v => '3.7.0');
27+
28+
SELECT traversal_types_check('pgr_kruskaldd',
29+
opt_names => '{""}'::TEXT[], opt_types => '{numeric}'::TEXT[],
30+
standard_v => '3.7.0');
2531

2632
SELECT finish();
2733
ROLLBACK;

‎pgtap/spanningTree/kruskal/kruskalDFS/types_check.pg‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(7);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(7) ELSE plan(6) END;
2323

24-
SELECT spannTree_bfs_types_check('pgr_kruskaldfs'::TEXT);
24+
SELECT traversal_types_check('pgr_kruskaldfs',
25+
opt_names => '{max_depth}'::TEXT[], opt_types => '{int8}'::TEXT[],
26+
standard_v => '3.7.0');
2527

2628
SELECT finish();
2729
ROLLBACK;

‎pgtap/spanningTree/prim/primBFS/types_check.pg‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(7);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(7) ELSE plan(6) END;
23+
24+
SELECT traversal_types_check('pgr_primbfs',
25+
opt_names => '{max_depth}'::TEXT[], opt_types => '{int8}'::TEXT[],
26+
standard_v => '3.7.0');
2327

24-
SELECT spannTree_bfs_types_check('pgr_primbfs'::TEXT);
2528

2629
SELECT * FROM finish();
2730
ROLLBACK;

‎pgtap/spanningTree/prim/primDD/types_check.pg‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(11);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(14) ELSE plan(12) END;
2323

24-
SELECT spanntree_dd_types_check('pgr_primdd');
24+
SELECT traversal_types_check('pgr_primdd',
25+
opt_names => '{""}'::TEXT[], opt_types => '{float8}'::TEXT[],
26+
standard_v => '3.7.0');
27+
28+
SELECT traversal_types_check('pgr_primdd',
29+
opt_names => '{""}'::TEXT[], opt_types => '{numeric}'::TEXT[],
30+
standard_v => '3.7.0');
2531

2632
SELECT finish();
2733
ROLLBACK;

‎pgtap/spanningTree/prim/primDFS/types_check.pg‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT plan(7);
22+
SELECT CASE WHEN min_version('3.7.0') THEN plan(7) ELSE plan(6) END;
2323

24-
SELECT spannTree_bfs_types_check('pgr_primdfs'::TEXT);
24+
SELECT traversal_types_check('pgr_primdfs',
25+
opt_names => '{max_depth}'::TEXT[], opt_types => '{int8}'::TEXT[],
26+
standard_v => '3.7.0');
2527

2628
SELECT finish();
2729
ROLLBACK;

‎pgtap/withPoints/withPointsDD/types_check.pg‎

Lines changed: 4 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -19,66 +19,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT CASE WHEN min_version('4.0.0') THEN plan(9) WHEN min_version('3.6.0') THEN plan(7) ELSE plan(2) END;
22+
SELECT CASE WHEN min_version('4.0.0') THEN plan(7) WHEN min_version('3.6.0') THEN plan(6) ELSE plan(2) END;
2323

24-
SELECT has_function('pgr_withpointsdd');
25-
26-
CREATE OR REPLACE FUNCTION test_types_check()
27-
RETURNS SETOF TEXT AS
28-
$BODY$
29-
BEGIN
30-
31-
IF NOT min_version('3.6.0') THEN
32-
RETURN QUERY SELECT skip(1, 'pgr_withPointsDD testing only valid signatures on 4.0.0');
33-
RETURN;
34-
END IF;
35-
36-
RETURN QUERY
37-
SELECT has_function('pgr_withpointsdd', ARRAY['text','text','bigint','double precision','character','boolean','boolean']);
38-
RETURN QUERY
39-
SELECT has_function('pgr_withpointsdd', ARRAY['text','text','anyarray','double precision','character','boolean','boolean','boolean']);
40-
41-
RETURN QUERY
42-
SELECT function_returns('pgr_withpointsdd', ARRAY['text','text','bigint','double precision','character','boolean','boolean'],'setof record');
43-
RETURN QUERY
44-
SELECT function_returns('pgr_withpointsdd', ARRAY['text','text','anyarray','double precision','character','boolean','boolean','boolean'],'setof record');
45-
46-
IF min_version('4.0.0') THEN
47-
RETURN QUERY
48-
SELECT function_args_has('pgr_withpointsdd',
49-
$$VALUES
50-
('{"","","","","","directed","details","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[]),
51-
('{"","","","","","directed","details","equicost","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}')
52-
$$);
53-
54-
RETURN QUERY
55-
SELECT function_types_has('pgr_withpointsdd',
56-
$$VALUES
57-
('{text,text,anyarray,float8,bpchar,bool,bool,bool,int8,int8,int8,int8,int8,int8,float8,float8}'::TEXT[]),
58-
('{text,text,int8,float8,bpchar,bool,bool,int8,int8,int8,int8,int8,int8,float8,float8}')
59-
$$);
60-
61-
END IF;
62-
63-
RETURN QUERY
64-
SELECT function_args_has('pgr_withpointsdd',
65-
$$VALUES
66-
('{"","","","","","directed","details","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}'::TEXT[]),
67-
('{"","","","","","directed","details","equicost","seq","depth","start_vid","pred","node","edge","cost","agg_cost"}')
68-
$$);
69-
70-
RETURN QUERY
71-
SELECT function_types_has('pgr_withpointsdd',
72-
$$VALUES
73-
('{text,text,anyarray,float8,bpchar,bool,bool,bool,int8,int8,int8,int8,int8,int8,float8,float8}'::TEXT[]),
74-
('{text,text,int8,float8,bpchar,bool,bool,int8,int8,int8,int8,int8,int8,float8,float8}')
75-
$$);
76-
77-
END;
78-
$BODY$
79-
language plpgsql;
80-
81-
SELECT test_types_check();
24+
SELECT traversal_types_check('pgr_withpointsdd',
25+
opt_names => '{"","",directed,details}'::TEXT[], opt_types => '{float8,bpchar,bool,bool}'::TEXT[],
26+
standard_v => '4.0.0');
8227

8328
SELECT finish();
8429
ROLLBACK;

0 commit comments

Comments
 (0)