[SQL] not using wildcard in new signatures

and some small fixes
pgRouting · Sep 25, 2023 · 3d17cd6 · 3d17cd6
1 parent 19cdb9b
commit 3d17cd6
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 53 deletions.
diff --git a/sql/astar/astar.sql b/sql/astar/astar.sql
@@ -55,7 +55,7 @@ CREATE FUNCTION pgr_aStar(
 
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[],  ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
@@ -85,7 +85,7 @@ CREATE FUNCTION pgr_aStar(
 
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_aStar(_pgr_get_statement($1), ARRAY[$2]::BIGINT[],  $3::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT);
 $BODY$
 LANGUAGE sql VOLATILE STRICT
@@ -115,7 +115,7 @@ CREATE FUNCTION pgr_aStar(
 
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_aStar(_pgr_get_statement($1), $2::BIGINT[],  ARRAY[$3]::BIGINT[], $4, $5, $6::FLOAT, $7::FLOAT, normal:=false);
 $BODY$
 LANGUAGE sql VOLATILE STRICT

diff --git a/sql/driving_distance/drivingDistance.sql b/sql/driving_distance/drivingDistance.sql
@@ -88,7 +88,7 @@ IS 'pgr_v4drivingDistance(Single_vertex)
 - Optional Parameters
    - directed := true
 - Documentation:
-   - ${PROJECT_DOC_LINK}/pgr_v4drivingDistance.html
+   - ${PROJECT_DOC_LINK}/pgr_drivingDistance.html
 ';
 
 COMMENT ON FUNCTION pgr_drivingDistance(TEXT, ANYARRAY, FLOAT, BOOLEAN, BOOLEAN)
@@ -101,7 +101,7 @@ IS 'pgr_v4drivingDistance(Multiple vertices)
    - directed := true
    - equicost := false
 - Documentation:
-   - ${PROJECT_DOC_LINK}/pgr_v4drivingDistance.html
+   - ${PROJECT_DOC_LINK}/pgr_drivingDistance.html
 ';
 
 
diff --git a/sql/driving_distance/withPointsDD.sql b/sql/driving_distance/withPointsDD.sql
@@ -51,7 +51,7 @@ CREATE FUNCTION pgr_withPointsDD(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, depth, start_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsDD(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], $4, $5, $6, $7, false);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -80,7 +80,7 @@ CREATE FUNCTION pgr_withPointsDD(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, depth, start_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsDD(_pgr_get_statement($1), _pgr_get_statement($2), $3, $4, $5, $6, $7, $8);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT

diff --git a/sql/ksp/ksp.sql b/sql/ksp/ksp.sql
@@ -47,7 +47,7 @@ CREATE FUNCTION pgr_ksp(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _v4pgr_ksp(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -76,7 +76,7 @@ CREATE FUNCTION pgr_ksp(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM  _v4pgr_ksp(_pgr_get_statement($1), ARRAY[$2]::BIGINT[], $3::BIGINT[], $4, $5, $6);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -104,7 +104,7 @@ CREATE FUNCTION pgr_ksp(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM  _v4pgr_ksp(_pgr_get_statement($1), $2::BIGINT[], ARRAY[$3]::BIGINT[], $4, $5, $6);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -132,7 +132,7 @@ CREATE FUNCTION pgr_ksp(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM  _v4pgr_ksp(_pgr_get_statement($1), $2::BIGINT[], $3::BIGINT[], $4, $5, $6);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -159,7 +159,7 @@ CREATE FUNCTION pgr_ksp(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM  _v4pgr_ksp(_pgr_get_statement($1), _pgr_get_statement($2), $3, $4, $5);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT

diff --git a/sql/ksp/withPointsKSP.sql b/sql/ksp/withPointsKSP.sql
@@ -50,7 +50,7 @@ CREATE FUNCTION pgr_withPointsKSP(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -82,7 +82,7 @@ CREATE FUNCTION pgr_withPointsKSP(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), ARRAY[$3]::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -114,7 +114,7 @@ CREATE FUNCTION pgr_withPointsKSP(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], ARRAY[$4]::BIGINT[], $5, $6, $7, $8, $9);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -146,7 +146,7 @@ CREATE FUNCTION pgr_withPointsKSP(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), $3::BIGINT[], $4::BIGINT[], $5, $6, $7, $8, $9);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT
@@ -177,7 +177,7 @@ CREATE FUNCTION pgr_withPointsKSP(
     OUT agg_cost FLOAT)
 RETURNS SETOF RECORD AS
 $BODY$
-    SELECT *
+    SELECT seq, path_id, path_seq, start_vid, end_vid, node, edge, cost, agg_cost
     FROM _pgr_v4withPointsKSP(_pgr_get_statement($1), _pgr_get_statement($2), _pgr_get_statement($3), $4, $5, $6, $7, $8);
 $BODY$
 LANGUAGE SQL VOLATILE STRICT

diff --git a/sql/legacy/vrppdtw/_gsoc_vrppdtw.sql b/sql/legacy/vrppdtw/_gsoc_vrppdtw.sql
@@ -1,5 +1,5 @@
 /*PGR-GNU*****************************************************************
-File: reginabook.sql
+File: _gsoc_vrppdtw.sql
 
 Generated with Template by:
 Copyright (c) 2017 pgRouting developers

diff --git a/src/version/_version.h b/src/version/_version.h