Skip to content

Commit

Permalink
[legacy] removing wild cards, not tested
Browse files Browse the repository at this point in the history
  • Loading branch information
cvvergara committed Sep 25, 2023
1 parent 5a9535a commit edcb956
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
6 changes: 3 additions & 3 deletions sql/legacy/legacy-developers.sql
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ DECLARE
BEGIN
table_oid := $1::regclass;
-- $1 := replace($1, '"', '');
SELECT * FROM _pgr_getTableName($1, 0, 'pgr_getTableName') into sname,tname;
SELECT sname, tname FROM _pgr_getTableName($1, 0, 'pgr_getTableName') into sname,tname;
EXCEPTION WHEN others THEN
BEGIN
table_oid := lower($1)::regclass;
SELECT * FROM _pgr_getTableName(lower($1), 0, 'pgr_getTableName') into sname,tname;
SELECT sname, tname FROM _pgr_getTableName(lower($1), 0, 'pgr_getTableName') into sname,tname;
EXCEPTION WHEN others THEN
sname = 'public';
tname = NULL;
Expand Down Expand Up @@ -436,7 +436,7 @@ DECLARE
debuglevel text;

BEGIN
execute 'SELECT * FROM ' || quote_ident(edges) ||
execute 'SELECT source, target, the_geom FROM ' || quote_ident(edges) ||
' where ST_dwithin(''' || pnt::text ||
'''::geometry, the_geom, ' || tol || ') ORDER BY ST_distance(''' || pnt::text ||
'''::geometry, the_geom) asc limit 1' into rr;
Expand Down
26 changes: 13 additions & 13 deletions sql/legacy/legacy_experimental.sql
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowPushRelabel(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_PushRelabel($1, $2, $3);
END
$BODY$
Expand All @@ -261,7 +261,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowPushRelabel(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_PushRelabel($1, $2, $3);
END
$BODY$
Expand All @@ -281,7 +281,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowPushRelabel(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_PushRelabel($1, $2, $3);
END
$BODY$
Expand All @@ -301,7 +301,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowPushRelabel(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_PushRelabel($1, $2, $3);
END
$BODY$
Expand All @@ -324,7 +324,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowBoykovKolmogorov(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_boykovKolmogorov($1, $2, $3);
END
$BODY$
Expand All @@ -344,7 +344,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowBoykovKolmogorov(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_boykovKolmogorov($1, $2, $3);
END
$BODY$
Expand All @@ -364,7 +364,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowBoykovKolmogorov(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_boykovKolmogorov($1, $2, $3);
END
$BODY$
Expand All @@ -384,7 +384,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowBoykovKolmogorov(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_boykovKolmogorov($1, $2, $3);
END
$BODY$
Expand All @@ -407,7 +407,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowEdmondsKarp(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_edmondsKarp($1, $2, $3);
END
$BODY$
Expand All @@ -428,7 +428,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowEdmondsKarp(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_edmondsKarp($1, $2, $3);
END
$BODY$
Expand All @@ -448,7 +448,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowEdmondsKarp(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_edmondsKarp($1, $2, $3);
END
$BODY$
Expand All @@ -468,7 +468,7 @@ CREATE OR REPLACE FUNCTION pgr_maxFlowEdmondsKarp(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_edmondsKarp($1, $2, $3);
END
$BODY$
Expand All @@ -489,7 +489,7 @@ CREATE OR REPLACE FUNCTION pgr_maximumcardinalitymatching(
RETURNS SETOF RECORD AS
$BODY$
BEGIN
RETURN QUERY SELECT *
RETURN QUERY SELECT seq, edge_id, source, target, flow, residual_capacity
FROM pgr_maxCardinalityMatch($1, $2);
END
$BODY$
Expand Down
3 changes: 2 additions & 1 deletion sql/legacy/vrppdtw/_gsoc_vrppdtw.sql
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ BEGIN
-- seq | vehicle_id | vehicle_seq | stop_id | travel_time | arrival_time | wait_time | service_time | departure_time
final_sql = $$ WITH
customer_data AS ($$ || customers_sql || $$ ),
p_deliver AS (SELECT * FROM _pgr_pickDeliverEuclidean('$$ || orders_sql || $$', '$$ || vehicles_sql || $$', 1, $$ || max_cycles || $$ )),
p_deliver AS (SELECT seq, vehicle_seq, vehicle_id, stop_seq, stop_type, order_id, cargo, travel_time, arrival_time, wait_time, service_time, departure_time
FROM _pgr_pickDeliverEuclidean('$$ || orders_sql || $$', '$$ || vehicles_sql || $$', 1, $$ || max_cycles || $$ )),
picks AS (SELECT p_deliver.*, pindex, dindex, id AS the_id FROM p_deliver JOIN customer_data ON (id = order_id AND stop_type = 2)),
delivers AS (SELECT p_deliver.*, pindex, dindex, dindex AS the_id FROM p_deliver JOIN customer_data ON (id = order_id AND stop_type = 3)),
depots AS (SELECT p_deliver.*, 0 as pindex, 0 as dindex, 0 AS the_id FROM p_deliver WHERE (stop_type IN (-1,1,6))),
Expand Down

0 comments on commit edcb956

Please sign in to comment.