From a1df0fb6b4735016aacb1f55bf6f8490ba371b11 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:18:42 -0500 Subject: [PATCH 01/35] [lint][pgtap] removing unused files --- .../connectedComponentsV-compare-dijkstra.sql | 73 ---- .../pgtap/connectedComponentsV-innerQuery.sql | 21 - .../notTestingYet/pickDeliver-innerquery.sql | 391 ------------------ .../notTestingYet/pickDeliver-types_check.sql | 55 --- .../notTestingYet/pickDeliver_types_check.sql | 53 --- tools/developer/prim_compare.pending | 53 --- tools/testers/setup.sql | 19 - 7 files changed, 665 deletions(-) delete mode 100644 docqueries/components/pgtap/connectedComponentsV-compare-dijkstra.sql delete mode 100644 docqueries/components/pgtap/connectedComponentsV-innerQuery.sql delete mode 100644 docqueries/pickDeliver/notTestingYet/pickDeliver-innerquery.sql delete mode 100644 docqueries/pickDeliver/notTestingYet/pickDeliver-types_check.sql delete mode 100644 docqueries/pickDeliver/notTestingYet/pickDeliver_types_check.sql delete mode 100644 tools/developer/prim_compare.pending delete mode 100644 tools/testers/setup.sql diff --git a/docqueries/components/pgtap/connectedComponentsV-compare-dijkstra.sql b/docqueries/components/pgtap/connectedComponentsV-compare-dijkstra.sql deleted file mode 100644 index a39d35c3bfa..00000000000 --- a/docqueries/components/pgtap/connectedComponentsV-compare-dijkstra.sql +++ /dev/null @@ -1,73 +0,0 @@ -\i setup.sql - -SELECT plan(1156); - -SET client_min_messages TO ERROR; - -UPDATE edge_table SET cost = cost + 0.001 * id * id, reverse_cost = reverse_cost + 0.001 * id * id; - -CREATE or REPLACE FUNCTION connectedcomponentsv_compare_dijkstra(cant INTEGER default 17) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -inner_sql TEXT; -dijkstra_sql TEXT; -connectedcomponentsv_sql TEXT; -BEGIN - - FOR i IN 1.. cant LOOP - FOR j IN 1.. cant LOOP - - -- DIRECTED - inner_sql := 'SELECT id, source, target, cost, reverse_cost FROM edge_table'; - dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j - || ', true)'; - - connectedcomponentsv_sql := 'SELECT * FROM pgr_connectedcomponentsv($$' || inner_sql || '$$, ' || i || ', ' || j - || ', true)'; - RETURN query SELECT set_eq(connectedcomponentsv_sql, dijkstra_sql, connectedcomponentsv_sql); - - - inner_sql := 'SELECT id, source, target, cost FROM edge_table'; - dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j - || ', true)'; - - connectedcomponentsv_sql := 'SELECT * FROM pgr_connectedcomponentsv($$' || inner_sql || '$$, ' || i || ', ' || j - || ', true)'; - RETURN query SELECT set_eq(connectedcomponentsv_sql, dijkstra_sql, connectedcomponentsv_sql); - - - - -- UNDIRECTED - inner_sql := 'SELECT id, source, target, cost, reverse_cost FROM edge_table'; - dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j - || ', false)'; - - connectedcomponentsv_sql := 'SELECT * FROM pgr_connectedcomponentsv($$' || inner_sql || '$$, ' || i || ', ' || j - || ', false)'; - RETURN query SELECT set_eq(connectedcomponentsv_sql, dijkstra_sql, connectedcomponentsv_sql); - - - inner_sql := 'SELECT id, source, target, cost FROM edge_table'; - dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j - || ', false)'; - - connectedcomponentsv_sql := 'SELECT * FROM pgr_connectedcomponentsv($$' || inner_sql || '$$, ' || i || ', ' || j - || ', false)'; - RETURN query SELECT set_eq(connectedcomponentsv_sql, dijkstra_sql, connectedcomponentsv_sql); - - - END LOOP; - END LOOP; - - RETURN; -END -$BODY$ -language plpgsql; - -SELECT * from connectedcomponentsv_compare_dijkstra(); - - -SELECT * FROM finish(); -ROLLBACK; - diff --git a/docqueries/components/pgtap/connectedComponentsV-innerQuery.sql b/docqueries/components/pgtap/connectedComponentsV-innerQuery.sql deleted file mode 100644 index 8d9af98ec5c..00000000000 --- a/docqueries/components/pgtap/connectedComponentsV-innerQuery.sql +++ /dev/null @@ -1,21 +0,0 @@ -\i setup.sql - -SELECT plan(137); -SET client_min_messages TO ERROR; - - -SELECT has_function('pgr_connectedcomponentsv', - ARRAY['text', 'bigint', 'bigint', 'boolean','boolean']); - -SELECT function_returns('pgr_connectedcomponentsv', - ARRAY['text', 'bigint', 'bigint', 'boolean','boolean'], - 'setof record'); - -SELECT style_dijkstra('pgr_connectedcomponentsv', ', 2, 3)'); -SELECT style_dijkstra('pgr_connectedcomponentsv', ', 2, 3, true)'); -SELECT style_dijkstra('pgr_connectedcomponentsv', ', 2, 3, false)'); - - - -SELECT finish(); -ROLLBACK; diff --git a/docqueries/pickDeliver/notTestingYet/pickDeliver-innerquery.sql b/docqueries/pickDeliver/notTestingYet/pickDeliver-innerquery.sql deleted file mode 100644 index 1b03ee6d2d2..00000000000 --- a/docqueries/pickDeliver/notTestingYet/pickDeliver-innerquery.sql +++ /dev/null @@ -1,391 +0,0 @@ -\i setup.sql - -SELECT plan(122); - -SELECT todo_start('not ready yet'); - -/* A call looks like this -SELECT * INTO pickDeliverResults FROM _pgr_pickdeliver( - $$SELECT * FROM orders ORDER BY id$$, - $$SELECT * FROM vehicles ORDER BY id$$, - $$SELECT * FROM dist_matrix$$, - 30); -*/ - -SELECT has_function('_pgr_pickdeliver', - ARRAY['text', 'text', 'text', 'integer']); - -SELECT function_returns('_pgr_pickdeliver', - ARRAY['text', 'text', 'text', 'integer'], - 'setof record'); - -/* testing the pick/deliver orders*/ -CREATE OR REPLACE FUNCTION test_anyInteger_orders(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'select * from ' || fn || '($$ SELECT '; - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM orders WHERE id = 11$$, - $$SELECT * FROM vehicles ORDER BY id$$, - $$SELECT * FROM dist_matrix$$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT throws_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT throws_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - -/* testing the pick/deliver orders*/ -CREATE OR REPLACE FUNCTION test_anyNumerical_orders(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'select * from ' || fn || '($$ SELECT '; - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM orders WHERE id = 11$$, - $$SELECT * FROM vehicles ORDER BY id$$, - $$SELECT * FROM dist_matrix$$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT lives_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - -/* -testing the pick/deliver vehicles -*/ -CREATE OR REPLACE FUNCTION test_anyInteger_vehicles(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'SELECT * FROM ' || fn || '($$ SELECT * FROM orders WHERE id = 11$$, $$SELECT '; - - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM vehicles $$, - $$SELECT * FROM dist_matrix$$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT throws_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT throws_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - -/* -testing the pick/deliver vehicles - */ -CREATE OR REPLACE FUNCTION test_anyNumerical_vehicles(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'SELECT * FROM ' || fn || '($$ SELECT * FROM orders WHERE id = 11$$, $$ SELECT '; - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM vehicles $$, - $$SELECT * FROM dist_matrix$$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT lives_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - - -/* -testing the pick/deliver matrix -*/ -CREATE OR REPLACE FUNCTION test_anyInteger_matrix(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'SELECT * FROM ' || fn || '( - $$ SELECT * FROM orders WHERE id = 11$$, - $$ SELECT * FROM vehicles $$, - $$ SELECT '; - - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM dist_matrix $$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT throws_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT throws_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - -/* -testing the pick/deliver vehicles - */ -CREATE OR REPLACE FUNCTION test_anyNumerical_matrix(fn TEXT, params TEXT[], parameter TEXT) -RETURNS SETOF TEXT AS -$BODY$ -DECLARE -start_sql TEXT; -end_sql TEXT; -query TEXT; -p TEXT; -BEGIN - start_sql = 'SELECT * FROM ' || fn || '( - $$ SELECT * FROM orders WHERE id = 11$$, - $$ SELECT * FROM vehicles $$, - $$ SELECT '; - - FOREACH p IN ARRAY params LOOP - IF p = parameter THEN CONTINUE; - END IF; - start_sql = start_sql || p || ', '; - END LOOP; - end_sql = ' FROM dist_matrix $$, - 30)'; - - query := start_sql || parameter || '::SMALLINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::INTEGER ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::BIGINT ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::REAL ' || end_sql; - RETURN query SELECT lives_ok(query); - - query := start_sql || parameter || '::FLOAT8 ' || end_sql; - RETURN query SELECT lives_ok(query); -END; -$BODY$ LANGUAGE plpgsql; - - -SELECT test_anyInteger_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'id'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'demand'); - -SELECT test_anyInteger_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'pick_node_id'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'pick_open'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'pick_close'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'pick_service'); - -SELECT test_anyInteger_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'deliver_node_id'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'deliver_open'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'deliver_close'); -SELECT test_anynumerical_orders('_pgr_pickdeliver', - ARRAY['id', 'demand', - 'pick_node_id', 'pick_open', 'pick_close', 'pick_service', - 'deliver_node_id', 'deliver_open', 'deliver_close', 'deliver_service'], - 'deliver_service'); - -/* Currently this are not used TODO add when they are used - 'end_x', 'end_y', 'end_open', 'end_close', 'end_service'], - 'speed' is optional defaults to 1 - 'start_service' is optional defaults to 0 -*/ -/* -without optional: number -*/ -SELECT test_anyInteger_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', - 'start_node_id', 'start_open', 'start_close'], - 'id'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', - 'start_node_id', 'start_open', 'start_close'], - 'capacity'); -SELECT test_anyInteger_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', - 'start_node_id', 'start_open', 'start_close'], - 'start_node_id'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', - 'start_node_id', 'start_open', 'start_close'], - 'start_open'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', - 'start_node_id', 'start_open', 'start_close'], - 'start_close'); - - -/* -with optional: number -*/ -SELECT test_anyInteger_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'id'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'capacity'); -SELECT test_anyInteger_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'number'); -SELECT test_anyInteger_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'start_node_id'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'start_open'); -SELECT test_anyNumerical_vehicles('_pgr_pickdeliver', - ARRAY['id', 'capacity', 'number', - 'start_node_id', 'start_open', 'start_close'], - 'start_close'); - - -/* -Testing the matrix -*/ -SELECT test_anyInteger_matrix('_pgr_pickdeliver', - ARRAY['start_vid', 'end_vid', 'agg_cost'], - 'start_vid'); -SELECT test_anyInteger_matrix('_pgr_pickdeliver', - ARRAY['start_vid', 'end_vid', 'agg_cost'], - 'end_vid'); -SELECT test_anyNumerical_matrix('_pgr_pickdeliver', - ARRAY['start_vid', 'end_vid', 'agg_cost'], - 'agg_cost'); - -SELECT todo_end(); - -SELECT finish(); -ROLLBACK; diff --git a/docqueries/pickDeliver/notTestingYet/pickDeliver-types_check.sql b/docqueries/pickDeliver/notTestingYet/pickDeliver-types_check.sql deleted file mode 100644 index 0244a9451ee..00000000000 --- a/docqueries/pickDeliver/notTestingYet/pickDeliver-types_check.sql +++ /dev/null @@ -1,55 +0,0 @@ - -\i setup.sql - -SELECT plan(3); - -SELECT todo_start('Nothing is really implemented yet'); - -SELECT has_function('_pgr_pickdeliver', ARRAY['text','text', 'text', 'integer']); -SELECT function_returns('_pgr_pickdeliver', ARRAY['text','text', 'text', 'integer'],'setof record'); - - -PREPARE expected_types AS -SELECT -'integer'::text AS t1, -'integer'::text AS t2, -'bigint'::text AS t3, -'integer'::text AS t4, -'bigint'::text AS t5, -'integer'::text AS t6, -'double precision'::text AS t7, -'double precision'::text AS t8, -'double precision'::text AS t9, -'double precision'::text AS t10, -'double precision'::text AS t11, -'double precision'::text AS t12; - -SELECT * INTO pickDeliverResults FROM _pgr_pickdeliver( - $$SELECT * FROM orders WHERE id in (11) $$, - $$SELECT * FROM vehicles $$, - $$SELECT * FROM dist_matrix $$, - 30); - - -PREPARE real_types AS -SELECT pg_typeof(seq)::text AS t1, -pg_typeof(vehicle_number)::text AS t2, -pg_typeof(vehicle_id)::text AS t3, -pg_typeof(vehicle_seq)::text AS t4, -pg_typeof(order_id)::text AS t5, -pg_typeof(stop_type)::text AS t6, -pg_typeof(cargo)::text AS t7, -pg_typeof(travel_time)::text AS t8, -pg_typeof(arrival_time)::text AS t9, -pg_typeof(wait_time)::TEXT AS t10, -pg_typeof(service_time)::TEXT AS t11, -pg_typeof(departure_time)::TEXT AS t12 -FROM pickdeliverResults LIMIT 1; - - -SELECT set_eq('expected_types', 'real_types','_pgr_pickdeliver: SHOULD RETURN expected columns names & types'); - -SELECT todo_end(); - -SELECT finish(); -ROLLBACK; diff --git a/docqueries/pickDeliver/notTestingYet/pickDeliver_types_check.sql b/docqueries/pickDeliver/notTestingYet/pickDeliver_types_check.sql deleted file mode 100644 index bf961298ac8..00000000000 --- a/docqueries/pickDeliver/notTestingYet/pickDeliver_types_check.sql +++ /dev/null @@ -1,53 +0,0 @@ - -\i setup.sql - -SELECT plan(3); - -SELECT todo_start('not ready yet'); - - -SELECT has_function('_pgr_pickdeliver', ARRAY['text','text', 'integer']); -SELECT function_returns('_pgr_pickdeliver', ARRAY['text','text', 'integer'],'setof record'); - -PREPARE expected_types AS -SELECT -'integer'::text AS t1, -'integer'::text AS ta1, -'bigint'::text AS t2, -'integer'::text AS t3, -'bigint'::text AS t4, -'integer'::text AS t5, -'double precision'::text AS t6, -'double precision'::text AS t7, -'double precision'::text AS t8, -'double precision'::text AS t9, -'double precision'::text AS t10, -'double precision'::text AS t11; - -SELECT * INTO pickDeliverResults FROM _pgr_pickdeliverEuclidean( - $$SELECT * FROM orders ORDER BY id$$, - $$SELECT * FROM vehicles ORDER BY id$$, - 30); - - -PREPARE real_types AS -SELECT pg_typeof(seq)::text AS t1, -pg_typeof(vehicle_number)::text AS ta1, -pg_typeof(vehicle_id)::text AS t2, -pg_typeof(stop)::text AS t3, -pg_typeof(order_id)::text AS t4, -pg_typeof(stop_type)::text AS t5, -pg_typeof(cargo)::text AS t6, -pg_typeof(travel_time)::text AS t7, -pg_typeof(arrival_time)::text AS t8, -pg_typeof(wait_time)::TEXT AS t9, -pg_typeof(service_time)::TEXT AS t10, -pg_typeof(departure_time)::TEXT AS t11 -FROM pickdeliverResults LIMIT 1; - -SELECT set_eq('expected_types', 'real_types','_pgr_pickdeliverEuclidean: SHOULD RETURN expected columns names & types'); - -SELECT todo_end(); - -SELECT finish(); -ROLLBACK; diff --git a/tools/developer/prim_compare.pending b/tools/developer/prim_compare.pending deleted file mode 100644 index adba0d938d0..00000000000 --- a/tools/developer/prim_compare.pending +++ /dev/null @@ -1,53 +0,0 @@ -\i setup.sql - -SELECT plan(5); - -PREPARE prim1 AS -SELECT * FROM pgr_prim( - 'SELECT id, source, target, cost, reverse_cost - FROM edge_table', 18 -); - -PREPARE prim2 AS -SELECT * -FROM pgr_prim( - 'SELECT id, source, target, cost - FROM edge_table', 20 -); - -PREPARE prim3 AS -SELECT * -FROM pgr_prim( - 'SELECT id, source, target, cost, reverse_cost - FROM edge_table ORDER BY id', 4 -) WHERE cost < 0; - -SELECT is_empty('prim1', '1: No_edge'); -SELECT is_empty('prim2', 'Node 18: This node does not exists'); -SELECT is_empty('prim3', 'No cost can be negative'); - -PREPARE prim4 AS -SELECT * -FROM pgr_prim( - 'SELECT id, source, target, cost, reverse_cost - FROM edge_table where id = 17' -); - -PREPARE prim5 AS -SELECT * -FROM pgr_prim( - 'SELECT id, source, target, cost, reverse_cost - FROM edge_table ', 14 -); - -PREPARE prim6 AS -SELECT * -FROM pgr_prim( - 'SELECT id, source, target, cost, reverse_cost - FROM edge_table ', 16 -); - -SELECT set_eq( 'prim4', 'prim5', '4: Spanning of edge 17'); -SELECT set_eq('prim6', 'VALUES (1, 16, 16, -1, 0, 0, 0), (2, 16, 17, 18, 1, 1, 1)' , '5: Compare when node is 16 with actual result'); - - diff --git a/tools/testers/setup.sql b/tools/testers/setup.sql deleted file mode 100644 index dd144a02412..00000000000 --- a/tools/testers/setup.sql +++ /dev/null @@ -1,19 +0,0 @@ -\set QUIET 1 - --- --- Tests for pgTAP. --- --- --- Format the output for nice TAP. -\pset format unaligned -\pset tuples_only true -\pset pager - --- Revert all changes on failure. -\set ON_ERROR_ROLLBACK 1 -\set ON_ERROR_STOP true - -SET client_min_messages TO WARNING; - -BEGIN; - From 5af47bf59b789bcfe33c248cb4d41ea3718f2a73 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 02/35] [allpairs] [pgtap] fixing codacy PLSQL error --- pgtap/allpairs/compare-directed.test.sql | 2 +- pgtap/allpairs/compare-undirected.test.sql | 2 +- pgtap/allpairs/floydWarshall-innerQuery.sql | 2 +- pgtap/allpairs/fw-types-check.sql | 2 +- pgtap/allpairs/j-types-check.sql | 2 +- pgtap/allpairs/johnson-innerQuery.sql | 2 +- pgtap/allpairs/no_crash_test-floydWarshall.sql | 2 +- pgtap/allpairs/no_crash_test-johnson.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pgtap/allpairs/compare-directed.test.sql b/pgtap/allpairs/compare-directed.test.sql index 49c4d95cdba..983a6101df0 100644 --- a/pgtap/allpairs/compare-directed.test.sql +++ b/pgtap/allpairs/compare-directed.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(15); diff --git a/pgtap/allpairs/compare-undirected.test.sql b/pgtap/allpairs/compare-undirected.test.sql index 0cf62793bf9..dfc0992c8f3 100644 --- a/pgtap/allpairs/compare-undirected.test.sql +++ b/pgtap/allpairs/compare-undirected.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/allpairs/floydWarshall-innerQuery.sql b/pgtap/allpairs/floydWarshall-innerQuery.sql index 72b0ad78a7f..81f51853bc9 100644 --- a/pgtap/allpairs/floydWarshall-innerQuery.sql +++ b/pgtap/allpairs/floydWarshall-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(98); diff --git a/pgtap/allpairs/fw-types-check.sql b/pgtap/allpairs/fw-types-check.sql index c46a1eaa7ca..1cae6870d56 100644 --- a/pgtap/allpairs/fw-types-check.sql +++ b/pgtap/allpairs/fw-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/allpairs/j-types-check.sql b/pgtap/allpairs/j-types-check.sql index df4914ebb2b..e4715e9c49b 100644 --- a/pgtap/allpairs/j-types-check.sql +++ b/pgtap/allpairs/j-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/allpairs/johnson-innerQuery.sql b/pgtap/allpairs/johnson-innerQuery.sql index 6a6d9a3155c..f124a2cd2fc 100644 --- a/pgtap/allpairs/johnson-innerQuery.sql +++ b/pgtap/allpairs/johnson-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(98); diff --git a/pgtap/allpairs/no_crash_test-floydWarshall.sql b/pgtap/allpairs/no_crash_test-floydWarshall.sql index 349e9f07f91..62dcc86391b 100644 --- a/pgtap/allpairs/no_crash_test-floydWarshall.sql +++ b/pgtap/allpairs/no_crash_test-floydWarshall.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/allpairs/no_crash_test-johnson.sql b/pgtap/allpairs/no_crash_test-johnson.sql index 896dee36b96..46cbacfa4d7 100644 --- a/pgtap/allpairs/no_crash_test-johnson.sql +++ b/pgtap/allpairs/no_crash_test-johnson.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); From 7c18f25818e679f914ab6a1c7184a12af308b5d1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 03/35] [alpha_shape] [pgtap] fixing codacy PLSQL error --- pgtap/alpha_shape/issue-544.sql | 2 +- pgtap/alpha_shape/no_crash_test-alphashp.sql | 2 +- pgtap/alpha_shape/notebook-test.sql | 2 +- pgtap/alpha_shape/s_shape-test.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgtap/alpha_shape/issue-544.sql b/pgtap/alpha_shape/issue-544.sql index e86297a2659..19705ea95d8 100644 --- a/pgtap/alpha_shape/issue-544.sql +++ b/pgtap/alpha_shape/issue-544.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(3); diff --git a/pgtap/alpha_shape/no_crash_test-alphashp.sql b/pgtap/alpha_shape/no_crash_test-alphashp.sql index 810e4f44fd8..c1d0f9c2e9a 100644 --- a/pgtap/alpha_shape/no_crash_test-alphashp.sql +++ b/pgtap/alpha_shape/no_crash_test-alphashp.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/alpha_shape/notebook-test.sql b/pgtap/alpha_shape/notebook-test.sql index 366af807759..e373860da0a 100644 --- a/pgtap/alpha_shape/notebook-test.sql +++ b/pgtap/alpha_shape/notebook-test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; /* Data from diff --git a/pgtap/alpha_shape/s_shape-test.sql b/pgtap/alpha_shape/s_shape-test.sql index ac9962e463c..a0ac9482668 100644 --- a/pgtap/alpha_shape/s_shape-test.sql +++ b/pgtap/alpha_shape/s_shape-test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; /* data from From 3d699ca3e03fdb5535a908b8c2ea745f8cb73fef Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 04/35] [astar] [pgtap] fixing codacy PLSQL error --- pgtap/astar/aStar-group-innerQuery.sql | 2 +- pgtap/astar/aStarCost-group-innerQuery.sql | 2 +- pgtap/astar/aStarCost_empty_combinations_empty_result.test.sql | 2 +- pgtap/astar/aStar_empty_combinations_empty_result.test.sql | 2 +- pgtap/astar/astar_ManyToMany-compare-dijkstra.test.sql | 2 +- pgtap/astar/astar_ManyToOne-compare-dijkstra.test.sql | 2 +- pgtap/astar/astar_oneToMany-compare-dijkstra.test.sql | 2 +- pgtap/astar/astar_oneToOne-compare-dijkstra.test.sql | 2 +- pgtap/astar/astar_oneToOne-types-check.sql | 2 +- pgtap/astar/many_to_many_eq_combinations.test.sql | 2 +- pgtap/astar/no_crash_test-astar.sql | 2 +- pgtap/astar/no_crash_test-astarCost.sql | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pgtap/astar/aStar-group-innerQuery.sql b/pgtap/astar/aStar-group-innerQuery.sql index 369e22b0b02..bef8f2c690d 100644 --- a/pgtap/astar/aStar-group-innerQuery.sql +++ b/pgtap/astar/aStar-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (418) ELSE plan(417) END; diff --git a/pgtap/astar/aStarCost-group-innerQuery.sql b/pgtap/astar/aStarCost-group-innerQuery.sql index b659bccac44..a36e6e4afec 100644 --- a/pgtap/astar/aStarCost-group-innerQuery.sql +++ b/pgtap/astar/aStarCost-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (418) ELSE plan(417) END; diff --git a/pgtap/astar/aStarCost_empty_combinations_empty_result.test.sql b/pgtap/astar/aStarCost_empty_combinations_empty_result.test.sql index b48da5b578a..943a938b016 100644 --- a/pgtap/astar/aStarCost_empty_combinations_empty_result.test.sql +++ b/pgtap/astar/aStarCost_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/astar/aStar_empty_combinations_empty_result.test.sql b/pgtap/astar/aStar_empty_combinations_empty_result.test.sql index 68cbc65c2b1..c88752c5459 100644 --- a/pgtap/astar/aStar_empty_combinations_empty_result.test.sql +++ b/pgtap/astar/aStar_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/astar/astar_ManyToMany-compare-dijkstra.test.sql b/pgtap/astar/astar_ManyToMany-compare-dijkstra.test.sql index 6bc23e15d40..944298c6a17 100644 --- a/pgtap/astar/astar_ManyToMany-compare-dijkstra.test.sql +++ b/pgtap/astar/astar_ManyToMany-compare-dijkstra.test.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(4); diff --git a/pgtap/astar/astar_ManyToOne-compare-dijkstra.test.sql b/pgtap/astar/astar_ManyToOne-compare-dijkstra.test.sql index 1356aecca40..4f35e718dca 100644 --- a/pgtap/astar/astar_ManyToOne-compare-dijkstra.test.sql +++ b/pgtap/astar/astar_ManyToOne-compare-dijkstra.test.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(68); diff --git a/pgtap/astar/astar_oneToMany-compare-dijkstra.test.sql b/pgtap/astar/astar_oneToMany-compare-dijkstra.test.sql index 724439e064e..f6727c742a0 100644 --- a/pgtap/astar/astar_oneToMany-compare-dijkstra.test.sql +++ b/pgtap/astar/astar_oneToMany-compare-dijkstra.test.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(68); diff --git a/pgtap/astar/astar_oneToOne-compare-dijkstra.test.sql b/pgtap/astar/astar_oneToOne-compare-dijkstra.test.sql index 687348cd46f..2d55517207f 100644 --- a/pgtap/astar/astar_oneToOne-compare-dijkstra.test.sql +++ b/pgtap/astar/astar_oneToOne-compare-dijkstra.test.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(612); diff --git a/pgtap/astar/astar_oneToOne-types-check.sql b/pgtap/astar/astar_oneToOne-types-check.sql index bd054e7d291..166084d1676 100644 --- a/pgtap/astar/astar_oneToOne-types-check.sql +++ b/pgtap/astar/astar_oneToOne-types-check.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(116); diff --git a/pgtap/astar/many_to_many_eq_combinations.test.sql b/pgtap/astar/many_to_many_eq_combinations.test.sql index 65826b27b6c..6d1ccfe82e6 100644 --- a/pgtap/astar/many_to_many_eq_combinations.test.sql +++ b/pgtap/astar/many_to_many_eq_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(2); diff --git a/pgtap/astar/no_crash_test-astar.sql b/pgtap/astar/no_crash_test-astar.sql index 6688729f946..859fd46ba44 100644 --- a/pgtap/astar/no_crash_test-astar.sql +++ b/pgtap/astar/no_crash_test-astar.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/astar/no_crash_test-astarCost.sql b/pgtap/astar/no_crash_test-astarCost.sql index ecdf97e1c25..45893e36ea4 100644 --- a/pgtap/astar/no_crash_test-astarCost.sql +++ b/pgtap/astar/no_crash_test-astarCost.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); From 1200aa5ae95e7b88a2f0cb028cfe2abf9d830490 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 05/35] [bdAstar] [pgtap] fixing codacy PLSQL error --- pgtap/bdAstar/bdAstar-compare-dijkstra.sql | 2 +- pgtap/bdAstar/bdAstar-innerQuery.sql | 2 +- pgtap/bdAstar/bdAstar-parameter-types-check.sql | 2 +- pgtap/bdAstar/bdAstar-return-types-check.sql | 2 +- pgtap/bdAstar/bdAstarCost-innerQuery.sql | 2 +- pgtap/bdAstar/bdAstarCostMatrix-innerQuery.sql | 2 +- .../bdAstarCost_empty_combinations_empty_result.test.sql | 2 +- pgtap/bdAstar/bdAstar_empty_combinations_empty_result.test.sql | 2 +- pgtap/bdAstar/issue1733.sql | 2 +- pgtap/bdAstar/many_to_many_eq_combinations.test.sql | 2 +- pgtap/bdAstar/no_crash_test-bdastar.sql | 2 +- pgtap/bdAstar/no_crash_test-bdastarCost.sql | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pgtap/bdAstar/bdAstar-compare-dijkstra.sql b/pgtap/bdAstar/bdAstar-compare-dijkstra.sql index d4cee59a730..c7a0377a433 100644 --- a/pgtap/bdAstar/bdAstar-compare-dijkstra.sql +++ b/pgtap/bdAstar/bdAstar-compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SET client_min_messages TO ERROR; diff --git a/pgtap/bdAstar/bdAstar-innerQuery.sql b/pgtap/bdAstar/bdAstar-innerQuery.sql index b04d589175e..b86ebf81476 100644 --- a/pgtap/bdAstar/bdAstar-innerQuery.sql +++ b/pgtap/bdAstar/bdAstar-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (418) ELSE plan(417) END; diff --git a/pgtap/bdAstar/bdAstar-parameter-types-check.sql b/pgtap/bdAstar/bdAstar-parameter-types-check.sql index ea08c23ffca..9b81e24e8cf 100644 --- a/pgtap/bdAstar/bdAstar-parameter-types-check.sql +++ b/pgtap/bdAstar/bdAstar-parameter-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(8); diff --git a/pgtap/bdAstar/bdAstar-return-types-check.sql b/pgtap/bdAstar/bdAstar-return-types-check.sql index 4081342808e..2932b2371c4 100644 --- a/pgtap/bdAstar/bdAstar-return-types-check.sql +++ b/pgtap/bdAstar/bdAstar-return-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/bdAstar/bdAstarCost-innerQuery.sql b/pgtap/bdAstar/bdAstarCost-innerQuery.sql index 89f0ee18e41..aeb6458b694 100644 --- a/pgtap/bdAstar/bdAstarCost-innerQuery.sql +++ b/pgtap/bdAstar/bdAstarCost-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (418) ELSE plan(417) END; diff --git a/pgtap/bdAstar/bdAstarCostMatrix-innerQuery.sql b/pgtap/bdAstar/bdAstarCostMatrix-innerQuery.sql index b4cc57208e3..133f6df529e 100644 --- a/pgtap/bdAstar/bdAstarCostMatrix-innerQuery.sql +++ b/pgtap/bdAstar/bdAstarCostMatrix-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(206); diff --git a/pgtap/bdAstar/bdAstarCost_empty_combinations_empty_result.test.sql b/pgtap/bdAstar/bdAstarCost_empty_combinations_empty_result.test.sql index cb11d8801f2..b6c3b98914a 100644 --- a/pgtap/bdAstar/bdAstarCost_empty_combinations_empty_result.test.sql +++ b/pgtap/bdAstar/bdAstarCost_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bdAstar/bdAstar_empty_combinations_empty_result.test.sql b/pgtap/bdAstar/bdAstar_empty_combinations_empty_result.test.sql index 3a9b03f038e..b681e89b0b8 100644 --- a/pgtap/bdAstar/bdAstar_empty_combinations_empty_result.test.sql +++ b/pgtap/bdAstar/bdAstar_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bdAstar/issue1733.sql b/pgtap/bdAstar/issue1733.sql index c0586361ae3..6b8fd652341 100644 --- a/pgtap/bdAstar/issue1733.sql +++ b/pgtap/bdAstar/issue1733.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(3); diff --git a/pgtap/bdAstar/many_to_many_eq_combinations.test.sql b/pgtap/bdAstar/many_to_many_eq_combinations.test.sql index 910fd290fe0..c0e5a104e21 100644 --- a/pgtap/bdAstar/many_to_many_eq_combinations.test.sql +++ b/pgtap/bdAstar/many_to_many_eq_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(2); diff --git a/pgtap/bdAstar/no_crash_test-bdastar.sql b/pgtap/bdAstar/no_crash_test-bdastar.sql index 93baf84a2bc..9f54a06e4ee 100644 --- a/pgtap/bdAstar/no_crash_test-bdastar.sql +++ b/pgtap/bdAstar/no_crash_test-bdastar.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/bdAstar/no_crash_test-bdastarCost.sql b/pgtap/bdAstar/no_crash_test-bdastarCost.sql index 46d6a7449e8..e1ae64c853b 100644 --- a/pgtap/bdAstar/no_crash_test-bdastarCost.sql +++ b/pgtap/bdAstar/no_crash_test-bdastarCost.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); From 2a4ab3f9a34755e7ffbb02e0c5eaec2f54a81459 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 06/35] [bdDijkstra] [pgtap] fixing codacy PLSQL error --- pgtap/bdDijkstra/bdDijkstra-compare-dijkstra.sql | 2 +- pgtap/bdDijkstra/bdDijkstra-innerQuery.sql | 2 +- pgtap/bdDijkstra/bdDijkstra-types-check.sql | 2 +- pgtap/bdDijkstra/bdDijkstraCost-innerQuery.sql | 2 +- .../bdDijkstraCost_empty_combinations_empty_result.test.sql | 2 +- .../bdDijkstra_empty_combinations_empty_result.test.sql | 2 +- pgtap/bdDijkstra/many_to_many_eq_combinations.test.sql | 2 +- pgtap/bdDijkstra/no_crash_test-bdDijkstra.sql | 2 +- pgtap/bdDijkstra/no_crash_test-bdDijkstraCost.sql | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pgtap/bdDijkstra/bdDijkstra-compare-dijkstra.sql b/pgtap/bdDijkstra/bdDijkstra-compare-dijkstra.sql index fc8edacf573..0b6a91d48bf 100644 --- a/pgtap/bdDijkstra/bdDijkstra-compare-dijkstra.sql +++ b/pgtap/bdDijkstra/bdDijkstra-compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SET client_min_messages TO ERROR; diff --git a/pgtap/bdDijkstra/bdDijkstra-innerQuery.sql b/pgtap/bdDijkstra/bdDijkstra-innerQuery.sql index 9153b4fc374..06c59e6a9ee 100644 --- a/pgtap/bdDijkstra/bdDijkstra-innerQuery.sql +++ b/pgtap/bdDijkstra/bdDijkstra-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan(658) ELSE plan(657) END; diff --git a/pgtap/bdDijkstra/bdDijkstra-types-check.sql b/pgtap/bdDijkstra/bdDijkstra-types-check.sql index 220099c5ba8..ed84c5ea96b 100644 --- a/pgtap/bdDijkstra/bdDijkstra-types-check.sql +++ b/pgtap/bdDijkstra/bdDijkstra-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/bdDijkstra/bdDijkstraCost-innerQuery.sql b/pgtap/bdDijkstra/bdDijkstraCost-innerQuery.sql index baf0eb45c8d..ba52bc2b565 100644 --- a/pgtap/bdDijkstra/bdDijkstraCost-innerQuery.sql +++ b/pgtap/bdDijkstra/bdDijkstraCost-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan(658) ELSE plan(657) END; diff --git a/pgtap/bdDijkstra/bdDijkstraCost_empty_combinations_empty_result.test.sql b/pgtap/bdDijkstra/bdDijkstraCost_empty_combinations_empty_result.test.sql index 74fefe17686..502a1ff89d0 100644 --- a/pgtap/bdDijkstra/bdDijkstraCost_empty_combinations_empty_result.test.sql +++ b/pgtap/bdDijkstra/bdDijkstraCost_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bdDijkstra/bdDijkstra_empty_combinations_empty_result.test.sql b/pgtap/bdDijkstra/bdDijkstra_empty_combinations_empty_result.test.sql index 0fd5336247e..1928af43b84 100644 --- a/pgtap/bdDijkstra/bdDijkstra_empty_combinations_empty_result.test.sql +++ b/pgtap/bdDijkstra/bdDijkstra_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bdDijkstra/many_to_many_eq_combinations.test.sql b/pgtap/bdDijkstra/many_to_many_eq_combinations.test.sql index 1d587944e40..86c674ff75b 100644 --- a/pgtap/bdDijkstra/many_to_many_eq_combinations.test.sql +++ b/pgtap/bdDijkstra/many_to_many_eq_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(2); diff --git a/pgtap/bdDijkstra/no_crash_test-bdDijkstra.sql b/pgtap/bdDijkstra/no_crash_test-bdDijkstra.sql index cbdc55ad7cf..6703dcc6482 100644 --- a/pgtap/bdDijkstra/no_crash_test-bdDijkstra.sql +++ b/pgtap/bdDijkstra/no_crash_test-bdDijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/bdDijkstra/no_crash_test-bdDijkstraCost.sql b/pgtap/bdDijkstra/no_crash_test-bdDijkstraCost.sql index 925321ef931..78dd6faa553 100644 --- a/pgtap/bdDijkstra/no_crash_test-bdDijkstraCost.sql +++ b/pgtap/bdDijkstra/no_crash_test-bdDijkstraCost.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); From 16faf9b704f5e8117f11dd2841f53efee7335f79 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 07/35] [bellman_ford] [pgtap] fixing codacy PLSQL error --- .../bellman_ford/bellman_ford/bellman_ford-compare-dijkstra.sql | 2 +- pgtap/bellman_ford/bellman_ford/bellman_ford-innerQuery.sql | 2 +- pgtap/bellman_ford/bellman_ford/bellman_ford-typesCheck.sql | 2 +- .../bellman_ford/empty_combinations_empty_result.test.sql | 2 +- .../bellman_ford/many_to_many_eq_combinations.test.sql | 2 +- .../bellman_ford/no_crash_test-bellmanFord.test.sql | 2 +- pgtap/bellman_ford/edwardMoore/edwardMoore-compare-dijkstra.sql | 2 +- pgtap/bellman_ford/edwardMoore/edwardMoore-innerQuery.sql | 2 +- pgtap/bellman_ford/edwardMoore/edwardMoore-types-check.sql | 2 +- .../edwardMoore/empty_combinations_empty_result.test.sql | 2 +- .../edwardMoore/many_to_many_eq_combinations.test.sql | 2 +- pgtap/bellman_ford/edwardMoore/no_crash_test-edwardMoore.sql | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pgtap/bellman_ford/bellman_ford/bellman_ford-compare-dijkstra.sql b/pgtap/bellman_ford/bellman_ford/bellman_ford-compare-dijkstra.sql index 6c70ac79fe7..f3ad5d22d73 100644 --- a/pgtap/bellman_ford/bellman_ford/bellman_ford-compare-dijkstra.sql +++ b/pgtap/bellman_ford/bellman_ford/bellman_ford-compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1156); diff --git a/pgtap/bellman_ford/bellman_ford/bellman_ford-innerQuery.sql b/pgtap/bellman_ford/bellman_ford/bellman_ford-innerQuery.sql index 7e424b481d5..a78afefb1e0 100644 --- a/pgtap/bellman_ford/bellman_ford/bellman_ford-innerQuery.sql +++ b/pgtap/bellman_ford/bellman_ford/bellman_ford-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(378); diff --git a/pgtap/bellman_ford/bellman_ford/bellman_ford-typesCheck.sql b/pgtap/bellman_ford/bellman_ford/bellman_ford-typesCheck.sql index fa7b942d11b..29fe8f2a4a3 100644 --- a/pgtap/bellman_ford/bellman_ford/bellman_ford-typesCheck.sql +++ b/pgtap/bellman_ford/bellman_ford/bellman_ford-typesCheck.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (18) ELSE plan(15) END; diff --git a/pgtap/bellman_ford/bellman_ford/empty_combinations_empty_result.test.sql b/pgtap/bellman_ford/bellman_ford/empty_combinations_empty_result.test.sql index fc5d5e61bea..acd44ec70c0 100644 --- a/pgtap/bellman_ford/bellman_ford/empty_combinations_empty_result.test.sql +++ b/pgtap/bellman_ford/bellman_ford/empty_combinations_empty_result.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bellman_ford/bellman_ford/many_to_many_eq_combinations.test.sql b/pgtap/bellman_ford/bellman_ford/many_to_many_eq_combinations.test.sql index ee2d506eaac..d66799322cc 100644 --- a/pgtap/bellman_ford/bellman_ford/many_to_many_eq_combinations.test.sql +++ b/pgtap/bellman_ford/bellman_ford/many_to_many_eq_combinations.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bellman_ford/bellman_ford/no_crash_test-bellmanFord.test.sql b/pgtap/bellman_ford/bellman_ford/no_crash_test-bellmanFord.test.sql index 1bccb368f92..235a521be39 100644 --- a/pgtap/bellman_ford/bellman_ford/no_crash_test-bellmanFord.test.sql +++ b/pgtap/bellman_ford/bellman_ford/no_crash_test-bellmanFord.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/bellman_ford/edwardMoore/edwardMoore-compare-dijkstra.sql b/pgtap/bellman_ford/edwardMoore/edwardMoore-compare-dijkstra.sql index 41c75262774..ed13275e55e 100644 --- a/pgtap/bellman_ford/edwardMoore/edwardMoore-compare-dijkstra.sql +++ b/pgtap/bellman_ford/edwardMoore/edwardMoore-compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1156); diff --git a/pgtap/bellman_ford/edwardMoore/edwardMoore-innerQuery.sql b/pgtap/bellman_ford/edwardMoore/edwardMoore-innerQuery.sql index 0016f94066b..eb39b914ba6 100644 --- a/pgtap/bellman_ford/edwardMoore/edwardMoore-innerQuery.sql +++ b/pgtap/bellman_ford/edwardMoore/edwardMoore-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(378); diff --git a/pgtap/bellman_ford/edwardMoore/edwardMoore-types-check.sql b/pgtap/bellman_ford/edwardMoore/edwardMoore-types-check.sql index cb46c4730db..865cb54894b 100644 --- a/pgtap/bellman_ford/edwardMoore/edwardMoore-types-check.sql +++ b/pgtap/bellman_ford/edwardMoore/edwardMoore-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (18) ELSE plan(15) END; diff --git a/pgtap/bellman_ford/edwardMoore/empty_combinations_empty_result.test.sql b/pgtap/bellman_ford/edwardMoore/empty_combinations_empty_result.test.sql index 7287d814b8a..2fb3f45f2b6 100644 --- a/pgtap/bellman_ford/edwardMoore/empty_combinations_empty_result.test.sql +++ b/pgtap/bellman_ford/edwardMoore/empty_combinations_empty_result.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bellman_ford/edwardMoore/many_to_many_eq_combinations.test.sql b/pgtap/bellman_ford/edwardMoore/many_to_many_eq_combinations.test.sql index 5a4e7616d1a..fe4bf033b02 100644 --- a/pgtap/bellman_ford/edwardMoore/many_to_many_eq_combinations.test.sql +++ b/pgtap/bellman_ford/edwardMoore/many_to_many_eq_combinations.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/bellman_ford/edwardMoore/no_crash_test-edwardMoore.sql b/pgtap/bellman_ford/edwardMoore/no_crash_test-edwardMoore.sql index 88defea567a..fa46256b30c 100644 --- a/pgtap/bellman_ford/edwardMoore/no_crash_test-edwardMoore.sql +++ b/pgtap/bellman_ford/edwardMoore/no_crash_test-edwardMoore.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); From 0a365c73896bff9760d2f7ef27f1e65b91ad075f Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 08/35] [breadthFirstSearch] [pgtap] fixing codacy PLSQL error --- .../binaryBreadthFirstSearch-compare-dijkstra.sql | 2 +- .../binaryBreadthFirstSearch-edge-cases.sql | 2 +- .../binaryBreadthFirstSearch-innerQuery.sql | 2 +- .../binaryBreadthFirstSearch-types-check.sql | 2 +- .../empty_combinations_empty_result.test.sql | 2 +- .../many_to_many_eq_combinations.test.sql | 2 +- .../no_crash_test-binaryBreadthFirstSearch.sql | 2 +- .../breadthFirstSearch/breadthFirstSearch-edge-cases.sql | 2 +- .../breadthFirstSearch/breadthFirstSearch-innerQuery.sql | 2 +- .../breadthFirstSearch/breadthFirstSearch-types-check.sql | 2 +- .../breadthFirstSearch/no_crash_test-breadthFirstSearch.sql | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-compare-dijkstra.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-compare-dijkstra.sql index c0d4e7920f7..b2204c24fbe 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-compare-dijkstra.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1156); diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-edge-cases.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-edge-cases.sql index 0b78136745d..486daa8b0f6 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-edge-cases.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(18); diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-innerQuery.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-innerQuery.sql index e55b066041f..379d3ea7d95 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-innerQuery.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(378); diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-types-check.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-types-check.sql index 54e07156db4..32b00cc1b4d 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-types-check.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/binaryBreadthFirstSearch-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (18) ELSE plan(15) END; diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/empty_combinations_empty_result.test.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/empty_combinations_empty_result.test.sql index 633b0e97290..95c57b08e49 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/empty_combinations_empty_result.test.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/empty_combinations_empty_result.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/many_to_many_eq_combinations.test.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/many_to_many_eq_combinations.test.sql index 2297f6140c5..75b8c79ba67 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/many_to_many_eq_combinations.test.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/many_to_many_eq_combinations.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/no_crash_test-binaryBreadthFirstSearch.sql b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/no_crash_test-binaryBreadthFirstSearch.sql index cc8f886a853..7e6b8b61797 100644 --- a/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/no_crash_test-binaryBreadthFirstSearch.sql +++ b/pgtap/breadthFirstSearch/binaryBreadthFirstSearch/no_crash_test-binaryBreadthFirstSearch.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i no_crash_general.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-edge-cases.sql b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-edge-cases.sql index 8618e16f529..3108589f693 100644 --- a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-edge-cases.sql +++ b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(29); diff --git a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-innerQuery.sql b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-innerQuery.sql index 2f50066f800..1b894af0258 100644 --- a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-innerQuery.sql +++ b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(432); diff --git a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-types-check.sql b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-types-check.sql index 2c3b84af4bf..e21ac609cc7 100644 --- a/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-types-check.sql +++ b/pgtap/breadthFirstSearch/breadthFirstSearch/breadthFirstSearch-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); diff --git a/pgtap/breadthFirstSearch/breadthFirstSearch/no_crash_test-breadthFirstSearch.sql b/pgtap/breadthFirstSearch/breadthFirstSearch/no_crash_test-breadthFirstSearch.sql index 2fd71b33eb9..41feb1393a9 100644 --- a/pgtap/breadthFirstSearch/breadthFirstSearch/no_crash_test-breadthFirstSearch.sql +++ b/pgtap/breadthFirstSearch/breadthFirstSearch/no_crash_test-breadthFirstSearch.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(86); From cd15cc9021c6428d2c4348707ec8bb4d848f463d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 09/35] [chinese] [pgtap] fixing codacy PLSQL error --- pgtap/chinese/chinesePostman/innerQuery.sql | 2 +- pgtap/chinese/chinesePostman/types-check.sql | 2 +- pgtap/chinese/chinesePostmanCost/innerQuery.sql | 2 +- pgtap/chinese/chinesePostmanCost/types-check.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgtap/chinese/chinesePostman/innerQuery.sql b/pgtap/chinese/chinesePostman/innerQuery.sql index 5ca6c2812b0..3f87886ee9e 100644 --- a/pgtap/chinese/chinesePostman/innerQuery.sql +++ b/pgtap/chinese/chinesePostman/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/chinese/chinesePostman/types-check.sql b/pgtap/chinese/chinesePostman/types-check.sql index 3da18e69966..4ea0e897cc0 100644 --- a/pgtap/chinese/chinesePostman/types-check.sql +++ b/pgtap/chinese/chinesePostman/types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/chinese/chinesePostmanCost/innerQuery.sql b/pgtap/chinese/chinesePostmanCost/innerQuery.sql index 3df7a9343b3..34756edc35d 100644 --- a/pgtap/chinese/chinesePostmanCost/innerQuery.sql +++ b/pgtap/chinese/chinesePostmanCost/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/chinese/chinesePostmanCost/types-check.sql b/pgtap/chinese/chinesePostmanCost/types-check.sql index 8c34d56a473..54970c7d75d 100644 --- a/pgtap/chinese/chinesePostmanCost/types-check.sql +++ b/pgtap/chinese/chinesePostmanCost/types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); From 318a56e14f0f4a5a5b662e15634600a7762d93ea Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 10/35] [coloring] [pgtap] fixing codacy PLSQL error --- pgtap/coloring/bipartite/edge-cases.sql | 2 +- pgtap/coloring/bipartite/innerQuery.sql | 2 +- pgtap/coloring/bipartite/no_crash_test.sql | 2 +- pgtap/coloring/bipartite/types_check.sql | 2 +- pgtap/coloring/edgeColoring/edge-cases.sql | 2 +- pgtap/coloring/edgeColoring/innerQuery.sql | 2 +- pgtap/coloring/edgeColoring/no_crash_test.sql | 2 +- pgtap/coloring/edgeColoring/types_check.sql | 2 +- pgtap/coloring/sequentialVertexColoring/edge_cases.sql | 2 +- pgtap/coloring/sequentialVertexColoring/inner_query.sql | 2 +- pgtap/coloring/sequentialVertexColoring/no_crash_test.sql | 2 +- pgtap/coloring/sequentialVertexColoring/types_check.sql | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pgtap/coloring/bipartite/edge-cases.sql b/pgtap/coloring/bipartite/edge-cases.sql index 83bcf967397..d68fde82d25 100644 --- a/pgtap/coloring/bipartite/edge-cases.sql +++ b/pgtap/coloring/bipartite/edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(16) END; diff --git a/pgtap/coloring/bipartite/innerQuery.sql b/pgtap/coloring/bipartite/innerQuery.sql index 13296113a5f..62db92b7969 100644 --- a/pgtap/coloring/bipartite/innerQuery.sql +++ b/pgtap/coloring/bipartite/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(54) END; diff --git a/pgtap/coloring/bipartite/no_crash_test.sql b/pgtap/coloring/bipartite/no_crash_test.sql index 854eec3f723..660ef341c3c 100644 --- a/pgtap/coloring/bipartite/no_crash_test.sql +++ b/pgtap/coloring/bipartite/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(7) END; diff --git a/pgtap/coloring/bipartite/types_check.sql b/pgtap/coloring/bipartite/types_check.sql index 4cb87423b87..e583682e097 100644 --- a/pgtap/coloring/bipartite/types_check.sql +++ b/pgtap/coloring/bipartite/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(5) END; diff --git a/pgtap/coloring/edgeColoring/edge-cases.sql b/pgtap/coloring/edgeColoring/edge-cases.sql index e59a0e2ae78..ebf90788b67 100644 --- a/pgtap/coloring/edgeColoring/edge-cases.sql +++ b/pgtap/coloring/edgeColoring/edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.3.0') THEN plan(1) ELSE plan(27) END; diff --git a/pgtap/coloring/edgeColoring/innerQuery.sql b/pgtap/coloring/edgeColoring/innerQuery.sql index 700c512b1eb..3729010689b 100644 --- a/pgtap/coloring/edgeColoring/innerQuery.sql +++ b/pgtap/coloring/edgeColoring/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.3.0') THEN plan(1) ELSE plan(54) END; diff --git a/pgtap/coloring/edgeColoring/no_crash_test.sql b/pgtap/coloring/edgeColoring/no_crash_test.sql index 812c1acfbe9..9aa3729558a 100644 --- a/pgtap/coloring/edgeColoring/no_crash_test.sql +++ b/pgtap/coloring/edgeColoring/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.3.0') THEN plan(1) ELSE plan(7) END; diff --git a/pgtap/coloring/edgeColoring/types_check.sql b/pgtap/coloring/edgeColoring/types_check.sql index 2c9cf4e3693..ec08ac945ef 100644 --- a/pgtap/coloring/edgeColoring/types_check.sql +++ b/pgtap/coloring/edgeColoring/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.3.0') THEN plan(1) ELSE plan(5) END; diff --git a/pgtap/coloring/sequentialVertexColoring/edge_cases.sql b/pgtap/coloring/sequentialVertexColoring/edge_cases.sql index 0333c959d3a..723e688cba1 100644 --- a/pgtap/coloring/sequentialVertexColoring/edge_cases.sql +++ b/pgtap/coloring/sequentialVertexColoring/edge_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(18) END; diff --git a/pgtap/coloring/sequentialVertexColoring/inner_query.sql b/pgtap/coloring/sequentialVertexColoring/inner_query.sql index e57e51fd8e8..f849595b317 100644 --- a/pgtap/coloring/sequentialVertexColoring/inner_query.sql +++ b/pgtap/coloring/sequentialVertexColoring/inner_query.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(54) END; diff --git a/pgtap/coloring/sequentialVertexColoring/no_crash_test.sql b/pgtap/coloring/sequentialVertexColoring/no_crash_test.sql index 5cc074bed51..b49e18ce63f 100644 --- a/pgtap/coloring/sequentialVertexColoring/no_crash_test.sql +++ b/pgtap/coloring/sequentialVertexColoring/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(7) END; diff --git a/pgtap/coloring/sequentialVertexColoring/types_check.sql b/pgtap/coloring/sequentialVertexColoring/types_check.sql index 69882cf81d0..3844287653b 100644 --- a/pgtap/coloring/sequentialVertexColoring/types_check.sql +++ b/pgtap/coloring/sequentialVertexColoring/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(5) END; From 47c5486e87ffbcba1ce3a4e2bb52b7bc8e3ad9a9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 11/35] [common] [pgtap] fixing codacy PLSQL error --- pgtap/common/checkVertTab.test.sql | 2 +- pgtap/common/getColumnName.test.sql | 2 +- pgtap/common/getColumnType.test.sql | 2 +- pgtap/common/getTableName.test.sql | 2 +- pgtap/common/isColumnInTable.test.sql | 2 +- pgtap/common/isColumnIndexed.test.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pgtap/common/checkVertTab.test.sql b/pgtap/common/checkVertTab.test.sql index 2da40735227..3c175cf6245 100644 --- a/pgtap/common/checkVertTab.test.sql +++ b/pgtap/common/checkVertTab.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(12); diff --git a/pgtap/common/getColumnName.test.sql b/pgtap/common/getColumnName.test.sql index 0b90dd5a7b8..00625c4d4fc 100644 --- a/pgtap/common/getColumnName.test.sql +++ b/pgtap/common/getColumnName.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(32); diff --git a/pgtap/common/getColumnType.test.sql b/pgtap/common/getColumnType.test.sql index 0cf27b6a78a..75d1f7f7368 100644 --- a/pgtap/common/getColumnType.test.sql +++ b/pgtap/common/getColumnType.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(21); diff --git a/pgtap/common/getTableName.test.sql b/pgtap/common/getTableName.test.sql index ae7944e1df0..8e5dc8fc3ba 100644 --- a/pgtap/common/getTableName.test.sql +++ b/pgtap/common/getTableName.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(35); diff --git a/pgtap/common/isColumnInTable.test.sql b/pgtap/common/isColumnInTable.test.sql index 283bc894460..ae365491b8e 100644 --- a/pgtap/common/isColumnInTable.test.sql +++ b/pgtap/common/isColumnInTable.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/common/isColumnIndexed.test.sql b/pgtap/common/isColumnIndexed.test.sql index 287d5e41207..776f19f85dd 100644 --- a/pgtap/common/isColumnIndexed.test.sql +++ b/pgtap/common/isColumnIndexed.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(60); From 08845ad19bf8c0688d0ab319df7ecc627e05d2cc Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 12/35] [components] [pgtap] fixing codacy PLSQL error --- pgtap/components/articulationPoints/innerQuery.sql | 2 +- pgtap/components/articulationPoints/no_crash_test.sql | 2 +- pgtap/components/biconnectedComponents/innerQuery.sql | 2 +- pgtap/components/biconnectedComponents/no_crash_test.sql | 2 +- pgtap/components/bridges/innerQuery.sql | 2 +- pgtap/components/bridges/no_crash_test.sql | 2 +- pgtap/components/connectedComponenes/innerQuery.sql | 2 +- pgtap/components/connectedComponenes/no_crash_test.sql | 2 +- pgtap/components/makeConnected/edge_cases.sql | 2 +- pgtap/components/makeConnected/inner_query.sql | 2 +- pgtap/components/makeConnected/no_crash_test.sql | 2 +- pgtap/components/makeConnected/types_check.sql | 2 +- pgtap/components/strongComponenets/innerQuery.sql | 2 +- pgtap/components/strongComponenets/no_crash_test.sql | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pgtap/components/articulationPoints/innerQuery.sql b/pgtap/components/articulationPoints/innerQuery.sql index 3cf76ab7324..0e62e61f6f8 100644 --- a/pgtap/components/articulationPoints/innerQuery.sql +++ b/pgtap/components/articulationPoints/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(55); diff --git a/pgtap/components/articulationPoints/no_crash_test.sql b/pgtap/components/articulationPoints/no_crash_test.sql index 5856f902a37..f0a54930e55 100644 --- a/pgtap/components/articulationPoints/no_crash_test.sql +++ b/pgtap/components/articulationPoints/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/components/biconnectedComponents/innerQuery.sql b/pgtap/components/biconnectedComponents/innerQuery.sql index a50b9e7d217..d40d86f4345 100644 --- a/pgtap/components/biconnectedComponents/innerQuery.sql +++ b/pgtap/components/biconnectedComponents/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(55); diff --git a/pgtap/components/biconnectedComponents/no_crash_test.sql b/pgtap/components/biconnectedComponents/no_crash_test.sql index 6ad84e9cd7b..4b143b9d451 100644 --- a/pgtap/components/biconnectedComponents/no_crash_test.sql +++ b/pgtap/components/biconnectedComponents/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/components/bridges/innerQuery.sql b/pgtap/components/bridges/innerQuery.sql index c900180e0d0..696b33f1cc7 100644 --- a/pgtap/components/bridges/innerQuery.sql +++ b/pgtap/components/bridges/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(55); diff --git a/pgtap/components/bridges/no_crash_test.sql b/pgtap/components/bridges/no_crash_test.sql index c135c4ed806..48fd64a439c 100644 --- a/pgtap/components/bridges/no_crash_test.sql +++ b/pgtap/components/bridges/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/components/connectedComponenes/innerQuery.sql b/pgtap/components/connectedComponenes/innerQuery.sql index 9b6391a7919..4aa8b5aed1e 100644 --- a/pgtap/components/connectedComponenes/innerQuery.sql +++ b/pgtap/components/connectedComponenes/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(55); diff --git a/pgtap/components/connectedComponenes/no_crash_test.sql b/pgtap/components/connectedComponenes/no_crash_test.sql index deeaabc9584..aa39c66dfae 100644 --- a/pgtap/components/connectedComponenes/no_crash_test.sql +++ b/pgtap/components/connectedComponenes/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/components/makeConnected/edge_cases.sql b/pgtap/components/makeConnected/edge_cases.sql index 158ecd74e5c..f4cd1998bda 100644 --- a/pgtap/components/makeConnected/edge_cases.sql +++ b/pgtap/components/makeConnected/edge_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(20) END; diff --git a/pgtap/components/makeConnected/inner_query.sql b/pgtap/components/makeConnected/inner_query.sql index 02672cf2491..2e0f1e49c03 100644 --- a/pgtap/components/makeConnected/inner_query.sql +++ b/pgtap/components/makeConnected/inner_query.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(56) END; diff --git a/pgtap/components/makeConnected/no_crash_test.sql b/pgtap/components/makeConnected/no_crash_test.sql index b62cc96ec63..0fa759ab109 100644 --- a/pgtap/components/makeConnected/no_crash_test.sql +++ b/pgtap/components/makeConnected/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(5) END; diff --git a/pgtap/components/makeConnected/types_check.sql b/pgtap/components/makeConnected/types_check.sql index 5189c02af59..e7c2f8a6824 100644 --- a/pgtap/components/makeConnected/types_check.sql +++ b/pgtap/components/makeConnected/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(4) END; diff --git a/pgtap/components/strongComponenets/innerQuery.sql b/pgtap/components/strongComponenets/innerQuery.sql index 58ed881fd91..b57b13c14f7 100644 --- a/pgtap/components/strongComponenets/innerQuery.sql +++ b/pgtap/components/strongComponenets/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(55); diff --git a/pgtap/components/strongComponenets/no_crash_test.sql b/pgtap/components/strongComponenets/no_crash_test.sql index 6a06d44403d..e476955d283 100644 --- a/pgtap/components/strongComponenets/no_crash_test.sql +++ b/pgtap/components/strongComponenets/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); From f46f346277eb1724cd676377ac9340bafcee4c36 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 13/35] [contraction] [pgtap] fixing codacy PLSQL error --- pgtap/contraction/combined/dijkstra-compare.sql | 2 +- pgtap/contraction/contraction-types-check.sql | 2 +- pgtap/contraction/contraction_cycle_directed.sql | 2 +- pgtap/contraction/contraction_cycle_undirected.sql | 2 +- pgtap/contraction/deadend/directed/dijkstra-compare.sql | 2 +- pgtap/contraction/deadend/directed/directed-big-ids.sql | 2 +- pgtap/contraction/deadend/directed/directed-deadend-cases.sql | 2 +- pgtap/contraction/deadend/directed/directed-dev-deadend.sql | 2 +- pgtap/contraction/deadend/directed/directed-small_ids.sql | 2 +- pgtap/contraction/deadend/directed/directed-super-big-ids.sql | 2 +- pgtap/contraction/deadend/directed/directed_dead_end.sql | 2 +- pgtap/contraction/deadend/directed/innerQuery.sql | 2 +- pgtap/contraction/deadend/undirected/big-ids.sql | 2 +- pgtap/contraction/deadend/undirected/cases.sql | 2 +- pgtap/contraction/deadend/undirected/dev-cases.sql | 2 +- pgtap/contraction/deadend/undirected/dijkstra-compare.sql | 2 +- pgtap/contraction/deadend/undirected/innerQuery.sql | 2 +- pgtap/contraction/deadend/undirected/more_cases.sql | 2 +- pgtap/contraction/deadend/undirected/small_ids.sql | 2 +- pgtap/contraction/deadend/undirected/super_big_ids.sql | 2 +- pgtap/contraction/issue1002/issue1002.sql | 2 +- pgtap/contraction/linear/directed/dijkstra-compare.sql | 2 +- pgtap/contraction/linear/directed/directed_linear.sql | 2 +- pgtap/contraction/linear/directed/innerQuery.sql | 2 +- pgtap/contraction/linear/directed/issue-1647.sql | 2 +- pgtap/contraction/linear/undirected/dijkstra-compare.sql | 2 +- pgtap/contraction/linear/undirected/innerQuery.sql | 2 +- pgtap/contraction/linear/undirected/issue-1647.sql | 2 +- pgtap/contraction/linear/undirected/undirected_linear.sql | 2 +- pgtap/contraction/no_crash_test-contraction.sql | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pgtap/contraction/combined/dijkstra-compare.sql b/pgtap/contraction/combined/dijkstra-compare.sql index 63067faeea5..99be46cdad4 100644 --- a/pgtap/contraction/combined/dijkstra-compare.sql +++ b/pgtap/contraction/combined/dijkstra-compare.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(334); diff --git a/pgtap/contraction/contraction-types-check.sql b/pgtap/contraction/contraction-types-check.sql index b666454d412..9c0712f3fed 100644 --- a/pgtap/contraction/contraction-types-check.sql +++ b/pgtap/contraction/contraction-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(49); SET client_min_messages TO WARNING; diff --git a/pgtap/contraction/contraction_cycle_directed.sql b/pgtap/contraction/contraction_cycle_directed.sql index ba0a24cfecb..740f4a35df0 100644 --- a/pgtap/contraction/contraction_cycle_directed.sql +++ b/pgtap/contraction/contraction_cycle_directed.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(30); diff --git a/pgtap/contraction/contraction_cycle_undirected.sql b/pgtap/contraction/contraction_cycle_undirected.sql index 640b52c600b..15b9c73bd4b 100644 --- a/pgtap/contraction/contraction_cycle_undirected.sql +++ b/pgtap/contraction/contraction_cycle_undirected.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(36); diff --git a/pgtap/contraction/deadend/directed/dijkstra-compare.sql b/pgtap/contraction/deadend/directed/dijkstra-compare.sql index 85848f81afd..dffe040b6c9 100644 --- a/pgtap/contraction/deadend/directed/dijkstra-compare.sql +++ b/pgtap/contraction/deadend/directed/dijkstra-compare.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(333); diff --git a/pgtap/contraction/deadend/directed/directed-big-ids.sql b/pgtap/contraction/deadend/directed/directed-big-ids.sql index aa577e42f89..356ef2c6012 100644 --- a/pgtap/contraction/deadend/directed/directed-big-ids.sql +++ b/pgtap/contraction/deadend/directed/directed-big-ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/directed/directed-deadend-cases.sql b/pgtap/contraction/deadend/directed/directed-deadend-cases.sql index 2aeb98370dc..db342f91740 100644 --- a/pgtap/contraction/deadend/directed/directed-deadend-cases.sql +++ b/pgtap/contraction/deadend/directed/directed-deadend-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/directed/directed-dev-deadend.sql b/pgtap/contraction/deadend/directed/directed-dev-deadend.sql index 194e49380aa..16430779931 100644 --- a/pgtap/contraction/deadend/directed/directed-dev-deadend.sql +++ b/pgtap/contraction/deadend/directed/directed-dev-deadend.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/contraction/deadend/directed/directed-small_ids.sql b/pgtap/contraction/deadend/directed/directed-small_ids.sql index 5acf00dbda3..ca0896c9690 100644 --- a/pgtap/contraction/deadend/directed/directed-small_ids.sql +++ b/pgtap/contraction/deadend/directed/directed-small_ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/directed/directed-super-big-ids.sql b/pgtap/contraction/deadend/directed/directed-super-big-ids.sql index e1a6a423721..3456961aeb7 100644 --- a/pgtap/contraction/deadend/directed/directed-super-big-ids.sql +++ b/pgtap/contraction/deadend/directed/directed-super-big-ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/directed/directed_dead_end.sql b/pgtap/contraction/deadend/directed/directed_dead_end.sql index b3800ba593b..19f86da2b76 100644 --- a/pgtap/contraction/deadend/directed/directed_dead_end.sql +++ b/pgtap/contraction/deadend/directed/directed_dead_end.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(39); diff --git a/pgtap/contraction/deadend/directed/innerQuery.sql b/pgtap/contraction/deadend/directed/innerQuery.sql index 4d592571bdf..bb2203656fc 100644 --- a/pgtap/contraction/deadend/directed/innerQuery.sql +++ b/pgtap/contraction/deadend/directed/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(57); diff --git a/pgtap/contraction/deadend/undirected/big-ids.sql b/pgtap/contraction/deadend/undirected/big-ids.sql index 8d9da66a08e..dc0734c9d8f 100644 --- a/pgtap/contraction/deadend/undirected/big-ids.sql +++ b/pgtap/contraction/deadend/undirected/big-ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/undirected/cases.sql b/pgtap/contraction/deadend/undirected/cases.sql index 4e9c1f56836..0fc645db388 100644 --- a/pgtap/contraction/deadend/undirected/cases.sql +++ b/pgtap/contraction/deadend/undirected/cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/undirected/dev-cases.sql b/pgtap/contraction/deadend/undirected/dev-cases.sql index 80c4dee767c..07d9f21e043 100644 --- a/pgtap/contraction/deadend/undirected/dev-cases.sql +++ b/pgtap/contraction/deadend/undirected/dev-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/contraction/deadend/undirected/dijkstra-compare.sql b/pgtap/contraction/deadend/undirected/dijkstra-compare.sql index 35ff9d94b13..e45f0086cda 100644 --- a/pgtap/contraction/deadend/undirected/dijkstra-compare.sql +++ b/pgtap/contraction/deadend/undirected/dijkstra-compare.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(333); diff --git a/pgtap/contraction/deadend/undirected/innerQuery.sql b/pgtap/contraction/deadend/undirected/innerQuery.sql index fdcda96b027..e8c01d80537 100644 --- a/pgtap/contraction/deadend/undirected/innerQuery.sql +++ b/pgtap/contraction/deadend/undirected/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(57); diff --git a/pgtap/contraction/deadend/undirected/more_cases.sql b/pgtap/contraction/deadend/undirected/more_cases.sql index 1197434db27..db39c1d5d9c 100644 --- a/pgtap/contraction/deadend/undirected/more_cases.sql +++ b/pgtap/contraction/deadend/undirected/more_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(39); diff --git a/pgtap/contraction/deadend/undirected/small_ids.sql b/pgtap/contraction/deadend/undirected/small_ids.sql index 3a0b9506b79..5a179314b72 100644 --- a/pgtap/contraction/deadend/undirected/small_ids.sql +++ b/pgtap/contraction/deadend/undirected/small_ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/deadend/undirected/super_big_ids.sql b/pgtap/contraction/deadend/undirected/super_big_ids.sql index b16196c2f15..5486f6575fe 100644 --- a/pgtap/contraction/deadend/undirected/super_big_ids.sql +++ b/pgtap/contraction/deadend/undirected/super_big_ids.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/contraction/issue1002/issue1002.sql b/pgtap/contraction/issue1002/issue1002.sql index 221cb6ecf5b..374dc62f9ea 100644 --- a/pgtap/contraction/issue1002/issue1002.sql +++ b/pgtap/contraction/issue1002/issue1002.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(3); diff --git a/pgtap/contraction/linear/directed/dijkstra-compare.sql b/pgtap/contraction/linear/directed/dijkstra-compare.sql index 4a9a7ab1465..ec14b2ca892 100644 --- a/pgtap/contraction/linear/directed/dijkstra-compare.sql +++ b/pgtap/contraction/linear/directed/dijkstra-compare.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(334); diff --git a/pgtap/contraction/linear/directed/directed_linear.sql b/pgtap/contraction/linear/directed/directed_linear.sql index 14feef05a56..f7930ce5be3 100644 --- a/pgtap/contraction/linear/directed/directed_linear.sql +++ b/pgtap/contraction/linear/directed/directed_linear.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(25); diff --git a/pgtap/contraction/linear/directed/innerQuery.sql b/pgtap/contraction/linear/directed/innerQuery.sql index c8ae1268cdc..b7d1587d3fc 100644 --- a/pgtap/contraction/linear/directed/innerQuery.sql +++ b/pgtap/contraction/linear/directed/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(57); diff --git a/pgtap/contraction/linear/directed/issue-1647.sql b/pgtap/contraction/linear/directed/issue-1647.sql index be9c2170ed8..be47e67b50b 100644 --- a/pgtap/contraction/linear/directed/issue-1647.sql +++ b/pgtap/contraction/linear/directed/issue-1647.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/contraction/linear/undirected/dijkstra-compare.sql b/pgtap/contraction/linear/undirected/dijkstra-compare.sql index b03164e4ccd..e4551571f3a 100644 --- a/pgtap/contraction/linear/undirected/dijkstra-compare.sql +++ b/pgtap/contraction/linear/undirected/dijkstra-compare.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(334); diff --git a/pgtap/contraction/linear/undirected/innerQuery.sql b/pgtap/contraction/linear/undirected/innerQuery.sql index b1b18f5ea49..3f77f10f5dc 100644 --- a/pgtap/contraction/linear/undirected/innerQuery.sql +++ b/pgtap/contraction/linear/undirected/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(57); diff --git a/pgtap/contraction/linear/undirected/issue-1647.sql b/pgtap/contraction/linear/undirected/issue-1647.sql index d7df219fbd7..7a470597f04 100644 --- a/pgtap/contraction/linear/undirected/issue-1647.sql +++ b/pgtap/contraction/linear/undirected/issue-1647.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/contraction/linear/undirected/undirected_linear.sql b/pgtap/contraction/linear/undirected/undirected_linear.sql index 7840384c7ce..bbd3df99dcb 100644 --- a/pgtap/contraction/linear/undirected/undirected_linear.sql +++ b/pgtap/contraction/linear/undirected/undirected_linear.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(26); diff --git a/pgtap/contraction/no_crash_test-contraction.sql b/pgtap/contraction/no_crash_test-contraction.sql index 0d69404886c..5b81ca5947b 100644 --- a/pgtap/contraction/no_crash_test-contraction.sql +++ b/pgtap/contraction/no_crash_test-contraction.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); From 468e64af958807fa1be096231f8c45a4c1b91947 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 14/35] [costMatrix] [pgtap] fixing codacy PLSQL error --- pgtap/costMatrix/aStarCostMatrix/innerQuery.sql | 2 +- pgtap/costMatrix/aStarCostMatrix/no_crash_test.sql | 2 +- pgtap/costMatrix/bdAstarCostMatrix/innerQuery.sql | 2 +- pgtap/costMatrix/bdAstarCostMatrix/no_crash_test.sql | 2 +- pgtap/costMatrix/bdDijkstraCostMatrix/innerQuery.sql | 2 +- pgtap/costMatrix/bdDijkstraCostMatrix/no_crash_test.sql | 2 +- pgtap/costMatrix/dijkstraCostMatrix/innerQuery.sql | 2 +- pgtap/costMatrix/dijkstraCostMatrix/no_crash_test.sql | 2 +- pgtap/costMatrix/withPointsCostMatrix/innerQuery.sql | 2 +- pgtap/costMatrix/withPointsCostMatrix/no_crash_test.sql | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pgtap/costMatrix/aStarCostMatrix/innerQuery.sql b/pgtap/costMatrix/aStarCostMatrix/innerQuery.sql index 39b0bee6efa..b2abe4062f3 100644 --- a/pgtap/costMatrix/aStarCostMatrix/innerQuery.sql +++ b/pgtap/costMatrix/aStarCostMatrix/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(104); diff --git a/pgtap/costMatrix/aStarCostMatrix/no_crash_test.sql b/pgtap/costMatrix/aStarCostMatrix/no_crash_test.sql index 73f5e736c29..d4dc1b05dd5 100644 --- a/pgtap/costMatrix/aStarCostMatrix/no_crash_test.sql +++ b/pgtap/costMatrix/aStarCostMatrix/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(15); diff --git a/pgtap/costMatrix/bdAstarCostMatrix/innerQuery.sql b/pgtap/costMatrix/bdAstarCostMatrix/innerQuery.sql index 660e48bc9fb..3c57fb01166 100644 --- a/pgtap/costMatrix/bdAstarCostMatrix/innerQuery.sql +++ b/pgtap/costMatrix/bdAstarCostMatrix/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(104); diff --git a/pgtap/costMatrix/bdAstarCostMatrix/no_crash_test.sql b/pgtap/costMatrix/bdAstarCostMatrix/no_crash_test.sql index 61ed864a018..dee3f75b98f 100644 --- a/pgtap/costMatrix/bdAstarCostMatrix/no_crash_test.sql +++ b/pgtap/costMatrix/bdAstarCostMatrix/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(15); diff --git a/pgtap/costMatrix/bdDijkstraCostMatrix/innerQuery.sql b/pgtap/costMatrix/bdDijkstraCostMatrix/innerQuery.sql index 5462e162804..f67f2e93896 100644 --- a/pgtap/costMatrix/bdDijkstraCostMatrix/innerQuery.sql +++ b/pgtap/costMatrix/bdDijkstraCostMatrix/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/costMatrix/bdDijkstraCostMatrix/no_crash_test.sql b/pgtap/costMatrix/bdDijkstraCostMatrix/no_crash_test.sql index a79ec638581..87d38ebb38c 100644 --- a/pgtap/costMatrix/bdDijkstraCostMatrix/no_crash_test.sql +++ b/pgtap/costMatrix/bdDijkstraCostMatrix/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(14); diff --git a/pgtap/costMatrix/dijkstraCostMatrix/innerQuery.sql b/pgtap/costMatrix/dijkstraCostMatrix/innerQuery.sql index f080d4a1bff..41db7ca61c3 100644 --- a/pgtap/costMatrix/dijkstraCostMatrix/innerQuery.sql +++ b/pgtap/costMatrix/dijkstraCostMatrix/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/costMatrix/dijkstraCostMatrix/no_crash_test.sql b/pgtap/costMatrix/dijkstraCostMatrix/no_crash_test.sql index ff138ca5da9..bf4a0db9c3b 100644 --- a/pgtap/costMatrix/dijkstraCostMatrix/no_crash_test.sql +++ b/pgtap/costMatrix/dijkstraCostMatrix/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(14); diff --git a/pgtap/costMatrix/withPointsCostMatrix/innerQuery.sql b/pgtap/costMatrix/withPointsCostMatrix/innerQuery.sql index 40f13bed3e7..1b2cb781ef7 100644 --- a/pgtap/costMatrix/withPointsCostMatrix/innerQuery.sql +++ b/pgtap/costMatrix/withPointsCostMatrix/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/costMatrix/withPointsCostMatrix/no_crash_test.sql b/pgtap/costMatrix/withPointsCostMatrix/no_crash_test.sql index c353f12ad48..5e939e26499 100644 --- a/pgtap/costMatrix/withPointsCostMatrix/no_crash_test.sql +++ b/pgtap/costMatrix/withPointsCostMatrix/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(19); From 626c9ed6766589850bcbd5eb2caf5891c72e8bab Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 15/35] [dagShortestPath] [pgtap] fixing codacy PLSQL error --- pgtap/dagShortestPath/dagShortestPath-innerQuery.sql | 2 +- pgtap/dagShortestPath/dagShortestPath-typesCheck.sql | 2 +- pgtap/dagShortestPath/empty_combinations_empty_result.test.sql | 2 +- pgtap/dagShortestPath/many_to_many_eq_combinations.test.sql | 2 +- pgtap/dagShortestPath/no_crash_test-dagShortestPath.test.sql | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pgtap/dagShortestPath/dagShortestPath-innerQuery.sql b/pgtap/dagShortestPath/dagShortestPath-innerQuery.sql index 19b86746ed1..a4d774691ae 100644 --- a/pgtap/dagShortestPath/dagShortestPath-innerQuery.sql +++ b/pgtap/dagShortestPath/dagShortestPath-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); diff --git a/pgtap/dagShortestPath/dagShortestPath-typesCheck.sql b/pgtap/dagShortestPath/dagShortestPath-typesCheck.sql index 00bf4ee31b6..6dd7bf66642 100644 --- a/pgtap/dagShortestPath/dagShortestPath-typesCheck.sql +++ b/pgtap/dagShortestPath/dagShortestPath-typesCheck.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan(15) ELSE plan(12) END; diff --git a/pgtap/dagShortestPath/empty_combinations_empty_result.test.sql b/pgtap/dagShortestPath/empty_combinations_empty_result.test.sql index 81ac98a43b1..a43c3a07eba 100644 --- a/pgtap/dagShortestPath/empty_combinations_empty_result.test.sql +++ b/pgtap/dagShortestPath/empty_combinations_empty_result.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/dagShortestPath/many_to_many_eq_combinations.test.sql b/pgtap/dagShortestPath/many_to_many_eq_combinations.test.sql index 7fd77c36f27..02a97d3ecda 100644 --- a/pgtap/dagShortestPath/many_to_many_eq_combinations.test.sql +++ b/pgtap/dagShortestPath/many_to_many_eq_combinations.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/dagShortestPath/no_crash_test-dagShortestPath.test.sql b/pgtap/dagShortestPath/no_crash_test-dagShortestPath.test.sql index b3413d29eae..f8601ac2c6d 100644 --- a/pgtap/dagShortestPath/no_crash_test-dagShortestPath.test.sql +++ b/pgtap/dagShortestPath/no_crash_test-dagShortestPath.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan(81) ELSE plan(68) END; From 9b2b2e7358f6ed1befb0baa18fd2edac57d500a1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 16/35] [dijkstra] [pgtap] fixing codacy PLSQL error --- pgtap/dijkstra/dijkstra-group-innerQuery.sql | 2 +- pgtap/dijkstra/dijkstra-infinity-alt-cost.test.sql | 2 +- pgtap/dijkstra/dijkstra-infinity-cost.test.sql | 2 +- pgtap/dijkstra/dijkstra-issue-353.test.sql | 2 +- pgtap/dijkstra/dijkstra-types-check.sql | 2 +- pgtap/dijkstra/dijkstraCost-group-innerQuery.sql | 2 +- pgtap/dijkstra/dijkstraCost-types-check.sql | 2 +- .../dijkstraCost_empty_combinations_empty_result.test.sql | 2 +- pgtap/dijkstra/dijkstraNear/dijkstra-compare.sql | 2 +- pgtap/dijkstra/dijkstraNear/edge_cases.sql | 2 +- pgtap/dijkstra/dijkstraNear/expected_results.sql | 2 +- pgtap/dijkstra/dijkstraNear/no_crash_test.sql | 2 +- pgtap/dijkstra/dijkstraNear/types-check.sql | 2 +- pgtap/dijkstra/dijkstraNearCost/dijkstra-compare.sql | 2 +- pgtap/dijkstra/dijkstraNearCost/edge_cases.sql | 2 +- pgtap/dijkstra/dijkstraNearCost/expected_results.sql | 2 +- pgtap/dijkstra/dijkstraNearCost/no_crash_test.sql | 2 +- pgtap/dijkstra/dijkstraNearCost/types-check.sql | 2 +- pgtap/dijkstra/dijkstraVia-equivalenceDijkstra.test.sql | 2 +- pgtap/dijkstra/dijkstraVia-innerQuery.sql | 2 +- pgtap/dijkstra/dijkstraVia-types-check.sql | 2 +- .../dijkstra/dijkstra_empty_combinations_empty_result.test.sql | 2 +- pgtap/dijkstra/manyToMany_equiv_combinations.test.sql | 2 +- pgtap/dijkstra/no_crash_test-dijkstra.sql | 2 +- pgtap/dijkstra/no_crash_test-dijkstraCost.sql | 2 +- pgtap/dijkstra/no_crash_test-dijkstraVia.sql | 2 +- pgtap/dijkstra/oneToOne_equiv_manyToMany.test.sql | 2 +- pgtap/dijkstra/oneToOne_equiv_manyToOne.test.sql | 2 +- pgtap/dijkstra/oneToOne_equiv_oneToMany.test.sql | 2 +- pgtap/dijkstra/zero_one_edge_-1_rev.test.sql | 2 +- pgtap/dijkstra/zero_one_edge_has_rev.test.sql | 2 +- pgtap/dijkstra/zero_one_edge_no_rev.test.sql | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/pgtap/dijkstra/dijkstra-group-innerQuery.sql b/pgtap/dijkstra/dijkstra-group-innerQuery.sql index f7ae35b3b44..f8df5589cb6 100644 --- a/pgtap/dijkstra/dijkstra-group-innerQuery.sql +++ b/pgtap/dijkstra/dijkstra-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(224); diff --git a/pgtap/dijkstra/dijkstra-infinity-alt-cost.test.sql b/pgtap/dijkstra/dijkstra-infinity-alt-cost.test.sql index 72560eafdaf..4ac46285a47 100644 --- a/pgtap/dijkstra/dijkstra-infinity-alt-cost.test.sql +++ b/pgtap/dijkstra/dijkstra-infinity-alt-cost.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(4); diff --git a/pgtap/dijkstra/dijkstra-infinity-cost.test.sql b/pgtap/dijkstra/dijkstra-infinity-cost.test.sql index 543a1d6284e..e764b8f5906 100644 --- a/pgtap/dijkstra/dijkstra-infinity-cost.test.sql +++ b/pgtap/dijkstra/dijkstra-infinity-cost.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(8); diff --git a/pgtap/dijkstra/dijkstra-issue-353.test.sql b/pgtap/dijkstra/dijkstra-issue-353.test.sql index c42ba05121a..b1b2176314f 100644 --- a/pgtap/dijkstra/dijkstra-issue-353.test.sql +++ b/pgtap/dijkstra/dijkstra-issue-353.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(3); diff --git a/pgtap/dijkstra/dijkstra-types-check.sql b/pgtap/dijkstra/dijkstra-types-check.sql index a1844eb1097..62168a1ef49 100644 --- a/pgtap/dijkstra/dijkstra-types-check.sql +++ b/pgtap/dijkstra/dijkstra-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; diff --git a/pgtap/dijkstra/dijkstraCost-group-innerQuery.sql b/pgtap/dijkstra/dijkstraCost-group-innerQuery.sql index b3e2727d4c0..5060f1802d2 100644 --- a/pgtap/dijkstra/dijkstraCost-group-innerQuery.sql +++ b/pgtap/dijkstra/dijkstraCost-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(226); diff --git a/pgtap/dijkstra/dijkstraCost-types-check.sql b/pgtap/dijkstra/dijkstraCost-types-check.sql index 6e5ef9c828d..85c76948fc0 100644 --- a/pgtap/dijkstra/dijkstraCost-types-check.sql +++ b/pgtap/dijkstra/dijkstraCost-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; diff --git a/pgtap/dijkstra/dijkstraCost_empty_combinations_empty_result.test.sql b/pgtap/dijkstra/dijkstraCost_empty_combinations_empty_result.test.sql index 6638b6c6df2..0d12aa15584 100644 --- a/pgtap/dijkstra/dijkstraCost_empty_combinations_empty_result.test.sql +++ b/pgtap/dijkstra/dijkstraCost_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/dijkstra/dijkstraNear/dijkstra-compare.sql b/pgtap/dijkstra/dijkstraNear/dijkstra-compare.sql index 76b28735d09..0f3167ea79b 100644 --- a/pgtap/dijkstra/dijkstraNear/dijkstra-compare.sql +++ b/pgtap/dijkstra/dijkstraNear/dijkstra-compare.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(142) END; diff --git a/pgtap/dijkstra/dijkstraNear/edge_cases.sql b/pgtap/dijkstra/dijkstraNear/edge_cases.sql index 029db72e764..c92d7fb1b71 100644 --- a/pgtap/dijkstra/dijkstraNear/edge_cases.sql +++ b/pgtap/dijkstra/dijkstraNear/edge_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(122) END; diff --git a/pgtap/dijkstra/dijkstraNear/expected_results.sql b/pgtap/dijkstra/dijkstraNear/expected_results.sql index 0dc034cac3e..218cf682fc8 100644 --- a/pgtap/dijkstra/dijkstraNear/expected_results.sql +++ b/pgtap/dijkstra/dijkstraNear/expected_results.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(142) END; UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; diff --git a/pgtap/dijkstra/dijkstraNear/no_crash_test.sql b/pgtap/dijkstra/dijkstraNear/no_crash_test.sql index 03a4c9be06a..922ca4ff8a5 100644 --- a/pgtap/dijkstra/dijkstraNear/no_crash_test.sql +++ b/pgtap/dijkstra/dijkstraNear/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(126) END; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/dijkstra/dijkstraNear/types-check.sql b/pgtap/dijkstra/dijkstraNear/types-check.sql index 411817d1a21..2c0ac7a0b61 100644 --- a/pgtap/dijkstra/dijkstraNear/types-check.sql +++ b/pgtap/dijkstra/dijkstraNear/types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(11) END; diff --git a/pgtap/dijkstra/dijkstraNearCost/dijkstra-compare.sql b/pgtap/dijkstra/dijkstraNearCost/dijkstra-compare.sql index 39a8f4c2ce6..96a27a96039 100644 --- a/pgtap/dijkstra/dijkstraNearCost/dijkstra-compare.sql +++ b/pgtap/dijkstra/dijkstraNearCost/dijkstra-compare.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(142) END; diff --git a/pgtap/dijkstra/dijkstraNearCost/edge_cases.sql b/pgtap/dijkstra/dijkstraNearCost/edge_cases.sql index c3a91d6a7dd..1a38fd99702 100644 --- a/pgtap/dijkstra/dijkstraNearCost/edge_cases.sql +++ b/pgtap/dijkstra/dijkstraNearCost/edge_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(122) END; diff --git a/pgtap/dijkstra/dijkstraNearCost/expected_results.sql b/pgtap/dijkstra/dijkstraNearCost/expected_results.sql index 765643f3c58..d3ab4d08f61 100644 --- a/pgtap/dijkstra/dijkstraNearCost/expected_results.sql +++ b/pgtap/dijkstra/dijkstraNearCost/expected_results.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(142) END; diff --git a/pgtap/dijkstra/dijkstraNearCost/no_crash_test.sql b/pgtap/dijkstra/dijkstraNearCost/no_crash_test.sql index ae02f758af8..0cccea12d69 100644 --- a/pgtap/dijkstra/dijkstraNearCost/no_crash_test.sql +++ b/pgtap/dijkstra/dijkstraNearCost/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(126) END; diff --git a/pgtap/dijkstra/dijkstraNearCost/types-check.sql b/pgtap/dijkstra/dijkstraNearCost/types-check.sql index c63dd05e796..faad234a2b3 100644 --- a/pgtap/dijkstra/dijkstraNearCost/types-check.sql +++ b/pgtap/dijkstra/dijkstraNearCost/types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(11) END; diff --git a/pgtap/dijkstra/dijkstraVia-equivalenceDijkstra.test.sql b/pgtap/dijkstra/dijkstraVia-equivalenceDijkstra.test.sql index 78a6f153dee..e295c905883 100644 --- a/pgtap/dijkstra/dijkstraVia-equivalenceDijkstra.test.sql +++ b/pgtap/dijkstra/dijkstraVia-equivalenceDijkstra.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(8); diff --git a/pgtap/dijkstra/dijkstraVia-innerQuery.sql b/pgtap/dijkstra/dijkstraVia-innerQuery.sql index b830c3d4929..716356c93f8 100644 --- a/pgtap/dijkstra/dijkstraVia-innerQuery.sql +++ b/pgtap/dijkstra/dijkstraVia-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/dijkstra/dijkstraVia-types-check.sql b/pgtap/dijkstra/dijkstraVia-types-check.sql index 3ceef7795d5..a1cbd5edff5 100644 --- a/pgtap/dijkstra/dijkstraVia-types-check.sql +++ b/pgtap/dijkstra/dijkstraVia-types-check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; diff --git a/pgtap/dijkstra/dijkstra_empty_combinations_empty_result.test.sql b/pgtap/dijkstra/dijkstra_empty_combinations_empty_result.test.sql index 03c467d91e7..2b0fe288856 100644 --- a/pgtap/dijkstra/dijkstra_empty_combinations_empty_result.test.sql +++ b/pgtap/dijkstra/dijkstra_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/dijkstra/manyToMany_equiv_combinations.test.sql b/pgtap/dijkstra/manyToMany_equiv_combinations.test.sql index 44ecd304042..90fe5e878ce 100644 --- a/pgtap/dijkstra/manyToMany_equiv_combinations.test.sql +++ b/pgtap/dijkstra/manyToMany_equiv_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(2); diff --git a/pgtap/dijkstra/no_crash_test-dijkstra.sql b/pgtap/dijkstra/no_crash_test-dijkstra.sql index 71bc8ddb1c6..d1df7def71f 100644 --- a/pgtap/dijkstra/no_crash_test-dijkstra.sql +++ b/pgtap/dijkstra/no_crash_test-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i dijkstra_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/dijkstra/no_crash_test-dijkstraCost.sql b/pgtap/dijkstra/no_crash_test-dijkstraCost.sql index d9f01a79d1b..e2204507809 100644 --- a/pgtap/dijkstra/no_crash_test-dijkstraCost.sql +++ b/pgtap/dijkstra/no_crash_test-dijkstraCost.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i dijkstra_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/dijkstra/no_crash_test-dijkstraVia.sql b/pgtap/dijkstra/no_crash_test-dijkstraVia.sql index d4d38d69511..9ec1706be58 100644 --- a/pgtap/dijkstra/no_crash_test-dijkstraVia.sql +++ b/pgtap/dijkstra/no_crash_test-dijkstraVia.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(15); diff --git a/pgtap/dijkstra/oneToOne_equiv_manyToMany.test.sql b/pgtap/dijkstra/oneToOne_equiv_manyToMany.test.sql index d6f8937a7cc..5f758dc0598 100644 --- a/pgtap/dijkstra/oneToOne_equiv_manyToMany.test.sql +++ b/pgtap/dijkstra/oneToOne_equiv_manyToMany.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/dijkstra/oneToOne_equiv_manyToOne.test.sql b/pgtap/dijkstra/oneToOne_equiv_manyToOne.test.sql index 821c312fb5a..2e7a9e9efdd 100644 --- a/pgtap/dijkstra/oneToOne_equiv_manyToOne.test.sql +++ b/pgtap/dijkstra/oneToOne_equiv_manyToOne.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(18); diff --git a/pgtap/dijkstra/oneToOne_equiv_oneToMany.test.sql b/pgtap/dijkstra/oneToOne_equiv_oneToMany.test.sql index 20289375e61..fe2b37646ef 100644 --- a/pgtap/dijkstra/oneToOne_equiv_oneToMany.test.sql +++ b/pgtap/dijkstra/oneToOne_equiv_oneToMany.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(36); diff --git a/pgtap/dijkstra/zero_one_edge_-1_rev.test.sql b/pgtap/dijkstra/zero_one_edge_-1_rev.test.sql index 127a294b55f..ad4c24f4eed 100644 --- a/pgtap/dijkstra/zero_one_edge_-1_rev.test.sql +++ b/pgtap/dijkstra/zero_one_edge_-1_rev.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(79); diff --git a/pgtap/dijkstra/zero_one_edge_has_rev.test.sql b/pgtap/dijkstra/zero_one_edge_has_rev.test.sql index f4646874871..200baea8daf 100644 --- a/pgtap/dijkstra/zero_one_edge_has_rev.test.sql +++ b/pgtap/dijkstra/zero_one_edge_has_rev.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(79); diff --git a/pgtap/dijkstra/zero_one_edge_no_rev.test.sql b/pgtap/dijkstra/zero_one_edge_no_rev.test.sql index 2e32c490ea4..9c2cdb6a417 100644 --- a/pgtap/dijkstra/zero_one_edge_no_rev.test.sql +++ b/pgtap/dijkstra/zero_one_edge_no_rev.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(79); From 7cf04db9ff4dd420464beb299170bdf35c9beab1 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 17/35] [dominator] [pgtap] fixing codacy PLSQL error --- pgtap/dominator/lengauerTarjanDominatorTree/edge-cases.sql | 2 +- pgtap/dominator/lengauerTarjanDominatorTree/innerQuery.sql | 2 +- pgtap/dominator/lengauerTarjanDominatorTree/no_crash_test.sql | 2 +- pgtap/dominator/lengauerTarjanDominatorTree/types_check.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgtap/dominator/lengauerTarjanDominatorTree/edge-cases.sql b/pgtap/dominator/lengauerTarjanDominatorTree/edge-cases.sql index f44a2b5a6a1..4a7025e76a8 100644 --- a/pgtap/dominator/lengauerTarjanDominatorTree/edge-cases.sql +++ b/pgtap/dominator/lengauerTarjanDominatorTree/edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(11) END; diff --git a/pgtap/dominator/lengauerTarjanDominatorTree/innerQuery.sql b/pgtap/dominator/lengauerTarjanDominatorTree/innerQuery.sql index bc9f97e714f..78983886b15 100644 --- a/pgtap/dominator/lengauerTarjanDominatorTree/innerQuery.sql +++ b/pgtap/dominator/lengauerTarjanDominatorTree/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(54) END; diff --git a/pgtap/dominator/lengauerTarjanDominatorTree/no_crash_test.sql b/pgtap/dominator/lengauerTarjanDominatorTree/no_crash_test.sql index 3a116589f97..32431a79dc2 100644 --- a/pgtap/dominator/lengauerTarjanDominatorTree/no_crash_test.sql +++ b/pgtap/dominator/lengauerTarjanDominatorTree/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(7) END; diff --git a/pgtap/dominator/lengauerTarjanDominatorTree/types_check.sql b/pgtap/dominator/lengauerTarjanDominatorTree/types_check.sql index 8408d39271e..cd9e129b6f0 100644 --- a/pgtap/dominator/lengauerTarjanDominatorTree/types_check.sql +++ b/pgtap/dominator/lengauerTarjanDominatorTree/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(5) END; From 79475d6ae325860cac6b0612cb41f70f3d1e9505 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 18/35] [driving_distance] [pgtap] fixing codacy PLSQL error --- pgtap/driving_distance/dijkstraDD-innerQuery.sql | 2 +- pgtap/driving_distance/issue-519.sql | 2 +- pgtap/driving_distance/issue1152.sql | 2 +- pgtap/driving_distance/no_crash_test-drivingDistance.sql | 2 +- pgtap/driving_distance/no_crash_test-withPointsDD.sql | 2 +- pgtap/driving_distance/withPointsDD-group-innerQuery.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pgtap/driving_distance/dijkstraDD-innerQuery.sql b/pgtap/driving_distance/dijkstraDD-innerQuery.sql index bbaa459169d..a92a9f289ed 100644 --- a/pgtap/driving_distance/dijkstraDD-innerQuery.sql +++ b/pgtap/driving_distance/dijkstraDD-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(112); diff --git a/pgtap/driving_distance/issue-519.sql b/pgtap/driving_distance/issue-519.sql index c5ba6ba9445..dd7dd8720ea 100644 --- a/pgtap/driving_distance/issue-519.sql +++ b/pgtap/driving_distance/issue-519.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(3); diff --git a/pgtap/driving_distance/issue1152.sql b/pgtap/driving_distance/issue1152.sql index 481bebb1af7..193f87a4908 100644 --- a/pgtap/driving_distance/issue1152.sql +++ b/pgtap/driving_distance/issue1152.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tmp_net.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/driving_distance/no_crash_test-drivingDistance.sql b/pgtap/driving_distance/no_crash_test-drivingDistance.sql index 0b68df141c3..fe78bcee630 100644 --- a/pgtap/driving_distance/no_crash_test-drivingDistance.sql +++ b/pgtap/driving_distance/no_crash_test-drivingDistance.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(34); diff --git a/pgtap/driving_distance/no_crash_test-withPointsDD.sql b/pgtap/driving_distance/no_crash_test-withPointsDD.sql index 435f3fb0ee3..27692fccba2 100644 --- a/pgtap/driving_distance/no_crash_test-withPointsDD.sql +++ b/pgtap/driving_distance/no_crash_test-withPointsDD.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(42); diff --git a/pgtap/driving_distance/withPointsDD-group-innerQuery.sql b/pgtap/driving_distance/withPointsDD-group-innerQuery.sql index 5696d0f656d..e4a810cfa41 100644 --- a/pgtap/driving_distance/withPointsDD-group-innerQuery.sql +++ b/pgtap/driving_distance/withPointsDD-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(112); From 0cebdb22d4d9b2699e64e1368c33899646d5c681 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 19/35] [ksp] [pgtap] fixing codacy PLSQL error --- pgtap/ksp/issue1010.sql | 2 +- pgtap/ksp/ksp-innerQuery.sql | 2 +- pgtap/ksp/ksp-v3-1route.test.sql | 2 +- pgtap/ksp/no_crash_test-ksp.sql | 2 +- pgtap/ksp/no_crash_test-withPointsKSP.sql | 2 +- pgtap/ksp/parallel-v2.test.sql | 2 +- pgtap/ksp/parallel.test.sql | 2 +- pgtap/ksp/tr_compare-dijkstra.sql | 2 +- pgtap/ksp/tr_custom.sql | 2 +- pgtap/ksp/tr_empty_set_NO_default_strict.sql | 2 +- pgtap/ksp/tr_empty_set_default_strict.sql | 2 +- pgtap/ksp/tr_innerQuery.sql | 2 +- pgtap/ksp/withPointsKSP-innerQuery.sql | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pgtap/ksp/issue1010.sql b/pgtap/ksp/issue1010.sql index 4b5ab2e5173..925c41eb28c 100644 --- a/pgtap/ksp/issue1010.sql +++ b/pgtap/ksp/issue1010.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/ksp/ksp-innerQuery.sql b/pgtap/ksp/ksp-innerQuery.sql index f18d7d16ae8..2f21e33aa4b 100644 --- a/pgtap/ksp/ksp-innerQuery.sql +++ b/pgtap/ksp/ksp-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/ksp/ksp-v3-1route.test.sql b/pgtap/ksp/ksp-v3-1route.test.sql index 04d6775557d..0d9d7b45c5e 100644 --- a/pgtap/ksp/ksp-v3-1route.test.sql +++ b/pgtap/ksp/ksp-v3-1route.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/ksp/no_crash_test-ksp.sql b/pgtap/ksp/no_crash_test-ksp.sql index a294678187d..a0c3f2f29b9 100644 --- a/pgtap/ksp/no_crash_test-ksp.sql +++ b/pgtap/ksp/no_crash_test-ksp.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(23); diff --git a/pgtap/ksp/no_crash_test-withPointsKSP.sql b/pgtap/ksp/no_crash_test-withPointsKSP.sql index 404c35d9fb5..97718a3bdae 100644 --- a/pgtap/ksp/no_crash_test-withPointsKSP.sql +++ b/pgtap/ksp/no_crash_test-withPointsKSP.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(26); diff --git a/pgtap/ksp/parallel-v2.test.sql b/pgtap/ksp/parallel-v2.test.sql index d5003e0b480..ee7799cf8df 100644 --- a/pgtap/ksp/parallel-v2.test.sql +++ b/pgtap/ksp/parallel-v2.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SET client_min_messages=WARNING; diff --git a/pgtap/ksp/parallel.test.sql b/pgtap/ksp/parallel.test.sql index b51727d9fc3..2ee8a2b415a 100644 --- a/pgtap/ksp/parallel.test.sql +++ b/pgtap/ksp/parallel.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- SAMPLE DATA FROM THE ISSUE 285 diff --git a/pgtap/ksp/tr_compare-dijkstra.sql b/pgtap/ksp/tr_compare-dijkstra.sql index c1c9759be2f..9fd28ea4817 100644 --- a/pgtap/ksp/tr_compare-dijkstra.sql +++ b/pgtap/ksp/tr_compare-dijkstra.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1297); diff --git a/pgtap/ksp/tr_custom.sql b/pgtap/ksp/tr_custom.sql index f0352c80301..24611b68ea4 100644 --- a/pgtap/ksp/tr_custom.sql +++ b/pgtap/ksp/tr_custom.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/ksp/tr_empty_set_NO_default_strict.sql b/pgtap/ksp/tr_empty_set_NO_default_strict.sql index 5143bce2d57..8a48e26e199 100644 --- a/pgtap/ksp/tr_empty_set_NO_default_strict.sql +++ b/pgtap/ksp/tr_empty_set_NO_default_strict.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(16); diff --git a/pgtap/ksp/tr_empty_set_default_strict.sql b/pgtap/ksp/tr_empty_set_default_strict.sql index 2387299952a..cabf31782cf 100644 --- a/pgtap/ksp/tr_empty_set_default_strict.sql +++ b/pgtap/ksp/tr_empty_set_default_strict.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(16); diff --git a/pgtap/ksp/tr_innerQuery.sql b/pgtap/ksp/tr_innerQuery.sql index 1507ed6f595..806f4e09347 100644 --- a/pgtap/ksp/tr_innerQuery.sql +++ b/pgtap/ksp/tr_innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); diff --git a/pgtap/ksp/withPointsKSP-innerQuery.sql b/pgtap/ksp/withPointsKSP-innerQuery.sql index 3e8a398a3b8..103063a22bf 100644 --- a/pgtap/ksp/withPointsKSP-innerQuery.sql +++ b/pgtap/ksp/withPointsKSP-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); From 66cc3a7abbb8b8673482bd55cb8614482b327f3d Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 20/35] [lineGraph] [pgtap] fixing codacy PLSQL error --- pgtap/lineGraph/lineGraph/innerQuery.sql | 2 +- pgtap/lineGraph/lineGraph/no_crash_test-lineGraph.sql | 2 +- pgtap/lineGraph/lineGraph/no_crash_test.sql | 2 +- pgtap/lineGraph/lineGraphFull/innerQuery.sql | 2 +- .../lineGraphFull/lineGraphFull_dijkstra_equivalence.sql | 2 +- .../lineGraphFull/lineGraphFull_original_edge_check.sql | 2 +- .../lineGraphFull/lineGraphFull_original_vertex_mapping.sql | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pgtap/lineGraph/lineGraph/innerQuery.sql b/pgtap/lineGraph/lineGraph/innerQuery.sql index ee03e7120d3..a12e0fde28b 100644 --- a/pgtap/lineGraph/lineGraph/innerQuery.sql +++ b/pgtap/lineGraph/lineGraph/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(164); diff --git a/pgtap/lineGraph/lineGraph/no_crash_test-lineGraph.sql b/pgtap/lineGraph/lineGraph/no_crash_test-lineGraph.sql index 10485327a39..523adb2bd26 100644 --- a/pgtap/lineGraph/lineGraph/no_crash_test-lineGraph.sql +++ b/pgtap/lineGraph/lineGraph/no_crash_test-lineGraph.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/lineGraph/lineGraph/no_crash_test.sql b/pgtap/lineGraph/lineGraph/no_crash_test.sql index 10e046bad6b..7d4d6a5f329 100644 --- a/pgtap/lineGraph/lineGraph/no_crash_test.sql +++ b/pgtap/lineGraph/lineGraph/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/lineGraph/lineGraphFull/innerQuery.sql b/pgtap/lineGraph/lineGraphFull/innerQuery.sql index 20f69ce77f8..9418111e2d2 100644 --- a/pgtap/lineGraph/lineGraphFull/innerQuery.sql +++ b/pgtap/lineGraph/lineGraphFull/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/lineGraph/lineGraphFull/lineGraphFull_dijkstra_equivalence.sql b/pgtap/lineGraph/lineGraphFull/lineGraphFull_dijkstra_equivalence.sql index a7f022b687b..7beabbb5f69 100644 --- a/pgtap/lineGraph/lineGraphFull/lineGraphFull_dijkstra_equivalence.sql +++ b/pgtap/lineGraph/lineGraphFull/lineGraphFull_dijkstra_equivalence.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_edge_check.sql b/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_edge_check.sql index 1403a122a4c..5c131a9c527 100644 --- a/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_edge_check.sql +++ b/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_edge_check.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_vertex_mapping.sql b/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_vertex_mapping.sql index c84f4af184d..ec3ffc306e9 100644 --- a/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_vertex_mapping.sql +++ b/pgtap/lineGraph/lineGraphFull/lineGraphFull_original_vertex_mapping.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); From 6ec23c21f90ab3da1358ae90f8aa576c9fd14f9c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 21/35] [max_flow] [pgtap] fixing codacy PLSQL error --- pgtap/max_flow/boykovKolmogorov-innerQuery.sql | 2 +- pgtap/max_flow/boykovKolmogorov-types-check.sql | 2 +- pgtap/max_flow/edgedisjointpaths-group-innerQuery.sql | 2 +- pgtap/max_flow/edgedisjointpaths-types-check.sql | 2 +- pgtap/max_flow/edmondsKarp-innerQuery.sql | 2 +- pgtap/max_flow/edmondsKarp-types-check.sql | 2 +- pgtap/max_flow/empty_combinations_empty_result.test.sql | 2 +- pgtap/max_flow/internet_example.sql | 2 +- pgtap/max_flow/many_to_many_eq_combinations.test.sql | 2 +- pgtap/max_flow/maxCardinalityMatch-innerQuery.sql | 2 +- pgtap/max_flow/maxCardinalityMatch-types-check.sql | 2 +- pgtap/max_flow/maxFlow/maxflow-group-innerQuery.sql | 2 +- pgtap/max_flow/maxFlow/maxflow-types-check.sql | 2 +- pgtap/max_flow/maxFlow/no_crash_test-maxFlow.sql | 2 +- pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-innerQuery.sql | 2 +- pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-types-check.sql | 2 +- pgtap/max_flow/maxFlowMinCost/maxFlowMinCost/no_crash_test.sql | 2 +- .../max_flow/maxFlowMinCost/maxFlowMinCost_Cost-innerquery.sql | 2 +- .../max_flow/maxFlowMinCost/maxFlowMinCost_Cost-types-check.sql | 2 +- .../maxFlowMinCost/maxFlowMinCost_Cost/no_crash_test.sql | 2 +- pgtap/max_flow/no_crash_test-boykovKolmogorov.sql | 2 +- pgtap/max_flow/no_crash_test-edgeDisjointPaths.sql | 2 +- pgtap/max_flow/no_crash_test-edmondsKarp.sql | 2 +- pgtap/max_flow/no_crash_test-maxCardinalityMatch.sql | 2 +- pgtap/max_flow/no_crash_test-pushRelabel.sql | 2 +- pgtap/max_flow/pushRelabel-innerQuery.sql | 2 +- pgtap/max_flow/pushRelabel-types-check.sql | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pgtap/max_flow/boykovKolmogorov-innerQuery.sql b/pgtap/max_flow/boykovKolmogorov-innerQuery.sql index 80eb9bbb477..ca7e20102f6 100644 --- a/pgtap/max_flow/boykovKolmogorov-innerQuery.sql +++ b/pgtap/max_flow/boykovKolmogorov-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(226); diff --git a/pgtap/max_flow/boykovKolmogorov-types-check.sql b/pgtap/max_flow/boykovKolmogorov-types-check.sql index ed92c138449..32fbd11b81f 100644 --- a/pgtap/max_flow/boykovKolmogorov-types-check.sql +++ b/pgtap/max_flow/boykovKolmogorov-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(21); diff --git a/pgtap/max_flow/edgedisjointpaths-group-innerQuery.sql b/pgtap/max_flow/edgedisjointpaths-group-innerQuery.sql index 64574a74a35..577ecc396fa 100644 --- a/pgtap/max_flow/edgedisjointpaths-group-innerQuery.sql +++ b/pgtap/max_flow/edgedisjointpaths-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(658); diff --git a/pgtap/max_flow/edgedisjointpaths-types-check.sql b/pgtap/max_flow/edgedisjointpaths-types-check.sql index 113d71eb00b..cef7a997620 100644 --- a/pgtap/max_flow/edgedisjointpaths-types-check.sql +++ b/pgtap/max_flow/edgedisjointpaths-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(10); diff --git a/pgtap/max_flow/edmondsKarp-innerQuery.sql b/pgtap/max_flow/edmondsKarp-innerQuery.sql index 8ffd5f2dae4..15afc8b9349 100644 --- a/pgtap/max_flow/edmondsKarp-innerQuery.sql +++ b/pgtap/max_flow/edmondsKarp-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(226); diff --git a/pgtap/max_flow/edmondsKarp-types-check.sql b/pgtap/max_flow/edmondsKarp-types-check.sql index 2bc3d97b4b4..4a5c8d9f365 100644 --- a/pgtap/max_flow/edmondsKarp-types-check.sql +++ b/pgtap/max_flow/edmondsKarp-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(21); diff --git a/pgtap/max_flow/empty_combinations_empty_result.test.sql b/pgtap/max_flow/empty_combinations_empty_result.test.sql index e481017a3f3..40b9f40df86 100644 --- a/pgtap/max_flow/empty_combinations_empty_result.test.sql +++ b/pgtap/max_flow/empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(7); diff --git a/pgtap/max_flow/internet_example.sql b/pgtap/max_flow/internet_example.sql index 85aefd5c81d..18137e0c51f 100644 --- a/pgtap/max_flow/internet_example.sql +++ b/pgtap/max_flow/internet_example.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(3); diff --git a/pgtap/max_flow/many_to_many_eq_combinations.test.sql b/pgtap/max_flow/many_to_many_eq_combinations.test.sql index 619ec04ab1f..9c85a3eec47 100644 --- a/pgtap/max_flow/many_to_many_eq_combinations.test.sql +++ b/pgtap/max_flow/many_to_many_eq_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(119) END; diff --git a/pgtap/max_flow/maxCardinalityMatch-innerQuery.sql b/pgtap/max_flow/maxCardinalityMatch-innerQuery.sql index efa20c8829d..f2caafb2823 100644 --- a/pgtap/max_flow/maxCardinalityMatch-innerQuery.sql +++ b/pgtap/max_flow/maxCardinalityMatch-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(164); diff --git a/pgtap/max_flow/maxCardinalityMatch-types-check.sql b/pgtap/max_flow/maxCardinalityMatch-types-check.sql index 19a9dda13b2..0ef411e0666 100644 --- a/pgtap/max_flow/maxCardinalityMatch-types-check.sql +++ b/pgtap/max_flow/maxCardinalityMatch-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/max_flow/maxFlow/maxflow-group-innerQuery.sql b/pgtap/max_flow/maxFlow/maxflow-group-innerQuery.sql index 78443d90e8e..05790148ccc 100644 --- a/pgtap/max_flow/maxFlow/maxflow-group-innerQuery.sql +++ b/pgtap/max_flow/maxFlow/maxflow-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(226); diff --git a/pgtap/max_flow/maxFlow/maxflow-types-check.sql b/pgtap/max_flow/maxFlow/maxflow-types-check.sql index 1ffc8115c29..d7b09f1a8ac 100644 --- a/pgtap/max_flow/maxFlow/maxflow-types-check.sql +++ b/pgtap/max_flow/maxFlow/maxflow-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(18); diff --git a/pgtap/max_flow/maxFlow/no_crash_test-maxFlow.sql b/pgtap/max_flow/maxFlow/no_crash_test-maxFlow.sql index 8c62ab63bd0..4c1ef4ddb0e 100644 --- a/pgtap/max_flow/maxFlow/no_crash_test-maxFlow.sql +++ b/pgtap/max_flow/maxFlow/no_crash_test-maxFlow.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (81) ELSE plan(68) END; diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-innerQuery.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-innerQuery.sql index f1f4e23ee67..604c2c32ac4 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-innerQuery.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(586); diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-types-check.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-types-check.sql index 66c81ce199c..6d1ac6d5cc6 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-types-check.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(21); diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost/no_crash_test.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost/no_crash_test.sql index 219b0f1558a..65d391762ba 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost/no_crash_test.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(81) END; diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-innerquery.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-innerquery.sql index d972309dd85..7d280ece387 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-innerquery.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-innerquery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(586); diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-types-check.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-types-check.sql index 8369102a848..9884ce08d97 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-types-check.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(18); diff --git a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost/no_crash_test.sql b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost/no_crash_test.sql index 9f03baa43bf..97108ed9d54 100644 --- a/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost/no_crash_test.sql +++ b/pgtap/max_flow/maxFlowMinCost/maxFlowMinCost_Cost/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(1) ELSE plan(81) END; diff --git a/pgtap/max_flow/no_crash_test-boykovKolmogorov.sql b/pgtap/max_flow/no_crash_test-boykovKolmogorov.sql index 6bbf5868114..c509d0ff96e 100644 --- a/pgtap/max_flow/no_crash_test-boykovKolmogorov.sql +++ b/pgtap/max_flow/no_crash_test-boykovKolmogorov.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i flow_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/max_flow/no_crash_test-edgeDisjointPaths.sql b/pgtap/max_flow/no_crash_test-edgeDisjointPaths.sql index 345fad32457..b5664625e0b 100644 --- a/pgtap/max_flow/no_crash_test-edgeDisjointPaths.sql +++ b/pgtap/max_flow/no_crash_test-edgeDisjointPaths.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN NOT min_version('3.2.0') THEN plan(68) ELSE plan(81) END; diff --git a/pgtap/max_flow/no_crash_test-edmondsKarp.sql b/pgtap/max_flow/no_crash_test-edmondsKarp.sql index 1257e6e1032..0e0eabb9890 100644 --- a/pgtap/max_flow/no_crash_test-edmondsKarp.sql +++ b/pgtap/max_flow/no_crash_test-edmondsKarp.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i flow_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/max_flow/no_crash_test-maxCardinalityMatch.sql b/pgtap/max_flow/no_crash_test-maxCardinalityMatch.sql index 17b8b95ae99..7017b780a5b 100644 --- a/pgtap/max_flow/no_crash_test-maxCardinalityMatch.sql +++ b/pgtap/max_flow/no_crash_test-maxCardinalityMatch.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/max_flow/no_crash_test-pushRelabel.sql b/pgtap/max_flow/no_crash_test-pushRelabel.sql index e795bffead1..d6d92d48876 100644 --- a/pgtap/max_flow/no_crash_test-pushRelabel.sql +++ b/pgtap/max_flow/no_crash_test-pushRelabel.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i flow_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/max_flow/pushRelabel-innerQuery.sql b/pgtap/max_flow/pushRelabel-innerQuery.sql index 29693efd64c..a0d844e9622 100644 --- a/pgtap/max_flow/pushRelabel-innerQuery.sql +++ b/pgtap/max_flow/pushRelabel-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(226); diff --git a/pgtap/max_flow/pushRelabel-types-check.sql b/pgtap/max_flow/pushRelabel-types-check.sql index 1cdbba9648a..a21a66ea404 100644 --- a/pgtap/max_flow/pushRelabel-types-check.sql +++ b/pgtap/max_flow/pushRelabel-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(21); From d3459178e3364de7403436319d2a3035f4b9753c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 22/35] [mincut] [pgtap] fixing codacy PLSQL error --- pgtap/mincut/compare.test.sql | 2 +- pgtap/mincut/stoerWagner-innerQuery.sql | 2 +- pgtap/mincut/stoerWagner-types-check.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pgtap/mincut/compare.test.sql b/pgtap/mincut/compare.test.sql index a138b85f9f0..2dcf82264c9 100644 --- a/pgtap/mincut/compare.test.sql +++ b/pgtap/mincut/compare.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(6); diff --git a/pgtap/mincut/stoerWagner-innerQuery.sql b/pgtap/mincut/stoerWagner-innerQuery.sql index f87dff74fb2..3c3ab6ade90 100644 --- a/pgtap/mincut/stoerWagner-innerQuery.sql +++ b/pgtap/mincut/stoerWagner-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(56); diff --git a/pgtap/mincut/stoerWagner-types-check.sql b/pgtap/mincut/stoerWagner-types-check.sql index d970b994026..fab258f3f52 100644 --- a/pgtap/mincut/stoerWagner-types-check.sql +++ b/pgtap/mincut/stoerWagner-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); From 862096b464065e15e7394899c20a0d9c6a405d92 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 23/35] [pickDeliver] [pgtap] fixing codacy PLSQL error --- pgtap/pickDeliver/order_id_is_neg1.sql | 2 +- .../pickDeliver-VS-pickDeliverEuclidean.sql | 2 +- pgtap/pickDeliver/pickDeliver/innerQuery.sql | 4 +-- pgtap/pickDeliver/pickDeliver/issue-1725.sql | 2 +- pgtap/pickDeliver/pickDeliver/many-calls.sql | 30 +++++++++---------- pgtap/pickDeliver/pickDeliver/types_check.sql | 4 +-- .../pickDeliverEuclidean/innerQuery.sql | 2 +- .../pickDeliverEuclidean/types_check.sql | 2 +- .../wrong_data_pickDeliverEuclidean.sql | 2 +- 9 files changed, 22 insertions(+), 28 deletions(-) diff --git a/pgtap/pickDeliver/order_id_is_neg1.sql b/pgtap/pickDeliver/order_id_is_neg1.sql index 8c3d47b6304..5c1b25302bd 100644 --- a/pgtap/pickDeliver/order_id_is_neg1.sql +++ b/pgtap/pickDeliver/order_id_is_neg1.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); diff --git a/pgtap/pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql b/pgtap/pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql index 38b6907be5b..323dc5cb137 100644 --- a/pgtap/pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql +++ b/pgtap/pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/pickDeliver/pickDeliver/innerQuery.sql b/pgtap/pickDeliver/pickDeliver/innerQuery.sql index 43e7a2cb0a4..354ad70d885 100644 --- a/pgtap/pickDeliver/pickDeliver/innerQuery.sql +++ b/pgtap/pickDeliver/pickDeliver/innerQuery.sql @@ -1,9 +1,7 @@ -\i setup.sql -SET client_min_messages TO NOTICE; +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(80); -SET client_min_messages TO ERROR; /* A call looks like this SELECT * INTO pickDeliverResults FROM pgr_pickdeliverEuclidean( diff --git a/pgtap/pickDeliver/pickDeliver/issue-1725.sql b/pgtap/pickDeliver/pickDeliver/issue-1725.sql index e99c9f975cb..30d5d7709b0 100644 --- a/pgtap/pickDeliver/pickDeliver/issue-1725.sql +++ b/pgtap/pickDeliver/pickDeliver/issue-1725.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1); diff --git a/pgtap/pickDeliver/pickDeliver/many-calls.sql b/pgtap/pickDeliver/pickDeliver/many-calls.sql index 07783d010fa..90dcb0ebe21 100644 --- a/pgtap/pickDeliver/pickDeliver/many-calls.sql +++ b/pgtap/pickDeliver/pickDeliver/many-calls.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(15); SET client_min_messages TO NOTICE; @@ -18,21 +18,19 @@ SELECT * FROM pgr_pickDeliver( $$ ); -SELECT lives_ok('No_problem_query', 'Should live: '|| 1); -SELECT lives_ok('No_problem_query', 'Should live: '|| 2); -SELECT lives_ok('No_problem_query', 'Should live: '|| 3); -SELECT lives_ok('No_problem_query', 'Should live: '|| 4); -SELECT lives_ok('No_problem_query', 'Should live: '|| 5); -SELECT lives_ok('No_problem_query', 'Should live: '|| 6); -SELECT lives_ok('No_problem_query', 'Should live: '|| 7); -SELECT lives_ok('No_problem_query', 'Should live: '|| 8); -SELECT lives_ok('No_problem_query', 'Should live: '|| 9); -SELECT lives_ok('No_problem_query', 'Should live: '|| 10); -SELECT lives_ok('No_problem_query', 'Should live: '|| 11); -SELECT lives_ok('No_problem_query', 'Should live: '|| 12); -SELECT lives_ok('No_problem_query', 'Should live: '|| 13); -SELECT lives_ok('No_problem_query', 'Should live: '|| 14); -SELECT lives_ok('No_problem_query', 'Should live: '|| 15); +CREATE OR REPLACE FUNCTION repeat_lives_ok(query_to_test TEXT) +RETURNS SETOF TEXT AS +$BODY$ +DECLARE i SMALLINT; +BEGIN + FOR i IN 1..15 LOOP + RETURN QUERY SELECT lives_ok(query_to_test, 'Should live: '|| i); + END LOOP; +END; +$BODY$ +LANGUAGE plpgsql; +SELECT * FROM repeat_lives_ok('No_problem_query'); SELECT finish(); +ROLLBACK; diff --git a/pgtap/pickDeliver/pickDeliver/types_check.sql b/pgtap/pickDeliver/pickDeliver/types_check.sql index 4463c617326..62ed4eb6796 100644 --- a/pgtap/pickDeliver/pickDeliver/types_check.sql +++ b/pgtap/pickDeliver/pickDeliver/types_check.sql @@ -1,10 +1,8 @@ -\i setup.sql +BEGIN; -UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(4); - SELECT has_function('pgr_pickdeliver', ARRAY['text','text', 'text', 'double precision', 'integer', 'integer']); SELECT function_returns('_pgr_pickdeliver', diff --git a/pgtap/pickDeliver/pickDeliverEuclidean/innerQuery.sql b/pgtap/pickDeliver/pickDeliverEuclidean/innerQuery.sql index 148b04a5f8c..b15d7ca8d14 100644 --- a/pgtap/pickDeliver/pickDeliverEuclidean/innerQuery.sql +++ b/pgtap/pickDeliver/pickDeliverEuclidean/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(104); diff --git a/pgtap/pickDeliver/pickDeliverEuclidean/types_check.sql b/pgtap/pickDeliver/pickDeliverEuclidean/types_check.sql index 24496da2b39..382bf996b54 100644 --- a/pgtap/pickDeliver/pickDeliverEuclidean/types_check.sql +++ b/pgtap/pickDeliver/pickDeliverEuclidean/types_check.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(4); diff --git a/pgtap/pickDeliver/wrong_data_pickDeliverEuclidean.sql b/pgtap/pickDeliver/wrong_data_pickDeliverEuclidean.sql index e8c74a3534d..700ad075bbc 100644 --- a/pgtap/pickDeliver/wrong_data_pickDeliverEuclidean.sql +++ b/pgtap/pickDeliver/wrong_data_pickDeliverEuclidean.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(23); From ea7e1301b722f60fffbd9191b2495f4225739274 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:10 -0500 Subject: [PATCH 24/35] [planar] [pgtap] fixing codacy PLSQL error --- pgtap/planar/isPlanar/edge_cases.sql | 2 +- pgtap/planar/isPlanar/inner_query.sql | 2 +- pgtap/planar/isPlanar/no_crash_test.sql | 2 +- pgtap/planar/isPlanar/types_check.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pgtap/planar/isPlanar/edge_cases.sql b/pgtap/planar/isPlanar/edge_cases.sql index 51f68f343b2..5a09ab00868 100644 --- a/pgtap/planar/isPlanar/edge_cases.sql +++ b/pgtap/planar/isPlanar/edge_cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (16) ELSE plan(1) END; diff --git a/pgtap/planar/isPlanar/inner_query.sql b/pgtap/planar/isPlanar/inner_query.sql index 53ac85e8f62..14cc73af3a9 100644 --- a/pgtap/planar/isPlanar/inner_query.sql +++ b/pgtap/planar/isPlanar/inner_query.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (56) ELSE plan(1) END; diff --git a/pgtap/planar/isPlanar/no_crash_test.sql b/pgtap/planar/isPlanar/no_crash_test.sql index b3bc82279e7..cdb07896f18 100644 --- a/pgtap/planar/isPlanar/no_crash_test.sql +++ b/pgtap/planar/isPlanar/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (5) ELSE plan(1) END; diff --git a/pgtap/planar/isPlanar/types_check.sql b/pgtap/planar/isPlanar/types_check.sql index b4cba57cac0..3d9d391be50 100644 --- a/pgtap/planar/isPlanar/types_check.sql +++ b/pgtap/planar/isPlanar/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (4) ELSE plan(1) END; From 4a51aa4bf1d4a6358428110594d1b28948e889a0 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 25/35] [spanningTree] [pgtap] fixing codacy PLSQL error --- pgtap/spanningTree/compare-prim-kruskal.sql | 2 +- .../compare-primBFS-kruskalBFS.sql | 2 +- .../spanningTree/compare-primDD-kruskalDD.sql | 2 +- .../compare-primDFS-kruskalDFS.sql | 2 +- .../kruskal/kruskal/kruskal-edge-cases.sql | 2 +- .../kruskal/kruskal/kruskal-innerQuery.sql | 2 +- .../kruskal/kruskal/kruskal-types-check.sql | 2 +- .../kruskal/kruskal/no_crash_test-kruskal.sql | 2 +- .../kruskalBFS/kruskalBFS-edge-cases.sql | 2 +- .../kruskalBFS/kruskalBFS-innerQuery.sql | 2 +- .../kruskalBFS/kruskalBFS-types-check.sql | 2 +- .../kruskalBFS/no_crash_test-kruskalBFS.sql | 2 +- .../kruskalDD/kruskalDD-edge-cases.sql | 2 +- .../kruskalDD/kruskalDD-innerQuery.sql | 2 +- .../kruskalDD/kruskalDD-types-check.sql | 2 +- .../kruskalDD/no_crash_test-kruskalDD.sql | 2 +- .../kruskalDFS/kruskalDFS-edge-cases.sql | 2 +- .../kruskalDFS/kruskalDFS-innerQuery.sql | 2 +- .../kruskalDFS/kruskalDFS-types-check.sql | 2 +- .../kruskalDFS/no_crash_test-kruskalDFS.sql | 2 +- .../prim/prim/no_crash_test-prim.sql | 2 +- .../prim/prim/prim-edge-cases.sql | 2 +- .../prim/prim/prim-innerQuery.sql | 2 +- .../prim/prim/prim-types-check.sql | 2 +- .../prim/primBFS/no_crash_test-primBFS.sql | 2 +- .../prim/primBFS/primBFS-edge-cases.sql | 33 +++++++++++++++++-- .../prim/primBFS/primBFS-innerQuery.sql | 2 +- .../prim/primBFS/primBFS-types-check.sql | 2 +- .../prim/primDD/no_crash_test-primDD.sql | 2 +- .../prim/primDD/primDD-edge-cases.sql | 2 +- .../prim/primDD/primDD-innerQuery.sql | 2 +- .../prim/primDD/primDD-types-check.sql | 2 +- .../prim/primDFS/no_crash_test-primDFS.sql | 2 +- .../prim/primDFS/primDFS-edge-cases.sql | 2 +- .../prim/primDFS/primDFS-innerQuery.sql | 2 +- .../prim/primDFS/primDFS-types-check.sql | 2 +- 36 files changed, 66 insertions(+), 37 deletions(-) diff --git a/pgtap/spanningTree/compare-prim-kruskal.sql b/pgtap/spanningTree/compare-prim-kruskal.sql index 50ee384388f..fbb80202a1a 100644 --- a/pgtap/spanningTree/compare-prim-kruskal.sql +++ b/pgtap/spanningTree/compare-prim-kruskal.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(3); diff --git a/pgtap/spanningTree/compare-primBFS-kruskalBFS.sql b/pgtap/spanningTree/compare-primBFS-kruskalBFS.sql index dc9dcd3e226..0ceb65f2701 100644 --- a/pgtap/spanningTree/compare-primBFS-kruskalBFS.sql +++ b/pgtap/spanningTree/compare-primBFS-kruskalBFS.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(28); diff --git a/pgtap/spanningTree/compare-primDD-kruskalDD.sql b/pgtap/spanningTree/compare-primDD-kruskalDD.sql index cef2ec489d7..4aa9dc658f0 100644 --- a/pgtap/spanningTree/compare-primDD-kruskalDD.sql +++ b/pgtap/spanningTree/compare-primDD-kruskalDD.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(24); diff --git a/pgtap/spanningTree/compare-primDFS-kruskalDFS.sql b/pgtap/spanningTree/compare-primDFS-kruskalDFS.sql index 8e6b2b79e27..41acc0bd6ee 100644 --- a/pgtap/spanningTree/compare-primDFS-kruskalDFS.sql +++ b/pgtap/spanningTree/compare-primDFS-kruskalDFS.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT plan(28); diff --git a/pgtap/spanningTree/kruskal/kruskal/kruskal-edge-cases.sql b/pgtap/spanningTree/kruskal/kruskal/kruskal-edge-cases.sql index 335c36f88ba..0cb3e27ef4c 100644 --- a/pgtap/spanningTree/kruskal/kruskal/kruskal-edge-cases.sql +++ b/pgtap/spanningTree/kruskal/kruskal/kruskal-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(4); diff --git a/pgtap/spanningTree/kruskal/kruskal/kruskal-innerQuery.sql b/pgtap/spanningTree/kruskal/kruskal/kruskal-innerQuery.sql index e0f32d0561e..552960869a7 100644 --- a/pgtap/spanningTree/kruskal/kruskal/kruskal-innerQuery.sql +++ b/pgtap/spanningTree/kruskal/kruskal/kruskal-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/kruskal/kruskal/kruskal-types-check.sql b/pgtap/spanningTree/kruskal/kruskal/kruskal-types-check.sql index 8833889e758..e7c00499318 100644 --- a/pgtap/spanningTree/kruskal/kruskal/kruskal-types-check.sql +++ b/pgtap/spanningTree/kruskal/kruskal/kruskal-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/spanningTree/kruskal/kruskal/no_crash_test-kruskal.sql b/pgtap/spanningTree/kruskal/kruskal/no_crash_test-kruskal.sql index bbd7249e257..c4bce71215a 100644 --- a/pgtap/spanningTree/kruskal/kruskal/no_crash_test-kruskal.sql +++ b/pgtap/spanningTree/kruskal/kruskal/no_crash_test-kruskal.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-edge-cases.sql b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-edge-cases.sql index 35074731c00..4d5a5d2abbd 100644 --- a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-edge-cases.sql +++ b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(10); diff --git a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-innerQuery.sql b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-innerQuery.sql index 100cb684af1..73adb888207 100644 --- a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-innerQuery.sql +++ b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-types-check.sql b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-types-check.sql index 30b3d732893..d99a23f1521 100644 --- a/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-types-check.sql +++ b/pgtap/spanningTree/kruskal/kruskalBFS/kruskalBFS-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); diff --git a/pgtap/spanningTree/kruskal/kruskalBFS/no_crash_test-kruskalBFS.sql b/pgtap/spanningTree/kruskal/kruskalBFS/no_crash_test-kruskalBFS.sql index b3900651379..ab5fe6c0da6 100644 --- a/pgtap/spanningTree/kruskal/kruskalBFS/no_crash_test-kruskalBFS.sql +++ b/pgtap/spanningTree/kruskal/kruskalBFS/no_crash_test-kruskalBFS.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(86); diff --git a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-edge-cases.sql b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-edge-cases.sql index 8a5101b2ec9..ed81ff04185 100644 --- a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-edge-cases.sql +++ b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(9); diff --git a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-innerQuery.sql b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-innerQuery.sql index f8b8f92d4e6..e2e7f12b251 100644 --- a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-innerQuery.sql +++ b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-types-check.sql b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-types-check.sql index 5cb430ce7f1..de9f9dc23fa 100644 --- a/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-types-check.sql +++ b/pgtap/spanningTree/kruskal/kruskalDD/kruskalDD-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(11); diff --git a/pgtap/spanningTree/kruskal/kruskalDD/no_crash_test-kruskalDD.sql b/pgtap/spanningTree/kruskal/kruskalDD/no_crash_test-kruskalDD.sql index cc3dca86c60..a19bf7768c6 100644 --- a/pgtap/spanningTree/kruskal/kruskalDD/no_crash_test-kruskalDD.sql +++ b/pgtap/spanningTree/kruskal/kruskalDD/no_crash_test-kruskalDD.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(114); diff --git a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-edge-cases.sql b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-edge-cases.sql index f84d286747f..91290f2a97b 100644 --- a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-edge-cases.sql +++ b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(10); diff --git a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-innerQuery.sql b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-innerQuery.sql index 673a0d3cd55..5085296bce0 100644 --- a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-innerQuery.sql +++ b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-types-check.sql b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-types-check.sql index 4f38a07f0e2..ca0a8d615db 100644 --- a/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-types-check.sql +++ b/pgtap/spanningTree/kruskal/kruskalDFS/kruskalDFS-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); diff --git a/pgtap/spanningTree/kruskal/kruskalDFS/no_crash_test-kruskalDFS.sql b/pgtap/spanningTree/kruskal/kruskalDFS/no_crash_test-kruskalDFS.sql index e6b8135597d..908d85f33c0 100644 --- a/pgtap/spanningTree/kruskal/kruskalDFS/no_crash_test-kruskalDFS.sql +++ b/pgtap/spanningTree/kruskal/kruskalDFS/no_crash_test-kruskalDFS.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(86); diff --git a/pgtap/spanningTree/prim/prim/no_crash_test-prim.sql b/pgtap/spanningTree/prim/prim/no_crash_test-prim.sql index e9373098516..85482918ff5 100644 --- a/pgtap/spanningTree/prim/prim/no_crash_test-prim.sql +++ b/pgtap/spanningTree/prim/prim/no_crash_test-prim.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(9); diff --git a/pgtap/spanningTree/prim/prim/prim-edge-cases.sql b/pgtap/spanningTree/prim/prim/prim-edge-cases.sql index d88d774af67..0a8a9809f44 100644 --- a/pgtap/spanningTree/prim/prim/prim-edge-cases.sql +++ b/pgtap/spanningTree/prim/prim/prim-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(5); diff --git a/pgtap/spanningTree/prim/prim/prim-innerQuery.sql b/pgtap/spanningTree/prim/prim/prim-innerQuery.sql index 57dc46a1116..cddf14d9d1c 100644 --- a/pgtap/spanningTree/prim/prim/prim-innerQuery.sql +++ b/pgtap/spanningTree/prim/prim/prim-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/prim/prim/prim-types-check.sql b/pgtap/spanningTree/prim/prim/prim-types-check.sql index ab5e49d366b..acaedd04873 100644 --- a/pgtap/spanningTree/prim/prim/prim-types-check.sql +++ b/pgtap/spanningTree/prim/prim/prim-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/spanningTree/prim/primBFS/no_crash_test-primBFS.sql b/pgtap/spanningTree/prim/primBFS/no_crash_test-primBFS.sql index 3c4f8298ce2..e7369409b99 100644 --- a/pgtap/spanningTree/prim/primBFS/no_crash_test-primBFS.sql +++ b/pgtap/spanningTree/prim/primBFS/no_crash_test-primBFS.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(86); diff --git a/pgtap/spanningTree/prim/primBFS/primBFS-edge-cases.sql b/pgtap/spanningTree/prim/primBFS/primBFS-edge-cases.sql index 2ea100332fc..f3014f3e3d9 100644 --- a/pgtap/spanningTree/prim/primBFS/primBFS-edge-cases.sql +++ b/pgtap/spanningTree/prim/primBFS/primBFS-edge-cases.sql @@ -1,6 +1,6 @@ -\i setup.sql +BEGIN; -SELECT plan(10); +SELECT plan(13); UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; @@ -197,5 +197,34 @@ SELECT set_eq('prim10', $$, '10: root = 0 -> forest (with random root vertices)'); +-- +PREPARE prim11 AS +SELECT * FROM pgr_primBFS( + 'SELECT id, source, target, cost, reverse_cost + FROM edge_table', 18 +); + +SELECT set_eq('prim11', 'VALUES (1, 0, 18, 18, -1, 0, 0)', 'Vertex 18 does not exist'); + +-- +PREPARE prim12 AS +SELECT * +FROM pgr_primBFS( + 'SELECT id, source, target, cost, reverse_cost + FROM edge_table ORDER BY id', 4) +WHERE cost < 0; + +SELECT is_empty('prim12', 'No cost can be negative'); + +-- +PREPARE prim13 AS +SELECT * +FROM pgr_primBFS( + 'SELECT id, source, target, cost, reverse_cost + FROM edge_table ', 16 +); + +SELECT set_eq('prim13', 'VALUES (1, 0, 16, 16, -1, 0, 0), (2, 1, 16, 17, 18, 1.324, 1.324)' , 'Compare when node is 16 with expected result'); + SELECT * FROM finish(); ROLLBACK; diff --git a/pgtap/spanningTree/prim/primBFS/primBFS-innerQuery.sql b/pgtap/spanningTree/prim/primBFS/primBFS-innerQuery.sql index 54fe037d01d..3a69e5cc031 100644 --- a/pgtap/spanningTree/prim/primBFS/primBFS-innerQuery.sql +++ b/pgtap/spanningTree/prim/primBFS/primBFS-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/prim/primBFS/primBFS-types-check.sql b/pgtap/spanningTree/prim/primBFS/primBFS-types-check.sql index e522d9d52fe..3ccebd0f371 100644 --- a/pgtap/spanningTree/prim/primBFS/primBFS-types-check.sql +++ b/pgtap/spanningTree/prim/primBFS/primBFS-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); diff --git a/pgtap/spanningTree/prim/primDD/no_crash_test-primDD.sql b/pgtap/spanningTree/prim/primDD/no_crash_test-primDD.sql index 7c17825a81c..624c7dd4e03 100644 --- a/pgtap/spanningTree/prim/primDD/no_crash_test-primDD.sql +++ b/pgtap/spanningTree/prim/primDD/no_crash_test-primDD.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(114); diff --git a/pgtap/spanningTree/prim/primDD/primDD-edge-cases.sql b/pgtap/spanningTree/prim/primDD/primDD-edge-cases.sql index 5b22b2639cc..f45a3a1aa3e 100644 --- a/pgtap/spanningTree/prim/primDD/primDD-edge-cases.sql +++ b/pgtap/spanningTree/prim/primDD/primDD-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(9); diff --git a/pgtap/spanningTree/prim/primDD/primDD-innerQuery.sql b/pgtap/spanningTree/prim/primDD/primDD-innerQuery.sql index 018d2a89859..47d43af3977 100644 --- a/pgtap/spanningTree/prim/primDD/primDD-innerQuery.sql +++ b/pgtap/spanningTree/prim/primDD/primDD-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/prim/primDD/primDD-types-check.sql b/pgtap/spanningTree/prim/primDD/primDD-types-check.sql index e3749c7d3d8..95745ca62b1 100644 --- a/pgtap/spanningTree/prim/primDD/primDD-types-check.sql +++ b/pgtap/spanningTree/prim/primDD/primDD-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(11); diff --git a/pgtap/spanningTree/prim/primDFS/no_crash_test-primDFS.sql b/pgtap/spanningTree/prim/primDFS/no_crash_test-primDFS.sql index 7ef8d506024..3c01bce5aba 100644 --- a/pgtap/spanningTree/prim/primDFS/no_crash_test-primDFS.sql +++ b/pgtap/spanningTree/prim/primDFS/no_crash_test-primDFS.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(86); diff --git a/pgtap/spanningTree/prim/primDFS/primDFS-edge-cases.sql b/pgtap/spanningTree/prim/primDFS/primDFS-edge-cases.sql index 2d5d3b698c2..475fe1b81af 100644 --- a/pgtap/spanningTree/prim/primDFS/primDFS-edge-cases.sql +++ b/pgtap/spanningTree/prim/primDFS/primDFS-edge-cases.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(10); diff --git a/pgtap/spanningTree/prim/primDFS/primDFS-innerQuery.sql b/pgtap/spanningTree/prim/primDFS/primDFS-innerQuery.sql index 7aaefe12c8a..20e2f68b2ff 100644 --- a/pgtap/spanningTree/prim/primDFS/primDFS-innerQuery.sql +++ b/pgtap/spanningTree/prim/primDFS/primDFS-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/spanningTree/prim/primDFS/primDFS-types-check.sql b/pgtap/spanningTree/prim/primDFS/primDFS-types-check.sql index 97dcd8ab1e0..cfefef43f71 100644 --- a/pgtap/spanningTree/prim/primDFS/primDFS-types-check.sql +++ b/pgtap/spanningTree/prim/primDFS/primDFS-types-check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(7); From 30faf18a115a61e3ea349b1e7a480f462e8c2ec9 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 26/35] [topologicalSort] [pgtap] fixing codacy PLSQL error --- pgtap/topologicalSort/no_crash_test-topologicalSort.sql | 2 +- pgtap/topologicalSort/topologicalSort-innerQuery.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pgtap/topologicalSort/no_crash_test-topologicalSort.sql b/pgtap/topologicalSort/no_crash_test-topologicalSort.sql index 574c22ea4c6..ad6b94bd56d 100644 --- a/pgtap/topologicalSort/no_crash_test-topologicalSort.sql +++ b/pgtap/topologicalSort/no_crash_test-topologicalSort.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/topologicalSort/topologicalSort-innerQuery.sql b/pgtap/topologicalSort/topologicalSort-innerQuery.sql index 0357c4d1cd1..ef7650cf228 100644 --- a/pgtap/topologicalSort/topologicalSort-innerQuery.sql +++ b/pgtap/topologicalSort/topologicalSort-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); From 12724709a9a108efd5f534a089581435ae157222 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 27/35] [topology] [pgtap] fixing codacy PLSQL error --- pgtap/topology/analyzeGraph.test.sql | 2 +- pgtap/topology/analyzeGraph/issue1311.sql | 2 +- pgtap/topology/analyzeOneWay.test.sql | 2 +- pgtap/topology/createTopology.test.sql | 2 +- pgtap/topology/createVerticesTable.test.sql | 2 +- pgtap/topology/createVerticesTable/issue1309.sql | 2 +- pgtap/topology/extractVertices/edge-cases.sql | 3 ++- pgtap/topology/extractVertices/innerQuery.sql | 3 ++- pgtap/topology/extractVertices/no_crash_test.sql | 3 ++- pgtap/topology/extractVertices/types-check.sql | 3 +-- pgtap/topology/issue-1009.sql | 2 +- pgtap/topology/issue-1074.sql | 2 +- pgtap/topology/issue-1336.sql | 2 +- pgtap/topology/nodeNetwork.test.sql | 2 +- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pgtap/topology/analyzeGraph.test.sql b/pgtap/topology/analyzeGraph.test.sql index 6397e3212e3..146a4054ed0 100644 --- a/pgtap/topology/analyzeGraph.test.sql +++ b/pgtap/topology/analyzeGraph.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/topology/analyzeGraph/issue1311.sql b/pgtap/topology/analyzeGraph/issue1311.sql index 639cdfc9b06..7dc4ac9f51a 100644 --- a/pgtap/topology/analyzeGraph/issue1311.sql +++ b/pgtap/topology/analyzeGraph/issue1311.sql @@ -20,7 +20,7 @@ along with this program; if not, write TO the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT PLAN(3); diff --git a/pgtap/topology/analyzeOneWay.test.sql b/pgtap/topology/analyzeOneWay.test.sql index 335f30407df..4a56257ba41 100644 --- a/pgtap/topology/analyzeOneWay.test.sql +++ b/pgtap/topology/analyzeOneWay.test.sql @@ -1,6 +1,6 @@ -\i setup.sql +BEGIN; SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/topology/createTopology.test.sql b/pgtap/topology/createTopology.test.sql index 60d93f41ca8..f5fb6b4d10d 100644 --- a/pgtap/topology/createTopology.test.sql +++ b/pgtap/topology/createTopology.test.sql @@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; \set VERBOSITY 'terse' SELECT * INTO edges2 FROM edge_table; diff --git a/pgtap/topology/createVerticesTable.test.sql b/pgtap/topology/createVerticesTable.test.sql index dba6e12fdcf..b8d724d281b 100644 --- a/pgtap/topology/createVerticesTable.test.sql +++ b/pgtap/topology/createVerticesTable.test.sql @@ -20,7 +20,7 @@ along with this program; if not, write TO the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT PLAN(95); diff --git a/pgtap/topology/createVerticesTable/issue1309.sql b/pgtap/topology/createVerticesTable/issue1309.sql index 30b65b74f48..0e37f21b885 100644 --- a/pgtap/topology/createVerticesTable/issue1309.sql +++ b/pgtap/topology/createVerticesTable/issue1309.sql @@ -20,7 +20,7 @@ along with this program; if not, write TO the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT PLAN(3); diff --git a/pgtap/topology/extractVertices/edge-cases.sql b/pgtap/topology/extractVertices/edge-cases.sql index ae906bc3102..3b9a0014822 100644 --- a/pgtap/topology/extractVertices/edge-cases.sql +++ b/pgtap/topology/extractVertices/edge-cases.sql @@ -1,5 +1,6 @@ -\i setup.sql +BEGIN; +SET client_min_messages TO WARNING; SELECT plan(23); UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; diff --git a/pgtap/topology/extractVertices/innerQuery.sql b/pgtap/topology/extractVertices/innerQuery.sql index 44d461946b5..cf9fc194184 100644 --- a/pgtap/topology/extractVertices/innerQuery.sql +++ b/pgtap/topology/extractVertices/innerQuery.sql @@ -1,5 +1,6 @@ -\i setup.sql +BEGIN; +SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(84); diff --git a/pgtap/topology/extractVertices/no_crash_test.sql b/pgtap/topology/extractVertices/no_crash_test.sql index 7a6cf2ff495..b247ff48a85 100644 --- a/pgtap/topology/extractVertices/no_crash_test.sql +++ b/pgtap/topology/extractVertices/no_crash_test.sql @@ -1,5 +1,6 @@ -\i setup.sql +BEGIN; +SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(54); diff --git a/pgtap/topology/extractVertices/types-check.sql b/pgtap/topology/extractVertices/types-check.sql index 505aede458c..04b2d2f1f04 100644 --- a/pgtap/topology/extractVertices/types-check.sql +++ b/pgtap/topology/extractVertices/types-check.sql @@ -1,6 +1,5 @@ -\i setup.sql +BEGIN; -UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); ---------------------------------- diff --git a/pgtap/topology/issue-1009.sql b/pgtap/topology/issue-1009.sql index 0f657f61c5c..2c5e98caa41 100644 --- a/pgtap/topology/issue-1009.sql +++ b/pgtap/topology/issue-1009.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- node the network diff --git a/pgtap/topology/issue-1074.sql b/pgtap/topology/issue-1074.sql index 43ed6389fab..473e7cd0774 100644 --- a/pgtap/topology/issue-1074.sql +++ b/pgtap/topology/issue-1074.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- node the network -- create 2 test cases with overlapping lines, one with crossing lines and one with touching (but no crossing) lines diff --git a/pgtap/topology/issue-1336.sql b/pgtap/topology/issue-1336.sql index e2f5b24bfb3..16d6049918c 100644 --- a/pgtap/topology/issue-1336.sql +++ b/pgtap/topology/issue-1336.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- node the network -- create 2 test cases with overlapping lines, one with crossing lines and one with touching (but no crossing) lines diff --git a/pgtap/topology/nodeNetwork.test.sql b/pgtap/topology/nodeNetwork.test.sql index 91cd5229aa8..c9614400609 100644 --- a/pgtap/topology/nodeNetwork.test.sql +++ b/pgtap/topology/nodeNetwork.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- node the network -- create 4x4 grid of overlapping lines horizontal and vertical From e3f6ba27722bcdf15b04bb8266524285244acad6 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 28/35] [transitiveClosure] [pgtap] fixing codacy PLSQL error --- pgtap/transitiveClosure/no_crash_test-transitiveClosure.sql | 2 +- pgtap/transitiveClosure/transitiveClosure-innerQuery.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pgtap/transitiveClosure/no_crash_test-transitiveClosure.sql b/pgtap/transitiveClosure/no_crash_test-transitiveClosure.sql index 5de10b65599..de237460d27 100644 --- a/pgtap/transitiveClosure/no_crash_test-transitiveClosure.sql +++ b/pgtap/transitiveClosure/no_crash_test-transitiveClosure.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); diff --git a/pgtap/transitiveClosure/transitiveClosure-innerQuery.sql b/pgtap/transitiveClosure/transitiveClosure-innerQuery.sql index 67197953047..9d7dee1f8e9 100644 --- a/pgtap/transitiveClosure/transitiveClosure-innerQuery.sql +++ b/pgtap/transitiveClosure/transitiveClosure-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(2); From af04cb62ff91f943a161a09ef539e5530440aa10 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 29/35] [traversal] [pgtap] fixing codacy PLSQL error --- pgtap/traversal/depthFirstSearch/edge_cases_directed.sql | 2 +- pgtap/traversal/depthFirstSearch/edge_cases_undirected.sql | 2 +- pgtap/traversal/depthFirstSearch/equivalence_BFS.test.sql | 2 +- pgtap/traversal/depthFirstSearch/inner_query.sql | 2 +- pgtap/traversal/depthFirstSearch/issue1348.sql | 2 +- pgtap/traversal/depthFirstSearch/no_crash_test.sql | 2 +- .../singleVertex_equiv_multipleVertices.test.sql | 2 +- pgtap/traversal/depthFirstSearch/types_check.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pgtap/traversal/depthFirstSearch/edge_cases_directed.sql b/pgtap/traversal/depthFirstSearch/edge_cases_directed.sql index 9f804f86914..0010237ddc4 100644 --- a/pgtap/traversal/depthFirstSearch/edge_cases_directed.sql +++ b/pgtap/traversal/depthFirstSearch/edge_cases_directed.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (18) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/edge_cases_undirected.sql b/pgtap/traversal/depthFirstSearch/edge_cases_undirected.sql index 326163a5985..9ca1a0d01cf 100644 --- a/pgtap/traversal/depthFirstSearch/edge_cases_undirected.sql +++ b/pgtap/traversal/depthFirstSearch/edge_cases_undirected.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (18) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/equivalence_BFS.test.sql b/pgtap/traversal/depthFirstSearch/equivalence_BFS.test.sql index dabb5544a79..260d6100de0 100644 --- a/pgtap/traversal/depthFirstSearch/equivalence_BFS.test.sql +++ b/pgtap/traversal/depthFirstSearch/equivalence_BFS.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (16) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/inner_query.sql b/pgtap/traversal/depthFirstSearch/inner_query.sql index 1d5f13f3048..43b7b9a9efd 100644 --- a/pgtap/traversal/depthFirstSearch/inner_query.sql +++ b/pgtap/traversal/depthFirstSearch/inner_query.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (432) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/issue1348.sql b/pgtap/traversal/depthFirstSearch/issue1348.sql index f0bf68ef955..9435f3d4262 100644 --- a/pgtap/traversal/depthFirstSearch/issue1348.sql +++ b/pgtap/traversal/depthFirstSearch/issue1348.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (8) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/no_crash_test.sql b/pgtap/traversal/depthFirstSearch/no_crash_test.sql index 296fdd8d646..79e7dd31c6b 100644 --- a/pgtap/traversal/depthFirstSearch/no_crash_test.sql +++ b/pgtap/traversal/depthFirstSearch/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (59) ELSE plan(1) END; diff --git a/pgtap/traversal/depthFirstSearch/singleVertex_equiv_multipleVertices.test.sql b/pgtap/traversal/depthFirstSearch/singleVertex_equiv_multipleVertices.test.sql index 655216547fc..eb3777cedc5 100644 --- a/pgtap/traversal/depthFirstSearch/singleVertex_equiv_multipleVertices.test.sql +++ b/pgtap/traversal/depthFirstSearch/singleVertex_equiv_multipleVertices.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT CASE WHEN min_version('3.2.0') THEN plan (22) ELSE plan(2) END; diff --git a/pgtap/traversal/depthFirstSearch/types_check.sql b/pgtap/traversal/depthFirstSearch/types_check.sql index f0e2905c3c2..5ba07ec8391 100644 --- a/pgtap/traversal/depthFirstSearch/types_check.sql +++ b/pgtap/traversal/depthFirstSearch/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (7) ELSE plan(1) END; From f7b1fb161ba4441ff2a23b6ecefd5a8b8855354c Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 30/35] [trsp] [pgtap] fixing codacy PLSQL error --- pgtap/trsp/blank-restrictions-compare-dijkstra.test.sql | 2 +- pgtap/trsp/emptyset-from-i-to-i.test.sql | 2 +- pgtap/trsp/from1to3.test.sql | 2 +- pgtap/trsp/from3to4-directed.test.sql | 2 +- pgtap/trsp/no-restrictions-compare-dijkstra-directed.test.sql | 2 +- pgtap/trsp/no-restrictions-compare-dijkstra-undirected.test.sql | 2 +- pgtap/trsp/no_crash_test-trsp-int-flt.sql | 2 +- pgtap/trsp/no_crash_test-trsp-int-int.sql | 2 +- pgtap/trsp/no_crash_test-trsp-viaE.sql | 2 +- pgtap/trsp/no_crash_test-trsp-viaV.sql | 2 +- pgtap/trsp/trsp-any-00.test.sql | 2 +- pgtap/trsp/trsp-any-01.test.sql | 2 +- pgtap/trsp/trsp-issue244.test.sql | 2 +- pgtap/trsp/trsp/innerQuery.sql | 2 +- pgtap/trsp/trspViaEdges/innerQuery.sql | 2 +- pgtap/trsp/trspViaVertices/innerQuery.sql | 2 +- .../viaV-no-restrictions-compare-dijkstra-directed.test.sql | 2 +- .../viaV-no-restrictions-compare-dijkstra-undirected.test.sql | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pgtap/trsp/blank-restrictions-compare-dijkstra.test.sql b/pgtap/trsp/blank-restrictions-compare-dijkstra.test.sql index 273054c9ee1..3122b425c3f 100644 --- a/pgtap/trsp/blank-restrictions-compare-dijkstra.test.sql +++ b/pgtap/trsp/blank-restrictions-compare-dijkstra.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(1296); diff --git a/pgtap/trsp/emptyset-from-i-to-i.test.sql b/pgtap/trsp/emptyset-from-i-to-i.test.sql index e8fb0618eab..2ddf7b63e8d 100644 --- a/pgtap/trsp/emptyset-from-i-to-i.test.sql +++ b/pgtap/trsp/emptyset-from-i-to-i.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(144); diff --git a/pgtap/trsp/from1to3.test.sql b/pgtap/trsp/from1to3.test.sql index 01b3786f6e2..d947f7cd716 100644 --- a/pgtap/trsp/from1to3.test.sql +++ b/pgtap/trsp/from1to3.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(7); diff --git a/pgtap/trsp/from3to4-directed.test.sql b/pgtap/trsp/from3to4-directed.test.sql index 433c6213b6b..986c2f2f6db 100644 --- a/pgtap/trsp/from3to4-directed.test.sql +++ b/pgtap/trsp/from3to4-directed.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(3); diff --git a/pgtap/trsp/no-restrictions-compare-dijkstra-directed.test.sql b/pgtap/trsp/no-restrictions-compare-dijkstra-directed.test.sql index 845a731bfea..8dd726f2c91 100644 --- a/pgtap/trsp/no-restrictions-compare-dijkstra-directed.test.sql +++ b/pgtap/trsp/no-restrictions-compare-dijkstra-directed.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i trsp_tests.sql SELECT plan(612); diff --git a/pgtap/trsp/no-restrictions-compare-dijkstra-undirected.test.sql b/pgtap/trsp/no-restrictions-compare-dijkstra-undirected.test.sql index 726624075ad..c9a86c287a9 100644 --- a/pgtap/trsp/no-restrictions-compare-dijkstra-undirected.test.sql +++ b/pgtap/trsp/no-restrictions-compare-dijkstra-undirected.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i trsp_tests.sql diff --git a/pgtap/trsp/no_crash_test-trsp-int-flt.sql b/pgtap/trsp/no_crash_test-trsp-int-flt.sql index 8e721b8f528..84e142ea649 100644 --- a/pgtap/trsp/no_crash_test-trsp-int-flt.sql +++ b/pgtap/trsp/no_crash_test-trsp-int-flt.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(32); diff --git a/pgtap/trsp/no_crash_test-trsp-int-int.sql b/pgtap/trsp/no_crash_test-trsp-int-int.sql index a6cb464c41a..98d1beb4292 100644 --- a/pgtap/trsp/no_crash_test-trsp-int-int.sql +++ b/pgtap/trsp/no_crash_test-trsp-int-int.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('4.0.0') THEN plan(38) ELSE plan(23) END; diff --git a/pgtap/trsp/no_crash_test-trsp-viaE.sql b/pgtap/trsp/no_crash_test-trsp-viaE.sql index 973e108397c..656d51365a2 100644 --- a/pgtap/trsp/no_crash_test-trsp-viaE.sql +++ b/pgtap/trsp/no_crash_test-trsp-viaE.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('4.0.0') THEN plan(22) ELSE plan(21) END; diff --git a/pgtap/trsp/no_crash_test-trsp-viaV.sql b/pgtap/trsp/no_crash_test-trsp-viaV.sql index 6bb2ca2a28e..c25258ad443 100644 --- a/pgtap/trsp/no_crash_test-trsp-viaV.sql +++ b/pgtap/trsp/no_crash_test-trsp-viaV.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('4.0.0') THEN plan(22) ELSE plan(19) END; diff --git a/pgtap/trsp/trsp-any-00.test.sql b/pgtap/trsp/trsp-any-00.test.sql index d5c95edbe44..5283f3e42bb 100644 --- a/pgtap/trsp/trsp-any-00.test.sql +++ b/pgtap/trsp/trsp-any-00.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; diff --git a/pgtap/trsp/trsp-any-01.test.sql b/pgtap/trsp/trsp-any-01.test.sql index bcc53a5013d..72ca1dfff1a 100644 --- a/pgtap/trsp/trsp-any-01.test.sql +++ b/pgtap/trsp/trsp-any-01.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(1); UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; diff --git a/pgtap/trsp/trsp-issue244.test.sql b/pgtap/trsp/trsp-issue244.test.sql index a3bf42759f6..8933dc58600 100644 --- a/pgtap/trsp/trsp-issue244.test.sql +++ b/pgtap/trsp/trsp-issue244.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; CREATE TABLE edge_table_i244 ( diff --git a/pgtap/trsp/trsp/innerQuery.sql b/pgtap/trsp/trsp/innerQuery.sql index f17c32c3ebe..4266032388a 100644 --- a/pgtap/trsp/trsp/innerQuery.sql +++ b/pgtap/trsp/trsp/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- This test is prepared for when: -- Tentatively trsp will accepts ANY-INTEGER and ANY-NUMERICAL on 4.0.0 diff --git a/pgtap/trsp/trspViaEdges/innerQuery.sql b/pgtap/trsp/trspViaEdges/innerQuery.sql index 5e55473abcc..569b99f5411 100644 --- a/pgtap/trsp/trspViaEdges/innerQuery.sql +++ b/pgtap/trsp/trspViaEdges/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- This test is prepared for when: -- Tentatively trsp will accepts ANY-INTEGER and ANY-NUMERICAL on 4.0.0 diff --git a/pgtap/trsp/trspViaVertices/innerQuery.sql b/pgtap/trsp/trspViaVertices/innerQuery.sql index 58cdf8c58da..90a2a9533ff 100644 --- a/pgtap/trsp/trspViaVertices/innerQuery.sql +++ b/pgtap/trsp/trspViaVertices/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; -- This test is prepared for when: -- Tentatively trsp will accepts ANY-INTEGER and ANY-NUMERICAL on 4.0.0 diff --git a/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-directed.test.sql b/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-directed.test.sql index bc8d6ba67ee..68d65577ada 100644 --- a/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-directed.test.sql +++ b/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-directed.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i trsp_tests.sql SELECT plan(1024); diff --git a/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-undirected.test.sql b/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-undirected.test.sql index d05186101a1..5f485729e30 100644 --- a/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-undirected.test.sql +++ b/pgtap/trsp/viaV-no-restrictions-compare-dijkstra-undirected.test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i trsp_tests.sql SELECT plan(1024); From 9fcd0fd613f352508d212d0aa9dd068b854ed423 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 31/35] [tsp] [pgtap] fixing codacy PLSQL error --- pgtap/tsp/TSPeuclidean/edge_cases.sql | 4 ++-- pgtap/tsp/TSPeuclidean/illegal_values.sql | 2 +- pgtap/tsp/TSPeuclidean/innerQuery.sql | 2 +- pgtap/tsp/TSPeuclidean/no_crash_test.sql | 2 +- pgtap/tsp/TSPeuclidean/types_check.sql | 2 +- pgtap/tsp/issues/issue-1760.sql | 4 ++-- pgtap/tsp/issues/issue-1883.sql | 4 ++-- pgtap/tsp/performance/dj38.sql | 6 ++---- pgtap/tsp/performance/qa194.sql | 4 +--- pgtap/tsp/performance/wi29.sql | 4 +--- pgtap/tsp/tsp/edge_cases.sql | 5 ++--- pgtap/tsp/tsp/illegal_values.sql | 2 +- pgtap/tsp/tsp/innerQuery.sql | 2 +- pgtap/tsp/tsp/no_crash_test.sql | 2 +- pgtap/tsp/tsp/types_check.sql | 2 +- 15 files changed, 20 insertions(+), 27 deletions(-) diff --git a/pgtap/tsp/TSPeuclidean/edge_cases.sql b/pgtap/tsp/TSPeuclidean/edge_cases.sql index 7b84e0b13fc..6ad4c3e1561 100644 --- a/pgtap/tsp/TSPeuclidean/edge_cases.sql +++ b/pgtap/tsp/TSPeuclidean/edge_cases.sql @@ -1,7 +1,7 @@ -\i setup.sql +BEGIN; +SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SET client_min_messages TO ERROR; SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(22) ELSE plan(15) END; CREATE TEMP TABLE data AS diff --git a/pgtap/tsp/TSPeuclidean/illegal_values.sql b/pgtap/tsp/TSPeuclidean/illegal_values.sql index 62c412684c6..59b560dabb2 100644 --- a/pgtap/tsp/TSPeuclidean/illegal_values.sql +++ b/pgtap/tsp/TSPeuclidean/illegal_values.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/TSPeuclidean/innerQuery.sql b/pgtap/tsp/TSPeuclidean/innerQuery.sql index 36bd041735e..455fa12e61e 100644 --- a/pgtap/tsp/TSPeuclidean/innerQuery.sql +++ b/pgtap/tsp/TSPeuclidean/innerQuery.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/TSPeuclidean/no_crash_test.sql b/pgtap/tsp/TSPeuclidean/no_crash_test.sql index 33b06b81d87..f73b646bf55 100644 --- a/pgtap/tsp/TSPeuclidean/no_crash_test.sql +++ b/pgtap/tsp/TSPeuclidean/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/TSPeuclidean/types_check.sql b/pgtap/tsp/TSPeuclidean/types_check.sql index 5df96a091d2..136b8f03931 100644 --- a/pgtap/tsp/TSPeuclidean/types_check.sql +++ b/pgtap/tsp/TSPeuclidean/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql SELECT plan(5); diff --git a/pgtap/tsp/issues/issue-1760.sql b/pgtap/tsp/issues/issue-1760.sql index b4249c6e6ab..c216124dc7d 100644 --- a/pgtap/tsp/issues/issue-1760.sql +++ b/pgtap/tsp/issues/issue-1760.sql @@ -1,7 +1,7 @@ -\i setup.sql +BEGIN; -UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); +SET client_min_messages TO ERROR; SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(11) ELSE plan(1) END; CREATE FUNCTION issue() diff --git a/pgtap/tsp/issues/issue-1883.sql b/pgtap/tsp/issues/issue-1883.sql index cb82f4d9d03..77a770ee327 100644 --- a/pgtap/tsp/issues/issue-1883.sql +++ b/pgtap/tsp/issues/issue-1883.sql @@ -1,7 +1,7 @@ -\i setup.sql +BEGIN; -UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); +SET client_min_messages TO ERROR; SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(20) ELSE plan(1) END; CREATE FUNCTION issue() diff --git a/pgtap/tsp/performance/dj38.sql b/pgtap/tsp/performance/dj38.sql index fd99d3c5107..e909b73ad91 100644 --- a/pgtap/tsp/performance/dj38.sql +++ b/pgtap/tsp/performance/dj38.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql -- NAME: dj38 @@ -11,7 +11,6 @@ -- DIMENSION: 38 -- EDGE_WEIGHT_TYPE: EUC_2D -SET client_min_messages TO WARNING; DROP TABLE IF EXISTS dj38; CREATE TABLE dj38 (id BIGINT, x FLOAT, y FLOAT, the_geom geometry); COPY dj38 (id, x, y) FROM stdin WITH DELIMITER ' '; @@ -57,10 +56,9 @@ COPY dj38 (id, x, y) FROM stdin WITH DELIMITER ' '; UPDATE dj38 SET the_geom = ST_makePoint(x,y); -SET client_min_messages TO NOTICE; - SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(38) ELSE plan(1) END; SELECT tsp_performance('dj38', 38, 6656.0, 2.0); SELECT finish(); +ROLLBACK; diff --git a/pgtap/tsp/performance/qa194.sql b/pgtap/tsp/performance/qa194.sql index a30b41ce745..3bc0209f0cb 100644 --- a/pgtap/tsp/performance/qa194.sql +++ b/pgtap/tsp/performance/qa194.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql -- NAME : qa194 @@ -8,7 +8,6 @@ -- DIMENSION : 194 -- EDGE_WEIGHT_TYPE : EUC_2D -SET client_min_messages TO WARNING; DROP TABLE IF EXISTS qa194; CREATE TABLE qa194 (id BIGINT, x FLOAT, y FLOAT, the_geom geometry); COPY qa194 (id, x, y) FROM stdin WITH DELIMITER ' '; @@ -210,7 +209,6 @@ COPY qa194 (id, x, y) FROM stdin WITH DELIMITER ' '; UPDATE qa194 SET the_geom = ST_makePoint(x,y); -SET client_min_messages TO NOTICE; SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(5) ELSE plan(1) END; SELECT tsp_performance('qa194', 5, 9352, 2); diff --git a/pgtap/tsp/performance/wi29.sql b/pgtap/tsp/performance/wi29.sql index bc14b117d3c..3272e4c4be4 100644 --- a/pgtap/tsp/performance/wi29.sql +++ b/pgtap/tsp/performance/wi29.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql -- NAME : wi29 @@ -8,7 +8,6 @@ -- DIMENSION : 29 -- EDGE_WEIGHT_TYPE : EUC_2D -SET client_min_messages TO WARNING; DROP TABLE IF EXISTS wi29; CREATE TABLE wi29 (id BIGINT, x FLOAT, y FLOAT, the_geom geometry); COPY wi29 (id, x, y) FROM stdin WITH DELIMITER ' '; @@ -45,7 +44,6 @@ COPY wi29 (id, x, y) FROM stdin WITH DELIMITER ' '; UPDATE wi29 SET the_geom = ST_makePoint(x,y); -SET client_min_messages TO NOTICE; SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(29) ELSE plan(1) END; SELECT tsp_performance('wi29', 29, 95345, 2); diff --git a/pgtap/tsp/tsp/edge_cases.sql b/pgtap/tsp/tsp/edge_cases.sql index 5c8a9f59541..0fb26a3c3dc 100644 --- a/pgtap/tsp/tsp/edge_cases.sql +++ b/pgtap/tsp/tsp/edge_cases.sql @@ -1,8 +1,7 @@ -\i setup.sql +BEGIN; +SET client_min_messages TO WARNING; UPDATE edge_table SET cost = sign(cost) + 0.001 * id * id, reverse_cost = sign(reverse_cost) + 0.001 * id * id; -SET client_min_messages TO ERROR; - SELECT CASE WHEN min_lib_version('3.2.1') THEN plan(56) ELSE plan(18) END; CREATE TEMP TABLE data AS diff --git a/pgtap/tsp/tsp/illegal_values.sql b/pgtap/tsp/tsp/illegal_values.sql index 2058b6b2e4e..78e6aa9b836 100644 --- a/pgtap/tsp/tsp/illegal_values.sql +++ b/pgtap/tsp/tsp/illegal_values.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/tsp/innerQuery.sql b/pgtap/tsp/tsp/innerQuery.sql index e8b8f3e5832..4af7fc2643e 100644 --- a/pgtap/tsp/tsp/innerQuery.sql +++ b/pgtap/tsp/tsp/innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/tsp/no_crash_test.sql b/pgtap/tsp/tsp/no_crash_test.sql index d5ad05d1bfb..dd1bbdbbe57 100644 --- a/pgtap/tsp/tsp/no_crash_test.sql +++ b/pgtap/tsp/tsp/no_crash_test.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); diff --git a/pgtap/tsp/tsp/types_check.sql b/pgtap/tsp/tsp/types_check.sql index c031161811b..1b19254dc18 100644 --- a/pgtap/tsp/tsp/types_check.sql +++ b/pgtap/tsp/tsp/types_check.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; \i tsp_pgtap_tests.sql SELECT plan(5); From 3b6531889147c53f88efa9f214d6053baa24c1e8 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 32/35] [version] [pgtap] fixing codacy PLSQL error --- pgtap/version/full_version.sql | 2 +- pgtap/version/version.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pgtap/version/full_version.sql b/pgtap/version/full_version.sql index 5f72210b91c..27e15eb4dbe 100644 --- a/pgtap/version/full_version.sql +++ b/pgtap/version/full_version.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); diff --git a/pgtap/version/version.sql b/pgtap/version/version.sql index 1a8dccec55c..672d60cb512 100644 --- a/pgtap/version/version.sql +++ b/pgtap/version/version.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(5); From bbdc992026bac8fcc7863f0e561621c37d5097d5 Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 33/35] [vrp_basic] [pgtap] fixing codacy PLSQL error --- pgtap/vrp_basic/no_crash_test-vrpOneDepot.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pgtap/vrp_basic/no_crash_test-vrpOneDepot.sql b/pgtap/vrp_basic/no_crash_test-vrpOneDepot.sql index 7623f9c2f65..db7aba1caff 100644 --- a/pgtap/vrp_basic/no_crash_test-vrpOneDepot.sql +++ b/pgtap/vrp_basic/no_crash_test-vrpOneDepot.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT plan(13); From ac244f105778fa28bc9b964f3536b0838ea54dae Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:20:11 -0500 Subject: [PATCH 34/35] [withPoints] [pgtap] fixing codacy PLSQL error --- pgtap/withPoints/issue1640.sql | 2 +- pgtap/withPoints/issue979DD.sql | 2 +- pgtap/withPoints/many_to_many_eq_combinations.test.sql | 2 +- pgtap/withPoints/many_to_many_eq_one_to_one_withPoint.test.sql | 2 +- pgtap/withPoints/many_to_one_eq_one_to_one_withPoint.test.sql | 2 +- pgtap/withPoints/no_crash_test-withPoints.sql | 2 +- pgtap/withPoints/no_crash_test-withPointsCost.sql | 2 +- pgtap/withPoints/one_to_many_eq_one_to_one_withPoint.test.sql | 2 +- pgtap/withPoints/one_to_many_withPoint.test.sql | 2 +- pgtap/withPoints/one_to_one_withPoint.test.sql | 2 +- pgtap/withPoints/undirected_equalityDD.sql | 2 +- pgtap/withPoints/undirected_equalityWPDijkstra.sql | 2 +- pgtap/withPoints/withPoints-group-innerQuery.sql | 2 +- pgtap/withPoints/withPointsCost-group-innerQuery.sql | 2 +- .../withPointsCost_empty_combinations_empty_result.test.sql | 2 +- .../withPoints_empty_combinations_empty_result.test.sql | 2 +- pgtap/withPoints/withPoints_oneToOne-compare-dijkstra.test.sql | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pgtap/withPoints/issue1640.sql b/pgtap/withPoints/issue1640.sql index c3818210a6a..39b26ad1ae6 100644 --- a/pgtap/withPoints/issue1640.sql +++ b/pgtap/withPoints/issue1640.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; SELECT plan(4); diff --git a/pgtap/withPoints/issue979DD.sql b/pgtap/withPoints/issue979DD.sql index 75976dd8b46..e73993045f4 100644 --- a/pgtap/withPoints/issue979DD.sql +++ b/pgtap/withPoints/issue979DD.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(6); diff --git a/pgtap/withPoints/many_to_many_eq_combinations.test.sql b/pgtap/withPoints/many_to_many_eq_combinations.test.sql index be3939995ee..60b46ca2ac2 100644 --- a/pgtap/withPoints/many_to_many_eq_combinations.test.sql +++ b/pgtap/withPoints/many_to_many_eq_combinations.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(2); diff --git a/pgtap/withPoints/many_to_many_eq_one_to_one_withPoint.test.sql b/pgtap/withPoints/many_to_many_eq_one_to_one_withPoint.test.sql index 2b1c5c5cf4d..34a7fe53edb 100644 --- a/pgtap/withPoints/many_to_many_eq_one_to_one_withPoint.test.sql +++ b/pgtap/withPoints/many_to_many_eq_one_to_one_withPoint.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(13); diff --git a/pgtap/withPoints/many_to_one_eq_one_to_one_withPoint.test.sql b/pgtap/withPoints/many_to_one_eq_one_to_one_withPoint.test.sql index 7e4eadc2809..7a69c51aedc 100644 --- a/pgtap/withPoints/many_to_one_eq_one_to_one_withPoint.test.sql +++ b/pgtap/withPoints/many_to_one_eq_one_to_one_withPoint.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(7); diff --git a/pgtap/withPoints/no_crash_test-withPoints.sql b/pgtap/withPoints/no_crash_test-withPoints.sql index 22ec27df27f..7eb4578092c 100644 --- a/pgtap/withPoints/no_crash_test-withPoints.sql +++ b/pgtap/withPoints/no_crash_test-withPoints.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (102) ELSE plan(85) END; diff --git a/pgtap/withPoints/no_crash_test-withPointsCost.sql b/pgtap/withPoints/no_crash_test-withPointsCost.sql index 2972f4be614..03e7079fb18 100644 --- a/pgtap/withPoints/no_crash_test-withPointsCost.sql +++ b/pgtap/withPoints/no_crash_test-withPointsCost.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (102) ELSE plan(85) END; diff --git a/pgtap/withPoints/one_to_many_eq_one_to_one_withPoint.test.sql b/pgtap/withPoints/one_to_many_eq_one_to_one_withPoint.test.sql index 7dc8872c123..3f9ab445c53 100644 --- a/pgtap/withPoints/one_to_many_eq_one_to_one_withPoint.test.sql +++ b/pgtap/withPoints/one_to_many_eq_one_to_one_withPoint.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(7); diff --git a/pgtap/withPoints/one_to_many_withPoint.test.sql b/pgtap/withPoints/one_to_many_withPoint.test.sql index 1721ecf9d33..841fd358e14 100644 --- a/pgtap/withPoints/one_to_many_withPoint.test.sql +++ b/pgtap/withPoints/one_to_many_withPoint.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(8); diff --git a/pgtap/withPoints/one_to_one_withPoint.test.sql b/pgtap/withPoints/one_to_one_withPoint.test.sql index c6a6b7df882..a1899d3cadd 100644 --- a/pgtap/withPoints/one_to_one_withPoint.test.sql +++ b/pgtap/withPoints/one_to_one_withPoint.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(6); diff --git a/pgtap/withPoints/undirected_equalityDD.sql b/pgtap/withPoints/undirected_equalityDD.sql index d546ff59aa3..e31e19ab8c0 100644 --- a/pgtap/withPoints/undirected_equalityDD.sql +++ b/pgtap/withPoints/undirected_equalityDD.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(3); diff --git a/pgtap/withPoints/undirected_equalityWPDijkstra.sql b/pgtap/withPoints/undirected_equalityWPDijkstra.sql index 1b270a28ae4..c7f55c0263c 100644 --- a/pgtap/withPoints/undirected_equalityWPDijkstra.sql +++ b/pgtap/withPoints/undirected_equalityWPDijkstra.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT PLAN(12); diff --git a/pgtap/withPoints/withPoints-group-innerQuery.sql b/pgtap/withPoints/withPoints-group-innerQuery.sql index 62d4deebfba..2f91c31275b 100644 --- a/pgtap/withPoints/withPoints-group-innerQuery.sql +++ b/pgtap/withPoints/withPoints-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (658) ELSE plan(657) END; diff --git a/pgtap/withPoints/withPointsCost-group-innerQuery.sql b/pgtap/withPoints/withPointsCost-group-innerQuery.sql index b46ed34b59d..98fb12f9ac6 100644 --- a/pgtap/withPoints/withPointsCost-group-innerQuery.sql +++ b/pgtap/withPoints/withPointsCost-group-innerQuery.sql @@ -1,4 +1,4 @@ -\i setup.sql +BEGIN; UPDATE edge_table SET cost = sign(cost), reverse_cost = sign(reverse_cost); SELECT CASE WHEN min_version('3.2.0') THEN plan (658) ELSE plan(657) END; diff --git a/pgtap/withPoints/withPointsCost_empty_combinations_empty_result.test.sql b/pgtap/withPoints/withPointsCost_empty_combinations_empty_result.test.sql index a21b38e3cf7..d14e606b55d 100644 --- a/pgtap/withPoints/withPointsCost_empty_combinations_empty_result.test.sql +++ b/pgtap/withPoints/withPointsCost_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/withPoints/withPoints_empty_combinations_empty_result.test.sql b/pgtap/withPoints/withPoints_empty_combinations_empty_result.test.sql index 6b79029e346..55f8a8736af 100644 --- a/pgtap/withPoints/withPoints_empty_combinations_empty_result.test.sql +++ b/pgtap/withPoints/withPoints_empty_combinations_empty_result.test.sql @@ -1,5 +1,5 @@ -\i setup.sql +BEGIN; SELECT plan(1); diff --git a/pgtap/withPoints/withPoints_oneToOne-compare-dijkstra.test.sql b/pgtap/withPoints/withPoints_oneToOne-compare-dijkstra.test.sql index f40da60c0a0..4579adee422 100644 --- a/pgtap/withPoints/withPoints_oneToOne-compare-dijkstra.test.sql +++ b/pgtap/withPoints/withPoints_oneToOne-compare-dijkstra.test.sql @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ********************************************************************PGR-GNU*/ -\i setup.sql +BEGIN; SELECT CASE WHEN NOT min_lib_version('3.1.1') THEN plan(1) From a0fd0a5f63fb1ccafc04dd37ee643c544f385d5b Mon Sep 17 00:00:00 2001 From: cvvergara Date: Tue, 12 Oct 2021 10:29:26 -0500 Subject: [PATCH 35/35] [pgtap][tools] ignore notices --- tools/testers/tsp_pgtap_tests.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testers/tsp_pgtap_tests.sql b/tools/testers/tsp_pgtap_tests.sql index 26dc1dbb823..107a2db2dab 100644 --- a/tools/testers/tsp_pgtap_tests.sql +++ b/tools/testers/tsp_pgtap_tests.sql @@ -1,3 +1,5 @@ +SET client_min_messages TO WARNING; + CREATE OR REPLACE FUNCTION tsp_performance( tbl REGCLASS, loop_limit INTEGER,