pgRouting · cvvergara · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
diff --git a/NEWS.md b/NEWS.md
@@ -6,7 +6,10 @@
 
 ### vrpRouting 0.4.2 Release Notes
 
-No changes yet.
+**Documentation queries**
+
+* Renamed to extension `.pg`
+* Removed `doc-` and `doc-vrp_` suffixes on file names
 
 ### vrpRouting 0.4.1 Release Notes
 

diff --git a/doc/general/release_notes.rst b/doc/general/release_notes.rst
@@ -41,7 +41,10 @@ vrpRouting 0.4
 vrpRouting 0.4.2 Release Notes
 -------------------------------------------------------------------------------
 
-No changes yet.
+.. rubric:: Documentation queries
+
+* Renamed to extension `.pg`
+* Removed `doc-` and `doc-vrp_` suffixes on file names
 
 vrpRouting 0.4.1 Release Notes
 -------------------------------------------------------------------------------

diff --git a/doc/general/sampledata.rst b/doc/general/sampledata.rst
@@ -132,7 +132,7 @@ Modified VROOM Data
 The tables created using the above VROOM Data are modified for the VROOM functions
 with timestamps/interval, as:
 
-.. literalinclude:: ../../docqueries/vroom/doc-vrp_vroom.test.sql
+.. literalinclude:: ../../docqueries/vroom/vroom.pg
    :start-after: -- q0
    :end-before: -- q1
 

diff --git a/doc/or_tools/vrp_bin_packing.rst b/doc/or_tools/vrp_bin_packing.rst
@@ -133,7 +133,7 @@ Where:
 Example
 -------------------------------------------------------------------------------
 
-.. literalinclude:: doc-vrp_bin_packing.queries
+.. literalinclude:: bin_packing.queries
    :start-after: -- example_start
    :end-before: -- example_end
 

diff --git a/doc/or_tools/vrp_knapsack.rst b/doc/or_tools/vrp_knapsack.rst
@@ -126,7 +126,7 @@ Where:
 Example
 -------------------------------------------------------------------------------
 
-.. literalinclude:: doc-vrp_knapsack.queries
+.. literalinclude:: knapsack.queries
    :start-after: -- example_start
    :end-before: -- example_end
 

diff --git a/doc/or_tools/vrp_multiple_knapsack.rst b/doc/or_tools/vrp_multiple_knapsack.rst
@@ -127,7 +127,7 @@ Result Columns
 Example
 -------------------------------------------------------------------------------
 
-.. literalinclude:: doc-vrp_multiple_knapsack.queries
+.. literalinclude:: multiple_knapsack.queries
    :start-after: -- example_start
    :end-before: -- example_end
 

diff --git a/doc/pgr_pickDeliver/vrp_oneDepot.rst b/doc/pgr_pickDeliver/vrp_oneDepot.rst
@@ -64,7 +64,7 @@ Result Columns
 Example
 -------------------------------------------------------------------------------
 
-.. literalinclude:: doc-oneDepot.queries
+.. literalinclude:: oneDepot.queries
 
 .. rubric:: Data
 

diff --git a/doc/pgr_pickDeliver/vrp_pgr_pickDeliver.rst b/doc/pgr_pickDeliver/vrp_pgr_pickDeliver.rst
@@ -135,7 +135,7 @@ Example
 
 This example use the following data:
 
-.. literalinclude:: doc-pgr_pickDeliver.queries
+.. literalinclude:: pgr_pickDeliver.queries
    :start-after: --q2
    :end-before: --q3
 

diff --git a/doc/pgr_pickDeliver/vrp_pgr_pickDeliverEuclidean.rst b/doc/pgr_pickDeliver/vrp_pgr_pickDeliverEuclidean.rst
@@ -130,7 +130,7 @@ Example
 This example use the following data:
 
 
-.. literalinclude:: ./doc-pgr_pickDeliverEuclidean.queries
+.. literalinclude:: ./pgr_pickDeliverEuclidean.queries
    :start-after: --q1
    :end-before: --q2
 

diff --git a/doc/version/vrp_full_version.rst b/doc/version/vrp_full_version.rst
@@ -50,7 +50,7 @@ Signatures
 
 :Example: Get the version installed for this documentation.
 
-.. literalinclude:: doc-full_version.queries
+.. literalinclude:: full_version.queries
    :start-after: -- q1
    :end-before: -- q2
 

diff --git a/doc/version/vrp_version.rst b/doc/version/vrp_version.rst
@@ -46,7 +46,7 @@ Signatures
 
 :Example: vrpRouting Version for this documentatoin
 
-.. literalinclude:: doc-version.queries
+.. literalinclude:: version.queries
    :start-after: -- q1
    :end-before: -- q2
 

diff --git a/doc/vroom/vrp_vroom.rst b/doc/vroom/vrp_vroom.rst
@@ -66,7 +66,7 @@ Optional parameters are `named parameters` and have a default value.
 **Example**: This example is based on the modified VROOM Data of the :doc:`sampledata` network.
 The modification in the tables is mentioned at the end of the :doc:`sampledata`.
 
-.. literalinclude:: doc-vrp_vroom.queries
+.. literalinclude:: vroom.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -124,7 +124,7 @@ Additional Example
 Problem involving 2 jobs and 1 shipment, using a single vehicle, similar to the VROOM Documentation
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__ with a shipment.
 
-.. literalinclude:: doc-vrp_vroom.queries
+.. literalinclude:: vroom.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/doc/vroom/vrp_vroomJobs.rst b/doc/vroom/vrp_vroomJobs.rst
@@ -65,7 +65,7 @@ Optional parameters are `named parameters` and have a default value.
 **Example**: This example is based on the modified VROOM Data of the :doc:`sampledata` network.
 The modification in the tables is mentioned at the end of the :doc:`sampledata`.
 
-.. literalinclude:: doc-vrp_vroomJobs.queries
+.. literalinclude:: vroomJobs.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -116,7 +116,7 @@ Additional Example
 Problem involving 2 jobs, using a single vehicle, corresponding to the VROOM Documentation
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__.
 
-.. literalinclude:: doc-vrp_vroomJobs.queries
+.. literalinclude:: vroomJobs.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/doc/vroom/vrp_vroomJobsPlain.rst b/doc/vroom/vrp_vroomJobsPlain.rst
@@ -64,7 +64,7 @@ Optional parameters are `named parameters` and have a default value.
 
 **Example**: This example is based on the VROOM Data of the :doc:`sampledata` network:
 
-.. literalinclude:: doc-vrp_vroomJobsPlain.queries
+.. literalinclude:: vroomJobsPlain.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -115,7 +115,7 @@ Additional Example
 Problem involving 2 jobs, using a single vehicle, corresponding to the VROOM Documentation
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__.
 
-.. literalinclude:: doc-vrp_vroomJobsPlain.queries
+.. literalinclude:: vroomJobsPlain.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/doc/vroom/vrp_vroomPlain.rst b/doc/vroom/vrp_vroomPlain.rst
@@ -65,7 +65,7 @@ Optional parameters are `named parameters` and have a default value.
 
 **Example**: This example is based on the VROOM Data of the :doc:`sampledata` network:
 
-.. literalinclude:: doc-vrp_vroomPlain.queries
+.. literalinclude:: vroomPlain.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -123,7 +123,7 @@ Additional Example
 Problem involving 2 jobs and 1 shipment, using a single vehicle, similar to the VROOM Documentation
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__ with a shipment.
 
-.. literalinclude:: doc-vrp_vroomPlain.queries
+.. literalinclude:: vroomPlain.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/doc/vroom/vrp_vroomShipments.rst b/doc/vroom/vrp_vroomShipments.rst
@@ -65,7 +65,7 @@ Optional parameters are `named parameters` and have a default value.
 **Example**: This example is based on the modified VROOM Data of the :doc:`sampledata` network.
 The modification in the tables is mentioned at the end of the :doc:`sampledata`.
 
-.. literalinclude:: doc-vrp_vroomShipments.queries
+.. literalinclude:: vroomShipments.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -117,7 +117,7 @@ Problem involving 1 shipment, using a single vehicle, similar to the VROOM Docum
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__ without jobs
 and with a shipment.
 
-.. literalinclude:: doc-vrp_vroomShipments.queries
+.. literalinclude:: vroomShipments.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/doc/vroom/vrp_vroomShipmentsPlain.rst b/doc/vroom/vrp_vroomShipmentsPlain.rst
@@ -64,7 +64,7 @@ Optional parameters are `named parameters` and have a default value.
 
 **Example**: This example is based on the VROOM Data of the :doc:`sampledata` network:
 
-.. literalinclude:: doc-vrp_vroomShipmentsPlain.queries
+.. literalinclude:: vroomShipmentsPlain.queries
    :start-after: -- q1
    :end-before: -- q2
 
@@ -116,7 +116,7 @@ Problem involving 1 shipment, using a single vehicle, similar to the VROOM Docum
 `Example 2 <https://github.com/VROOM-Project/vroom/blob/master/docs/example_2.json>`__ without jobs
 and with a shipment.
 
-.. literalinclude:: doc-vrp_vroomShipmentsPlain.queries
+.. literalinclude:: vroomShipmentsPlain.queries
    :start-after: -- q2
    :end-before: -- q3
 

diff --git a/docqueries/CMakeLists.txt b/docqueries/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Do not use extensions
+SET(LOCAL_FILES
+    version
+    full_version
+    )
+
+foreach (f ${LOCAL_FILES})
+    configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
+    list(APPEND LOCAL_DOC_FILES  "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
+endforeach()
+
+set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
diff --git a/...ehicles/compatibleVehicles/debug.test.sql → ...tibleVehicles/compatibleVehicles/debug.pg b/...ehicles/compatibleVehicles/debug.test.sql → ...tibleVehicles/compatibleVehicles/debug.pg
diff --git a/...hicles/compatibleVehicles/new_db.test.sql → ...ibleVehicles/compatibleVehicles/new_db.pg b/...hicles/compatibleVehicles/new_db.test.sql → ...ibleVehicles/compatibleVehicles/new_db.pg
diff --git a/...cles/compatibleVehicles/order-20.test.sql → ...leVehicles/compatibleVehicles/order-20.pg b/...cles/compatibleVehicles/order-20.test.sql → ...leVehicles/compatibleVehicles/order-20.pg
diff --git a/...compatibleVehicles/sample_output.test.sql → ...icles/compatibleVehicles/sample_output.pg b/...compatibleVehicles/sample_output.test.sql → ...icles/compatibleVehicles/sample_output.pg
diff --git a/...les/compatibleVehiclesRaw/new_db.test.sql → ...eVehicles/compatibleVehiclesRaw/new_db.pg b/...les/compatibleVehiclesRaw/new_db.test.sql → ...eVehicles/compatibleVehiclesRaw/new_db.pg
diff --git a/...s/compatibleVehiclesRaw/order-20.test.sql → ...ehicles/compatibleVehiclesRaw/order-20.pg b/...s/compatibleVehiclesRaw/order-20.test.sql → ...ehicles/compatibleVehiclesRaw/order-20.pg
diff --git a/...patibleVehiclesRaw/sample_output.test.sql → ...es/compatibleVehiclesRaw/sample_output.pg b/...patibleVehiclesRaw/sample_output.test.sql → ...es/compatibleVehiclesRaw/sample_output.pg
diff --git a/...ataCheck/create_initial_solution.test.sql → ...ries/dataCheck/create_initial_solution.pg b/...ataCheck/create_initial_solution.test.sql → ...ries/dataCheck/create_initial_solution.pg
diff --git a/docqueries/dataCheck/data_check.test.sql → docqueries/dataCheck/data_check.pg b/docqueries/dataCheck/data_check.test.sql → docqueries/dataCheck/data_check.pg
diff --git a/docqueries/full_version.result b/docqueries/full_version.result
@@ -0,0 +1,14 @@
+BEGIN;
+BEGIN
+SET client_min_messages TO NOTICE;
+SET
+/* -- q1 */
+SELECT version, library FROM pgr_full_version();
+  version  |     library
+-----------+-----------------
+ 3.7.0-dev | pgrouting-3.7.0
+(1 row)
+
+/* -- q2 */
+ROLLBACK;
+ROLLBACK
diff --git a/...mize/09-12-mid-day-partial-false.test.sql → ...e/optimize/09-12-mid-day-partial-false.pg b/...mize/09-12-mid-day-partial-false.test.sql → ...e/optimize/09-12-mid-day-partial-false.pg
diff --git a/...ize/optimize/09-12-partial-false.test.sql → .../optimize/optimize/09-12-partial-false.pg b/...ize/optimize/09-12-partial-false.test.sql → .../optimize/optimize/09-12-partial-false.pg
diff --git a/...ize/optimize/10-12-partial-false.test.sql → .../optimize/optimize/10-12-partial-false.pg b/...ize/optimize/10-12-partial-false.test.sql → .../optimize/optimize/10-12-partial-false.pg
diff --git a/...ize/optimize/11-12-partial-false.test.sql → .../optimize/optimize/11-12-partial-false.pg b/...ize/optimize/11-12-partial-false.test.sql → .../optimize/optimize/11-12-partial-false.pg
diff --git a/...ize/optimize/12-12-partial-false.test.sql → .../optimize/optimize/12-12-partial-false.pg b/...ize/optimize/12-12-partial-false.test.sql → .../optimize/optimize/12-12-partial-false.pg
diff --git a/...ize/optimize/13-12-partial-false.test.sql → .../optimize/optimize/13-12-partial-false.pg b/...ize/optimize/13-12-partial-false.test.sql → .../optimize/optimize/13-12-partial-false.pg
diff --git a/...timize/optimizeRaw/09-12-mid-day.test.sql → ...ies/optimize/optimizeRaw/09-12-mid-day.pg b/...timize/optimizeRaw/09-12-mid-day.test.sql → ...ies/optimize/optimizeRaw/09-12-mid-day.pg
diff --git a/...ries/optimize/optimizeRaw/dec_09.test.sql → docqueries/optimize/optimizeRaw/dec_09.pg b/...ries/optimize/optimizeRaw/dec_09.test.sql → docqueries/optimize/optimizeRaw/dec_09.pg
diff --git a/...ries/optimize/optimizeRaw/dec_10.test.sql → docqueries/optimize/optimizeRaw/dec_10.pg b/...ries/optimize/optimizeRaw/dec_10.test.sql → docqueries/optimize/optimizeRaw/dec_10.pg
diff --git a/...ries/optimize/optimizeRaw/dec_11.test.sql → docqueries/optimize/optimizeRaw/dec_11.pg b/...ries/optimize/optimizeRaw/dec_11.test.sql → docqueries/optimize/optimizeRaw/dec_11.pg
diff --git a/...ries/optimize/optimizeRaw/dec_12.test.sql → docqueries/optimize/optimizeRaw/dec_12.pg b/...ries/optimize/optimizeRaw/dec_12.test.sql → docqueries/optimize/optimizeRaw/dec_12.pg
diff --git a/...ries/optimize/optimizeRaw/dec_13.test.sql → docqueries/optimize/optimizeRaw/dec_13.pg b/...ries/optimize/optimizeRaw/dec_13.test.sql → docqueries/optimize/optimizeRaw/dec_13.pg
diff --git a/.../optimizeUpdateRaw/09-12-mid-day.test.sql → ...timize/optimizeUpdateRaw/09-12-mid-day.pg b/.../optimizeUpdateRaw/09-12-mid-day.test.sql → ...timize/optimizeUpdateRaw/09-12-mid-day.pg
diff --git a/...ptimize/optimizeUpdateRaw/dec_09.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_09.pg b/...ptimize/optimizeUpdateRaw/dec_09.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_09.pg
diff --git a/...ptimize/optimizeUpdateRaw/dec_10.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_10.pg b/...ptimize/optimizeUpdateRaw/dec_10.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_10.pg
diff --git a/...ptimize/optimizeUpdateRaw/dec_11.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_11.pg b/...ptimize/optimizeUpdateRaw/dec_11.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_11.pg
diff --git a/...ptimize/optimizeUpdateRaw/dec_12.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_12.pg b/...ptimize/optimizeUpdateRaw/dec_12.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_12.pg
diff --git a/...ptimize/optimizeUpdateRaw/dec_13.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_13.pg b/...ptimize/optimizeUpdateRaw/dec_13.test.sql → ...ries/optimize/optimizeUpdateRaw/dec_13.pg
diff --git a/docqueries/or_tools/CMakeLists.txt b/docqueries/or_tools/CMakeLists.txt
@@ -1,11 +1,11 @@
 SET(LOCAL_FILES
-    doc-vrp_knapsack
-    doc-vrp_multiple_knapsack
-    doc-vrp_bin_packing
+    knapsack
+    multiple_knapsack
+    bin_packing
     )
 
 foreach (f ${LOCAL_FILES})
     configure_file("${f}.result" "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
     list(APPEND LOCAL_DOC_FILES  "${PGR_DOCUMENTATION_SOURCE_DIR}/${f}.queries")
 endforeach()
-set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
+set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE)
diff --git a/...ies/or_tools/doc-vrp_bin_packing.test.sql → docqueries/or_tools/bin_packing.pg b/...ies/or_tools/doc-vrp_bin_packing.test.sql → docqueries/or_tools/bin_packing.pg
diff --git a/...eries/or_tools/doc-vrp_bin_packing.result → docqueries/or_tools/bin_packing.result b/...eries/or_tools/doc-vrp_bin_packing.result → docqueries/or_tools/bin_packing.result
diff --git a/...ueries/or_tools/doc-vrp_knapsack.test.sql → docqueries/or_tools/knapsack.pg b/...ueries/or_tools/doc-vrp_knapsack.test.sql → docqueries/or_tools/knapsack.pg
diff --git a/docqueries/or_tools/doc-vrp_knapsack.result → docqueries/or_tools/knapsack.result b/docqueries/or_tools/doc-vrp_knapsack.result → docqueries/or_tools/knapsack.result
diff --git a/..._tools/doc-vrp_multiple_knapsack.test.sql → docqueries/or_tools/multiple_knapsack.pg b/..._tools/doc-vrp_multiple_knapsack.test.sql → docqueries/or_tools/multiple_knapsack.pg
diff --git a/...or_tools/doc-vrp_multiple_knapsack.result → docqueries/or_tools/multiple_knapsack.result b/...or_tools/doc-vrp_multiple_knapsack.result → docqueries/or_tools/multiple_knapsack.result
diff --git a/docqueries/or_tools/test.conf b/docqueries/or_tools/test.conf
@@ -5,15 +5,15 @@
         'comment' => 'Test for OR-Tools',
         'activate' => 'true',
         'tests' => [qw(
-            doc-vrp_knapsack
-            doc-vrp_multiple_knapsack
-            doc-vrp_bin_packing
+            knapsack
+            multiple_knapsack
+            bin_packing
             )],
 
         'documentation' => [qw(
-            doc-vrp_knapsack
-            doc-vrp_multiple_knapsack
-            doc-vrp_bin_packing
+            knapsack
+            multiple_knapsack
+            bin_packing
             )],
 
         'nottesting' => [qw(

diff --git a/docqueries/pgr_pickDeliver/CMakeLists.txt b/docqueries/pgr_pickDeliver/CMakeLists.txt
@@ -1,8 +1,8 @@
 # Do not use extensions
 SET(LOCAL_FILES
-    doc-pgr_pickDeliverEuclidean
-    doc-pgr_pickDeliver
-    doc-oneDepot
+    pgr_pickDeliverEuclidean
+    pgr_pickDeliver
+    oneDepot
     )
 
 foreach (f ${LOCAL_FILES})

diff --git a/.../pgr_pickDeliver/book_from_query.test.sql → ...ueries/pgr_pickDeliver/book_from_query.pg b/.../pgr_pickDeliver/book_from_query.test.sql → ...ueries/pgr_pickDeliver/book_from_query.pg
diff --git a/docqueries/pgr_pickDeliver/book_vrp.test.sql → docqueries/pgr_pickDeliver/book_vrp.pg b/docqueries/pgr_pickDeliver/book_vrp.test.sql → docqueries/pgr_pickDeliver/book_vrp.pg
diff --git a/...ies/pgr_pickDeliver/design_pgtap.test.sql → docqueries/pgr_pickDeliver/design_pgtap.pg b/...ies/pgr_pickDeliver/design_pgtap.test.sql → docqueries/pgr_pickDeliver/design_pgtap.pg
diff --git a/...Deliver/differentVechiles-cygwin.test.sql → ...r_pickDeliver/differentVechiles-cygwin.pg b/...Deliver/differentVechiles-cygwin.test.sql → ...r_pickDeliver/differentVechiles-cygwin.pg
diff --git a/...gr_pickDeliver/differentVechiles.test.sql → ...ries/pgr_pickDeliver/differentVechiles.pg b/...gr_pickDeliver/differentVechiles.test.sql → ...ries/pgr_pickDeliver/differentVechiles.pg
diff --git a/...pickDeliver/jet_customers-cygwin.test.sql → ...s/pgr_pickDeliver/jet_customers-cygwin.pg b/...pickDeliver/jet_customers-cygwin.test.sql → ...s/pgr_pickDeliver/jet_customers-cygwin.pg
diff --git a/...es/pgr_pickDeliver/jet_customers.test.sql → docqueries/pgr_pickDeliver/jet_customers.pg b/...es/pgr_pickDeliver/jet_customers.test.sql → docqueries/pgr_pickDeliver/jet_customers.pg
diff --git a/...s/pgr_pickDeliver/jet_customers1.test.sql → docqueries/pgr_pickDeliver/jet_customers1.pg b/...s/pgr_pickDeliver/jet_customers1.test.sql → docqueries/pgr_pickDeliver/jet_customers1.pg
diff --git a/...ies/pgr_pickDeliver/doc-oneDepot.test.sql → docqueries/pgr_pickDeliver/oneDepot.pg b/...ies/pgr_pickDeliver/doc-oneDepot.test.sql → docqueries/pgr_pickDeliver/oneDepot.pg
diff --git a/...eries/pgr_pickDeliver/doc-oneDepot.result → docqueries/pgr_pickDeliver/oneDepot.result b/...eries/pgr_pickDeliver/doc-oneDepot.result → docqueries/pgr_pickDeliver/oneDepot.result
diff --git a/...ies/pgr_pickDeliver/past_example.test.sql → docqueries/pgr_pickDeliver/past_example.pg b/...ies/pgr_pickDeliver/past_example.test.sql → docqueries/pgr_pickDeliver/past_example.pg
diff --git a/..._pickDeliver/doc-pgr_pickDeliver.test.sql → ...ueries/pgr_pickDeliver/pgr_pickDeliver.pg b/..._pickDeliver/doc-pgr_pickDeliver.test.sql → ...ueries/pgr_pickDeliver/pgr_pickDeliver.pg
diff --git a/...gr_pickDeliver/doc-pgr_pickDeliver.result → ...es/pgr_pickDeliver/pgr_pickDeliver.result b/...gr_pickDeliver/doc-pgr_pickDeliver.result → ...es/pgr_pickDeliver/pgr_pickDeliver.result
diff --git a/...ver/doc-pgr_pickDeliverEuclidean.test.sql → ...r_pickDeliver/pgr_pickDeliverEuclidean.pg b/...ver/doc-pgr_pickDeliverEuclidean.test.sql → ...r_pickDeliver/pgr_pickDeliverEuclidean.pg
diff --git a/...liver/doc-pgr_pickDeliverEuclidean.result → ...ckDeliver/pgr_pickDeliverEuclidean.result b/...liver/doc-pgr_pickDeliverEuclidean.result → ...ckDeliver/pgr_pickDeliverEuclidean.result
diff --git a/...ries/pgr_pickDeliver/pickDeliver.test.sql → docqueries/pgr_pickDeliver/pickDeliver.pg b/...ries/pgr_pickDeliver/pickDeliver.test.sql → docqueries/pgr_pickDeliver/pickDeliver.pg
diff --git a/docqueries/pgr_pickDeliver/test.conf b/docqueries/pgr_pickDeliver/test.conf
@@ -4,23 +4,22 @@
     'any' => {
         'comment' => 'pick deliver with dream db \n detailed execution 75 secs',
         'tests' => [qw(
-            doc-pgr_pickDeliver
-            doc-pgr_pickDeliverEuclidean
-            doc-oneDepot
+            pgr_pickDeliver
+            pgr_pickDeliverEuclidean
+            oneDepot
             )],
 
         'documentation' => [qw(
-            doc-pgr_pickDeliver
-            doc-pgr_pickDeliverEuclidean
-            doc-oneDepot
+            pgr_pickDeliver
+            pgr_pickDeliverEuclidean
+            oneDepot
             )],
         'not-testing' => [qw(
             past_example
             jet_customers
             differentVechiles
             jet_customers1
             book_from_query
-            doc-oneDepot
             )]
     },
 );

diff --git a/...liver/pickDeliver/day-2019-12-09.test.sql → ...pickDeliver/pickDeliver/day-2019-12-09.pg b/...liver/pickDeliver/day-2019-12-09.test.sql → ...pickDeliver/pickDeliver/day-2019-12-09.pg
diff --git a/...liver/pickDeliver/day-2019-12-10.test.sql → ...pickDeliver/pickDeliver/day-2019-12-10.pg b/...liver/pickDeliver/day-2019-12-10.test.sql → ...pickDeliver/pickDeliver/day-2019-12-10.pg
diff --git a/...liver/pickDeliver/day-2019-12-11.test.sql → ...pickDeliver/pickDeliver/day-2019-12-11.pg b/...liver/pickDeliver/day-2019-12-11.test.sql → ...pickDeliver/pickDeliver/day-2019-12-11.pg
diff --git a/...liver/pickDeliver/day-2019-12-12.test.sql → ...pickDeliver/pickDeliver/day-2019-12-12.pg b/...liver/pickDeliver/day-2019-12-12.test.sql → ...pickDeliver/pickDeliver/day-2019-12-12.pg
diff --git a/...liver/pickDeliver/day-2019-12-13.test.sql → ...pickDeliver/pickDeliver/day-2019-12-13.pg b/...liver/pickDeliver/day-2019-12-13.test.sql → ...pickDeliver/pickDeliver/day-2019-12-13.pg
diff --git a/...liver/pickDeliver/example_output.test.sql → ...pickDeliver/pickDeliver/example_output.pg b/...liver/pickDeliver/example_output.test.sql → ...pickDeliver/pickDeliver/example_output.pg
diff --git a/...erRaw/day-2019-12-09-no-optimize.test.sql → ...kDeliverRaw/day-2019-12-09-no-optimize.pg b/...erRaw/day-2019-12-09-no-optimize.test.sql → ...kDeliverRaw/day-2019-12-09-no-optimize.pg
diff --git a/...er/pickDeliverRaw/day-2019-12-09.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-09.pg b/...er/pickDeliverRaw/day-2019-12-09.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-09.pg
diff --git a/...er/pickDeliverRaw/day-2019-12-10.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-10.pg b/...er/pickDeliverRaw/day-2019-12-10.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-10.pg
diff --git a/...er/pickDeliverRaw/day-2019-12-11.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-11.pg b/...er/pickDeliverRaw/day-2019-12-11.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-11.pg
diff --git a/...er/pickDeliverRaw/day-2019-12-12.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-12.pg b/...er/pickDeliverRaw/day-2019-12-12.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-12.pg
diff --git a/...er/pickDeliverRaw/day-2019-12-13.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-13.pg b/...er/pickDeliverRaw/day-2019-12-13.test.sql → ...kDeliver/pickDeliverRaw/day-2019-12-13.pg
diff --git a/...ver/pickDeliverRaw/sample_output.test.sql → ...ckDeliver/pickDeliverRaw/sample_output.pg b/...ver/pickDeliverRaw/sample_output.test.sql → ...ckDeliver/pickDeliverRaw/sample_output.pg
diff --git a/...dd/pickDeliverAdd/pickDeliverAdd.test.sql → ...liverAdd/pickDeliverAdd/pickDeliverAdd.pg b/...dd/pickDeliverAdd/pickDeliverAdd.test.sql → ...liverAdd/pickDeliverAdd/pickDeliverAdd.pg
diff --git a/...kDeliverAddRaw/pickDeliverAddRaw.test.sql → ...dd/pickDeliverAddRaw/pickDeliverAddRaw.pg b/...kDeliverAddRaw/pickDeliverAddRaw.test.sql → ...dd/pickDeliverAddRaw/pickDeliverAddRaw.pg
diff --git a/...eries/simulation/full_simulation.test.sql → docqueries/simulation/full_simulation.pg b/...eries/simulation/full_simulation.test.sql → docqueries/simulation/full_simulation.pg
diff --git a/...ries/simulation/small_simulation.test.sql → docqueries/simulation/small_simulation.pg b/...ries/simulation/small_simulation.test.sql → docqueries/simulation/small_simulation.pg
diff --git a/docqueries/test.conf b/docqueries/test.conf
@@ -0,0 +1,12 @@
+#!/usr/bin/perl -w
+
+%main::tests = (
+    'any' => {
+        'files' => [qw(
+            version.pg
+            full_version.pg
+            )],
+    },
+);
+
+1;
diff --git a/...ries/utilities/_vehicles_at_time.test.sql → docqueries/utilities/_vehicles_at_time.pg b/...ries/utilities/_vehicles_at_time.test.sql → docqueries/utilities/_vehicles_at_time.pg
diff --git a/docqueries/version.result b/docqueries/version.result
@@ -0,0 +1,14 @@
+BEGIN;
+BEGIN
+SET client_min_messages TO NOTICE;
+SET
+/* -- q1 */
+SELECT pgr_version();
+ pgr_version
+-------------
+ 3.7.0-dev
+(1 row)
+
+/* -- q2 */
+ROLLBACK;
+ROLLBACK
diff --git a/docqueries/version/CMakeLists.txt b/docqueries/version/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Do not use extensions
 SET(LOCAL_FILES
-    doc-version
-    doc-full_version
+    version
+    full_version
     )
 
 foreach (f ${LOCAL_FILES})

diff --git a/docqueries/version/doc-full_version.test.sql → docqueries/version/full_version.pg b/docqueries/version/doc-full_version.test.sql → docqueries/version/full_version.pg
diff --git a/docqueries/version/doc-full_version.result → docqueries/version/full_version.result b/docqueries/version/doc-full_version.result → docqueries/version/full_version.result
diff --git a/docqueries/version/test.conf b/docqueries/version/test.conf
@@ -4,13 +4,13 @@
     'any' => {
         'comment' => 'vrprouting version',
         'tests' => [qw(
-            doc-version
-            doc-full_version
+            version
+            full_version
             )],
 
         'documentation' => [qw(
-            doc-version
-            doc-full_version
+            version
+            full_version
             )],
 
         'dummyStorage' => [qw(

diff --git a/docqueries/version/doc-version.test.sql → docqueries/version/version.pg b/docqueries/version/doc-version.test.sql → docqueries/version/version.pg
diff --git a/docqueries/version/doc-version.result → docqueries/version/version.result b/docqueries/version/doc-version.result → docqueries/version/version.result
diff --git a/...te/viewRoute/sample-with-service.test.sql → ...iewRoute/viewRoute/sample-with-service.pg b/...te/viewRoute/sample-with-service.test.sql → ...iewRoute/viewRoute/sample-with-service.pg
diff --git a/...iewRoute/viewRoute/sample_output.test.sql → ...ries/viewRoute/viewRoute/sample_output.pg b/...iewRoute/viewRoute/sample_output.test.sql → ...ries/viewRoute/viewRoute/sample_output.pg
diff --git a/...viewRouteRaw/sample-with-service.test.sql → ...Route/viewRouteRaw/sample-with-service.pg b/...viewRouteRaw/sample-with-service.test.sql → ...Route/viewRouteRaw/sample-with-service.pg
diff --git a/...Route/viewRouteRaw/sample_output.test.sql → ...s/viewRoute/viewRouteRaw/sample_output.pg b/...Route/viewRouteRaw/sample_output.test.sql → ...s/viewRoute/viewRouteRaw/sample_output.pg
diff --git a/docqueries/vroom/CMakeLists.txt b/docqueries/vroom/CMakeLists.txt
@@ -1,11 +1,11 @@
 # Do not use extensions
 SET(LOCAL_FILES
-    doc-vrp_vroom
-    doc-vrp_vroomJobs
-    doc-vrp_vroomShipments
-    doc-vrp_vroomPlain
-    doc-vrp_vroomJobsPlain
-    doc-vrp_vroomShipmentsPlain
+    vroom
+    vroomJobs
+    vroomShipments
+    vroomPlain
+    vroomJobsPlain
+    vroomShipmentsPlain
     )
 
 foreach (f ${LOCAL_FILES})
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ Result Columns @@
     Example
     -------------------------------------------------------------------------------
-    .. literalinclude:: doc-oneDepot.queries
+    .. literalinclude:: oneDepot.queries
     .. rubric:: Data
@@ Expand Down @@