Merge pull request #2150 from alisonrwu/issue-2124

[astar] fixing PLSQL
pgRouting · Oct 1, 2021 · a11ed4a · a11ed4a
2 parents 8ca8e46 + 5d964ae
commit a11ed4a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 36 deletions.
diff --git a/docqueries/astar/doc-aStarCost.result b/docqueries/astar/doc-aStarCost.result
@@ -2,7 +2,7 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
---q1
+/* -- q1 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12);
@@ -11,7 +11,7 @@ SELECT * FROM pgr_aStarCost(
          2 |      12 |        4
 (1 row)
 
---q2
+/* -- q2 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12,
@@ -21,7 +21,7 @@ SELECT * FROM pgr_aStarCost(
          2 |      12 |        4
 (1 row)
 
---q3
+/* -- q3 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, ARRAY[3, 12], heuristic := 2);
@@ -31,7 +31,7 @@ SELECT * FROM pgr_aStarCost(
          2 |      12 |        4
 (2 rows)
 
---q4
+/* -- q4 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], 12, heuristic := 0);
@@ -41,7 +41,7 @@ SELECT * FROM pgr_aStarCost(
          7 |      12 |        5
 (2 rows)
 
---q5
+/* -- q5 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], ARRAY[3, 12], heuristic := 2);
@@ -53,7 +53,7 @@ SELECT * FROM pgr_aStarCost(
          7 |      12 |        5
 (4 rows)
 
---q6
+/* -- q6 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     'SELECT * FROM ( VALUES (7, 3), (2, 12) ) AS t(source, target)',
@@ -64,6 +64,6 @@ SELECT * FROM pgr_aStarCost(
          7 |       3 |        6
 (2 rows)
 
---q7
+/* -- q7 */
 ROLLBACK;
 ROLLBACK
diff --git a/docqueries/astar/doc-aStarCost.test.sql b/docqueries/astar/doc-aStarCost.test.sql
@@ -1,27 +1,27 @@
-\echo --q1
+/* -- q1 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12);
-\echo --q2
+/* -- q2 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12,
     directed := false, heuristic := 2);
-\echo --q3
+/* -- q3 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, ARRAY[3, 12], heuristic := 2);
-\echo --q4
+/* -- q4 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], 12, heuristic := 0);
-\echo --q5
+/* -- q5 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], ARRAY[3, 12], heuristic := 2);
-\echo --q6
+/* -- q6 */
 SELECT * FROM pgr_aStarCost(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     'SELECT * FROM ( VALUES (7, 3), (2, 12) ) AS t(source, target)',
     heuristic := 2);
-\echo --q7
+/* -- q7 */
diff --git a/docqueries/astar/doc-aStarCostMatrix.result b/docqueries/astar/doc-aStarCostMatrix.result
@@ -2,7 +2,7 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
--- astar q1
+/* -- astar q1 */
 SELECT * FROM pgr_aStarCostMatrix(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5)
@@ -23,7 +23,7 @@ SELECT * FROM pgr_aStarCostMatrix(
          4 |       3 |        1
 (12 rows)
 
--- astar q2
+/* -- astar q2 */
 SELECT * FROM pgr_aStarCostMatrix(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
@@ -45,7 +45,7 @@ SELECT * FROM pgr_aStarCostMatrix(
          4 |       3 |        1
 (12 rows)
 
--- astar q3
+/* -- astar q3 */
 SELECT * FROM pgr_TSP(
     $$
     SELECT * FROM pgr_aStarCostMatrix(
@@ -65,6 +65,6 @@ SELECT * FROM pgr_TSP(
    5 |    1 |    0 |        6
 (5 rows)
 
--- astar q4
+/* -- astar q4 */
 ROLLBACK;
 ROLLBACK
diff --git a/docqueries/astar/doc-aStarCostMatrix.test.sql b/docqueries/astar/doc-aStarCostMatrix.test.sql
@@ -1,18 +1,18 @@
 ------------------------
 -- pgr_aStar
 ------------------------
-\echo -- astar q1
+/* -- q astar q1 */
 SELECT * FROM pgr_aStarCostMatrix(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5)
 );
-\echo -- astar q2
+/* -- q astar q2 */
 SELECT * FROM pgr_aStarCostMatrix(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     (SELECT array_agg(id) FROM edge_table_vertices_pgr WHERE id < 5),
     directed := false, heuristic := 2
 );
-\echo -- astar q3
+/* -- q astar q3 */
 SELECT * FROM pgr_TSP(
     $$
     SELECT * FROM pgr_aStarCostMatrix(
@@ -23,4 +23,4 @@ SELECT * FROM pgr_TSP(
     $$,
     randomize := false
 );
-\echo -- astar q4
+/* -- q astar q4 */
diff --git a/docqueries/astar/doc-astar.result b/docqueries/astar/doc-astar.result
@@ -2,7 +2,7 @@ BEGIN;
 BEGIN
 SET client_min_messages TO NOTICE;
 SET
---q1
+/* -- q1 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12);
@@ -15,7 +15,7 @@ SELECT * FROM pgr_astar(
    5 |        5 |   12 |   -1 |    0 |        4
 (5 rows)
 
---q2
+/* -- q2 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12,
@@ -29,7 +29,7 @@ SELECT * FROM pgr_astar(
    5 |        5 |   12 |   -1 |    0 |        4
 (5 rows)
 
---q3
+/* -- q3 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, ARRAY[3, 12], heuristic := 2);
@@ -48,7 +48,7 @@ SELECT * FROM pgr_astar(
   11 |        5 |      12 |   12 |   -1 |    0 |        4
 (11 rows)
 
---q4
+/* -- q4 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], 12, heuristic := 0);
@@ -67,7 +67,7 @@ SELECT * FROM pgr_astar(
   11 |        6 |         7 |   12 |   -1 |    0 |        5
 (11 rows)
 
---q5
+/* -- q5 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], ARRAY[3, 12], heuristic := 2);
@@ -99,7 +99,7 @@ SELECT * FROM pgr_astar(
   24 |        6 |         7 |      12 |   12 |   -1 |    0 |        5
 (24 rows)
 
---q6
+/* -- q6 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     'SELECT * FROM ( VALUES (7, 3), (2, 12) ) AS t(source, target)',
@@ -120,6 +120,6 @@ SELECT * FROM pgr_astar(
   12 |        7 |         7 |       3 |    3 |   -1 |    0 |        6
 (12 rows)
 
---q7
+/* -- q7 */
 ROLLBACK;
 ROLLBACK
diff --git a/docqueries/astar/doc-astar.test.sql b/docqueries/astar/doc-astar.test.sql
@@ -1,27 +1,27 @@
-\echo --q1
+/* -- q1 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12);
-\echo --q2
+/* -- q2 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, 12,
     directed := false, heuristic := 2);
-\echo --q3
+/* -- q3 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     2, ARRAY[3, 12], heuristic := 2);
-\echo --q4
+/* -- q4 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], 12, heuristic := 0);
-\echo --q5
+/* -- q5 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     ARRAY[7, 2], ARRAY[3, 12], heuristic := 2);
-\echo --q6
+/* -- q6 */
 SELECT * FROM pgr_astar(
     'SELECT id, source, target, cost, reverse_cost, x1, y1, x2, y2 FROM edge_table',
     'SELECT * FROM ( VALUES (7, 3), (2, 12) ) AS t(source, target)',
     heuristic := 2);
-\echo --q7
+/* -- q7 */