diff --git a/NEWS.md b/NEWS.md index 5bf9ff1af..17cfbac96 100644 --- 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 index 9fa50f3b1..d38a9c898 100644 --- 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 index 64eae77c2..f19b52b0c 100644 --- 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 index 34c037763..228a75522 100644 --- 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 index 0b861365a..528339aa9 100644 --- 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 index 69e1ef60e..9e3f8f6df 100644 --- 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 index 3209f8752..d1d9d0224 100644 --- 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 index c67a4f61c..3dca38567 100644 --- 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 index a7b10ff36..21d5d343b 100644 --- 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 index 67bc0f4bc..b4de69df4 100644 --- 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 index 03f8abc74..7f18e7292 100644 --- 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 index 01c85bea9..472336916 100644 --- 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 `__ 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 index 135872a95..26b9a9ffe 100644 --- 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 `__. -.. 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 index 63537e8b7..88aa8dc5a 100644 --- 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 `__. -.. 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 index 9b4a0911b..dff8e5043 100644 --- 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 `__ 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 index a0aba0580..45bf7693a 100644 --- 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 `__ 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 index 88e86d152..21723131f 100644 --- 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 `__ 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 new file mode 100644 index 000000000..42e8d8a42 --- /dev/null +++ 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/docqueries/compatibleVehicles/compatibleVehicles/debug.test.sql b/docqueries/compatibleVehicles/compatibleVehicles/debug.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehicles/debug.test.sql rename to docqueries/compatibleVehicles/compatibleVehicles/debug.pg diff --git a/docqueries/compatibleVehicles/compatibleVehicles/new_db.test.sql b/docqueries/compatibleVehicles/compatibleVehicles/new_db.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehicles/new_db.test.sql rename to docqueries/compatibleVehicles/compatibleVehicles/new_db.pg diff --git a/docqueries/compatibleVehicles/compatibleVehicles/order-20.test.sql b/docqueries/compatibleVehicles/compatibleVehicles/order-20.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehicles/order-20.test.sql rename to docqueries/compatibleVehicles/compatibleVehicles/order-20.pg diff --git a/docqueries/compatibleVehicles/compatibleVehicles/sample_output.test.sql b/docqueries/compatibleVehicles/compatibleVehicles/sample_output.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehicles/sample_output.test.sql rename to docqueries/compatibleVehicles/compatibleVehicles/sample_output.pg diff --git a/docqueries/compatibleVehicles/compatibleVehiclesRaw/new_db.test.sql b/docqueries/compatibleVehicles/compatibleVehiclesRaw/new_db.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehiclesRaw/new_db.test.sql rename to docqueries/compatibleVehicles/compatibleVehiclesRaw/new_db.pg diff --git a/docqueries/compatibleVehicles/compatibleVehiclesRaw/order-20.test.sql b/docqueries/compatibleVehicles/compatibleVehiclesRaw/order-20.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehiclesRaw/order-20.test.sql rename to docqueries/compatibleVehicles/compatibleVehiclesRaw/order-20.pg diff --git a/docqueries/compatibleVehicles/compatibleVehiclesRaw/sample_output.test.sql b/docqueries/compatibleVehicles/compatibleVehiclesRaw/sample_output.pg similarity index 100% rename from docqueries/compatibleVehicles/compatibleVehiclesRaw/sample_output.test.sql rename to docqueries/compatibleVehicles/compatibleVehiclesRaw/sample_output.pg diff --git a/docqueries/dataCheck/create_initial_solution.test.sql b/docqueries/dataCheck/create_initial_solution.pg similarity index 100% rename from docqueries/dataCheck/create_initial_solution.test.sql rename to docqueries/dataCheck/create_initial_solution.pg diff --git a/docqueries/dataCheck/data_check.test.sql b/docqueries/dataCheck/data_check.pg similarity index 100% rename from docqueries/dataCheck/data_check.test.sql rename to docqueries/dataCheck/data_check.pg diff --git a/docqueries/full_version.result b/docqueries/full_version.result new file mode 100644 index 000000000..9b8c27a06 --- /dev/null +++ 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/docqueries/optimize/optimize/09-12-mid-day-partial-false.test.sql b/docqueries/optimize/optimize/09-12-mid-day-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/09-12-mid-day-partial-false.test.sql rename to docqueries/optimize/optimize/09-12-mid-day-partial-false.pg diff --git a/docqueries/optimize/optimize/09-12-partial-false.test.sql b/docqueries/optimize/optimize/09-12-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/09-12-partial-false.test.sql rename to docqueries/optimize/optimize/09-12-partial-false.pg diff --git a/docqueries/optimize/optimize/10-12-partial-false.test.sql b/docqueries/optimize/optimize/10-12-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/10-12-partial-false.test.sql rename to docqueries/optimize/optimize/10-12-partial-false.pg diff --git a/docqueries/optimize/optimize/11-12-partial-false.test.sql b/docqueries/optimize/optimize/11-12-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/11-12-partial-false.test.sql rename to docqueries/optimize/optimize/11-12-partial-false.pg diff --git a/docqueries/optimize/optimize/12-12-partial-false.test.sql b/docqueries/optimize/optimize/12-12-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/12-12-partial-false.test.sql rename to docqueries/optimize/optimize/12-12-partial-false.pg diff --git a/docqueries/optimize/optimize/13-12-partial-false.test.sql b/docqueries/optimize/optimize/13-12-partial-false.pg similarity index 100% rename from docqueries/optimize/optimize/13-12-partial-false.test.sql rename to docqueries/optimize/optimize/13-12-partial-false.pg diff --git a/docqueries/optimize/optimizeRaw/09-12-mid-day.test.sql b/docqueries/optimize/optimizeRaw/09-12-mid-day.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/09-12-mid-day.test.sql rename to docqueries/optimize/optimizeRaw/09-12-mid-day.pg diff --git a/docqueries/optimize/optimizeRaw/dec_09.test.sql b/docqueries/optimize/optimizeRaw/dec_09.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/dec_09.test.sql rename to docqueries/optimize/optimizeRaw/dec_09.pg diff --git a/docqueries/optimize/optimizeRaw/dec_10.test.sql b/docqueries/optimize/optimizeRaw/dec_10.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/dec_10.test.sql rename to docqueries/optimize/optimizeRaw/dec_10.pg diff --git a/docqueries/optimize/optimizeRaw/dec_11.test.sql b/docqueries/optimize/optimizeRaw/dec_11.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/dec_11.test.sql rename to docqueries/optimize/optimizeRaw/dec_11.pg diff --git a/docqueries/optimize/optimizeRaw/dec_12.test.sql b/docqueries/optimize/optimizeRaw/dec_12.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/dec_12.test.sql rename to docqueries/optimize/optimizeRaw/dec_12.pg diff --git a/docqueries/optimize/optimizeRaw/dec_13.test.sql b/docqueries/optimize/optimizeRaw/dec_13.pg similarity index 100% rename from docqueries/optimize/optimizeRaw/dec_13.test.sql rename to docqueries/optimize/optimizeRaw/dec_13.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/09-12-mid-day.test.sql b/docqueries/optimize/optimizeUpdateRaw/09-12-mid-day.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/09-12-mid-day.test.sql rename to docqueries/optimize/optimizeUpdateRaw/09-12-mid-day.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/dec_09.test.sql b/docqueries/optimize/optimizeUpdateRaw/dec_09.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/dec_09.test.sql rename to docqueries/optimize/optimizeUpdateRaw/dec_09.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/dec_10.test.sql b/docqueries/optimize/optimizeUpdateRaw/dec_10.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/dec_10.test.sql rename to docqueries/optimize/optimizeUpdateRaw/dec_10.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/dec_11.test.sql b/docqueries/optimize/optimizeUpdateRaw/dec_11.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/dec_11.test.sql rename to docqueries/optimize/optimizeUpdateRaw/dec_11.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/dec_12.test.sql b/docqueries/optimize/optimizeUpdateRaw/dec_12.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/dec_12.test.sql rename to docqueries/optimize/optimizeUpdateRaw/dec_12.pg diff --git a/docqueries/optimize/optimizeUpdateRaw/dec_13.test.sql b/docqueries/optimize/optimizeUpdateRaw/dec_13.pg similarity index 100% rename from docqueries/optimize/optimizeUpdateRaw/dec_13.test.sql rename to docqueries/optimize/optimizeUpdateRaw/dec_13.pg diff --git a/docqueries/or_tools/CMakeLists.txt b/docqueries/or_tools/CMakeLists.txt index 4b4d6c593..8f949257f 100644 --- 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) \ No newline at end of file +set(PROJECT_DOC_FILES ${PROJECT_DOC_FILES} ${LOCAL_DOC_FILES} PARENT_SCOPE) diff --git a/docqueries/or_tools/doc-vrp_bin_packing.test.sql b/docqueries/or_tools/bin_packing.pg similarity index 100% rename from docqueries/or_tools/doc-vrp_bin_packing.test.sql rename to docqueries/or_tools/bin_packing.pg diff --git a/docqueries/or_tools/doc-vrp_bin_packing.result b/docqueries/or_tools/bin_packing.result similarity index 100% rename from docqueries/or_tools/doc-vrp_bin_packing.result rename to docqueries/or_tools/bin_packing.result diff --git a/docqueries/or_tools/doc-vrp_knapsack.test.sql b/docqueries/or_tools/knapsack.pg similarity index 100% rename from docqueries/or_tools/doc-vrp_knapsack.test.sql rename to docqueries/or_tools/knapsack.pg diff --git a/docqueries/or_tools/doc-vrp_knapsack.result b/docqueries/or_tools/knapsack.result similarity index 100% rename from docqueries/or_tools/doc-vrp_knapsack.result rename to docqueries/or_tools/knapsack.result diff --git a/docqueries/or_tools/doc-vrp_multiple_knapsack.test.sql b/docqueries/or_tools/multiple_knapsack.pg similarity index 100% rename from docqueries/or_tools/doc-vrp_multiple_knapsack.test.sql rename to docqueries/or_tools/multiple_knapsack.pg diff --git a/docqueries/or_tools/doc-vrp_multiple_knapsack.result b/docqueries/or_tools/multiple_knapsack.result similarity index 100% rename from docqueries/or_tools/doc-vrp_multiple_knapsack.result rename to docqueries/or_tools/multiple_knapsack.result diff --git a/docqueries/or_tools/test.conf b/docqueries/or_tools/test.conf index 4c0fdf5be..a364743f1 100644 --- 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 index 8ba66c334..ef8f8a0a1 100644 --- 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/docqueries/pgr_pickDeliver/book_from_query.test.sql b/docqueries/pgr_pickDeliver/book_from_query.pg similarity index 100% rename from docqueries/pgr_pickDeliver/book_from_query.test.sql rename to docqueries/pgr_pickDeliver/book_from_query.pg diff --git a/docqueries/pgr_pickDeliver/book_vrp.test.sql b/docqueries/pgr_pickDeliver/book_vrp.pg similarity index 100% rename from docqueries/pgr_pickDeliver/book_vrp.test.sql rename to docqueries/pgr_pickDeliver/book_vrp.pg diff --git a/docqueries/pgr_pickDeliver/design_pgtap.test.sql b/docqueries/pgr_pickDeliver/design_pgtap.pg similarity index 100% rename from docqueries/pgr_pickDeliver/design_pgtap.test.sql rename to docqueries/pgr_pickDeliver/design_pgtap.pg diff --git a/docqueries/pgr_pickDeliver/differentVechiles-cygwin.test.sql b/docqueries/pgr_pickDeliver/differentVechiles-cygwin.pg similarity index 100% rename from docqueries/pgr_pickDeliver/differentVechiles-cygwin.test.sql rename to docqueries/pgr_pickDeliver/differentVechiles-cygwin.pg diff --git a/docqueries/pgr_pickDeliver/differentVechiles.test.sql b/docqueries/pgr_pickDeliver/differentVechiles.pg similarity index 100% rename from docqueries/pgr_pickDeliver/differentVechiles.test.sql rename to docqueries/pgr_pickDeliver/differentVechiles.pg diff --git a/docqueries/pgr_pickDeliver/jet_customers-cygwin.test.sql b/docqueries/pgr_pickDeliver/jet_customers-cygwin.pg similarity index 100% rename from docqueries/pgr_pickDeliver/jet_customers-cygwin.test.sql rename to docqueries/pgr_pickDeliver/jet_customers-cygwin.pg diff --git a/docqueries/pgr_pickDeliver/jet_customers.test.sql b/docqueries/pgr_pickDeliver/jet_customers.pg similarity index 100% rename from docqueries/pgr_pickDeliver/jet_customers.test.sql rename to docqueries/pgr_pickDeliver/jet_customers.pg diff --git a/docqueries/pgr_pickDeliver/jet_customers1.test.sql b/docqueries/pgr_pickDeliver/jet_customers1.pg similarity index 100% rename from docqueries/pgr_pickDeliver/jet_customers1.test.sql rename to docqueries/pgr_pickDeliver/jet_customers1.pg diff --git a/docqueries/pgr_pickDeliver/doc-oneDepot.test.sql b/docqueries/pgr_pickDeliver/oneDepot.pg similarity index 100% rename from docqueries/pgr_pickDeliver/doc-oneDepot.test.sql rename to docqueries/pgr_pickDeliver/oneDepot.pg diff --git a/docqueries/pgr_pickDeliver/doc-oneDepot.result b/docqueries/pgr_pickDeliver/oneDepot.result similarity index 100% rename from docqueries/pgr_pickDeliver/doc-oneDepot.result rename to docqueries/pgr_pickDeliver/oneDepot.result diff --git a/docqueries/pgr_pickDeliver/past_example.test.sql b/docqueries/pgr_pickDeliver/past_example.pg similarity index 100% rename from docqueries/pgr_pickDeliver/past_example.test.sql rename to docqueries/pgr_pickDeliver/past_example.pg diff --git a/docqueries/pgr_pickDeliver/doc-pgr_pickDeliver.test.sql b/docqueries/pgr_pickDeliver/pgr_pickDeliver.pg similarity index 100% rename from docqueries/pgr_pickDeliver/doc-pgr_pickDeliver.test.sql rename to docqueries/pgr_pickDeliver/pgr_pickDeliver.pg diff --git a/docqueries/pgr_pickDeliver/doc-pgr_pickDeliver.result b/docqueries/pgr_pickDeliver/pgr_pickDeliver.result similarity index 100% rename from docqueries/pgr_pickDeliver/doc-pgr_pickDeliver.result rename to docqueries/pgr_pickDeliver/pgr_pickDeliver.result diff --git a/docqueries/pgr_pickDeliver/doc-pgr_pickDeliverEuclidean.test.sql b/docqueries/pgr_pickDeliver/pgr_pickDeliverEuclidean.pg similarity index 100% rename from docqueries/pgr_pickDeliver/doc-pgr_pickDeliverEuclidean.test.sql rename to docqueries/pgr_pickDeliver/pgr_pickDeliverEuclidean.pg diff --git a/docqueries/pgr_pickDeliver/doc-pgr_pickDeliverEuclidean.result b/docqueries/pgr_pickDeliver/pgr_pickDeliverEuclidean.result similarity index 100% rename from docqueries/pgr_pickDeliver/doc-pgr_pickDeliverEuclidean.result rename to docqueries/pgr_pickDeliver/pgr_pickDeliverEuclidean.result diff --git a/docqueries/pgr_pickDeliver/pickDeliver.test.sql b/docqueries/pgr_pickDeliver/pickDeliver.pg similarity index 100% rename from docqueries/pgr_pickDeliver/pickDeliver.test.sql rename to docqueries/pgr_pickDeliver/pickDeliver.pg diff --git a/docqueries/pgr_pickDeliver/test.conf b/docqueries/pgr_pickDeliver/test.conf index 7c88444d7..846254b86 100644 --- a/docqueries/pgr_pickDeliver/test.conf +++ b/docqueries/pgr_pickDeliver/test.conf @@ -4,15 +4,15 @@ '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 @@ -20,7 +20,6 @@ differentVechiles jet_customers1 book_from_query - doc-oneDepot )] }, ); diff --git a/docqueries/pickDeliver/pickDeliver/day-2019-12-09.test.sql b/docqueries/pickDeliver/pickDeliver/day-2019-12-09.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/day-2019-12-09.test.sql rename to docqueries/pickDeliver/pickDeliver/day-2019-12-09.pg diff --git a/docqueries/pickDeliver/pickDeliver/day-2019-12-10.test.sql b/docqueries/pickDeliver/pickDeliver/day-2019-12-10.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/day-2019-12-10.test.sql rename to docqueries/pickDeliver/pickDeliver/day-2019-12-10.pg diff --git a/docqueries/pickDeliver/pickDeliver/day-2019-12-11.test.sql b/docqueries/pickDeliver/pickDeliver/day-2019-12-11.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/day-2019-12-11.test.sql rename to docqueries/pickDeliver/pickDeliver/day-2019-12-11.pg diff --git a/docqueries/pickDeliver/pickDeliver/day-2019-12-12.test.sql b/docqueries/pickDeliver/pickDeliver/day-2019-12-12.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/day-2019-12-12.test.sql rename to docqueries/pickDeliver/pickDeliver/day-2019-12-12.pg diff --git a/docqueries/pickDeliver/pickDeliver/day-2019-12-13.test.sql b/docqueries/pickDeliver/pickDeliver/day-2019-12-13.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/day-2019-12-13.test.sql rename to docqueries/pickDeliver/pickDeliver/day-2019-12-13.pg diff --git a/docqueries/pickDeliver/pickDeliver/example_output.test.sql b/docqueries/pickDeliver/pickDeliver/example_output.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliver/example_output.test.sql rename to docqueries/pickDeliver/pickDeliver/example_output.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09-no-optimize.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09-no-optimize.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09-no-optimize.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09-no-optimize.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-09.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-10.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-10.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-10.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-10.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-11.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-11.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-11.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-11.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-12.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-12.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-12.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-12.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-13.test.sql b/docqueries/pickDeliver/pickDeliverRaw/day-2019-12-13.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/day-2019-12-13.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/day-2019-12-13.pg diff --git a/docqueries/pickDeliver/pickDeliverRaw/sample_output.test.sql b/docqueries/pickDeliver/pickDeliverRaw/sample_output.pg similarity index 100% rename from docqueries/pickDeliver/pickDeliverRaw/sample_output.test.sql rename to docqueries/pickDeliver/pickDeliverRaw/sample_output.pg diff --git a/docqueries/pickDeliverAdd/pickDeliverAdd/pickDeliverAdd.test.sql b/docqueries/pickDeliverAdd/pickDeliverAdd/pickDeliverAdd.pg similarity index 100% rename from docqueries/pickDeliverAdd/pickDeliverAdd/pickDeliverAdd.test.sql rename to docqueries/pickDeliverAdd/pickDeliverAdd/pickDeliverAdd.pg diff --git a/docqueries/pickDeliverAdd/pickDeliverAddRaw/pickDeliverAddRaw.test.sql b/docqueries/pickDeliverAdd/pickDeliverAddRaw/pickDeliverAddRaw.pg similarity index 100% rename from docqueries/pickDeliverAdd/pickDeliverAddRaw/pickDeliverAddRaw.test.sql rename to docqueries/pickDeliverAdd/pickDeliverAddRaw/pickDeliverAddRaw.pg diff --git a/docqueries/simulation/full_simulation.test.sql b/docqueries/simulation/full_simulation.pg similarity index 100% rename from docqueries/simulation/full_simulation.test.sql rename to docqueries/simulation/full_simulation.pg diff --git a/docqueries/simulation/small_simulation.test.sql b/docqueries/simulation/small_simulation.pg similarity index 100% rename from docqueries/simulation/small_simulation.test.sql rename to docqueries/simulation/small_simulation.pg diff --git a/docqueries/test.conf b/docqueries/test.conf new file mode 100644 index 000000000..54c89cf12 --- /dev/null +++ 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/docqueries/utilities/_vehicles_at_time.test.sql b/docqueries/utilities/_vehicles_at_time.pg similarity index 100% rename from docqueries/utilities/_vehicles_at_time.test.sql rename to docqueries/utilities/_vehicles_at_time.pg diff --git a/docqueries/version.result b/docqueries/version.result new file mode 100644 index 000000000..6b2356163 --- /dev/null +++ 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 index 304b59129..42e8d8a42 100644 --- 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 b/docqueries/version/full_version.pg similarity index 100% rename from docqueries/version/doc-full_version.test.sql rename to docqueries/version/full_version.pg diff --git a/docqueries/version/doc-full_version.result b/docqueries/version/full_version.result similarity index 100% rename from docqueries/version/doc-full_version.result rename to docqueries/version/full_version.result diff --git a/docqueries/version/test.conf b/docqueries/version/test.conf index 7a89ea20d..e40cb7323 100644 --- 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 b/docqueries/version/version.pg similarity index 100% rename from docqueries/version/doc-version.test.sql rename to docqueries/version/version.pg diff --git a/docqueries/version/doc-version.result b/docqueries/version/version.result similarity index 100% rename from docqueries/version/doc-version.result rename to docqueries/version/version.result diff --git a/docqueries/viewRoute/viewRoute/sample-with-service.test.sql b/docqueries/viewRoute/viewRoute/sample-with-service.pg similarity index 100% rename from docqueries/viewRoute/viewRoute/sample-with-service.test.sql rename to docqueries/viewRoute/viewRoute/sample-with-service.pg diff --git a/docqueries/viewRoute/viewRoute/sample_output.test.sql b/docqueries/viewRoute/viewRoute/sample_output.pg similarity index 100% rename from docqueries/viewRoute/viewRoute/sample_output.test.sql rename to docqueries/viewRoute/viewRoute/sample_output.pg diff --git a/docqueries/viewRoute/viewRouteRaw/sample-with-service.test.sql b/docqueries/viewRoute/viewRouteRaw/sample-with-service.pg similarity index 100% rename from docqueries/viewRoute/viewRouteRaw/sample-with-service.test.sql rename to docqueries/viewRoute/viewRouteRaw/sample-with-service.pg diff --git a/docqueries/viewRoute/viewRouteRaw/sample_output.test.sql b/docqueries/viewRoute/viewRouteRaw/sample_output.pg similarity index 100% rename from docqueries/viewRoute/viewRouteRaw/sample_output.test.sql rename to docqueries/viewRoute/viewRouteRaw/sample_output.pg diff --git a/docqueries/vroom/CMakeLists.txt b/docqueries/vroom/CMakeLists.txt index a28beba0e..295dc52c8 100644 --- 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}) diff --git a/docqueries/vroom/test.conf b/docqueries/vroom/test.conf index d76829045..e99144636 100644 --- a/docqueries/vroom/test.conf +++ b/docqueries/vroom/test.conf @@ -4,20 +4,20 @@ 'any' => { 'comment' => 'VRP with VROOM tests.', 'tests' => [qw( - doc-vrp_vroom - doc-vrp_vroomJobs - doc-vrp_vroomShipments - doc-vrp_vroomPlain - doc-vrp_vroomJobsPlain - doc-vrp_vroomShipmentsPlain + vroom + vroomJobs + vroomShipments + vroomPlain + vroomJobsPlain + vroomShipmentsPlain )], 'documentation' => [qw( - doc-vrp_vroom - doc-vrp_vroomJobs - doc-vrp_vroomShipments - doc-vrp_vroomPlain - doc-vrp_vroomJobsPlain - doc-vrp_vroomShipmentsPlain + vroom + vroomJobs + vroomShipments + vroomPlain + vroomJobsPlain + vroomShipmentsPlain )] }, diff --git a/docqueries/vroom/doc-vrp_vroom.test.sql b/docqueries/vroom/vroom.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroom.test.sql rename to docqueries/vroom/vroom.pg diff --git a/docqueries/vroom/doc-vrp_vroom.result b/docqueries/vroom/vroom.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroom.result rename to docqueries/vroom/vroom.result diff --git a/docqueries/vroom/doc-vrp_vroomJobs.test.sql b/docqueries/vroom/vroomJobs.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroomJobs.test.sql rename to docqueries/vroom/vroomJobs.pg diff --git a/docqueries/vroom/doc-vrp_vroomJobs.result b/docqueries/vroom/vroomJobs.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroomJobs.result rename to docqueries/vroom/vroomJobs.result diff --git a/docqueries/vroom/doc-vrp_vroomJobsPlain.test.sql b/docqueries/vroom/vroomJobsPlain.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroomJobsPlain.test.sql rename to docqueries/vroom/vroomJobsPlain.pg diff --git a/docqueries/vroom/doc-vrp_vroomJobsPlain.result b/docqueries/vroom/vroomJobsPlain.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroomJobsPlain.result rename to docqueries/vroom/vroomJobsPlain.result diff --git a/docqueries/vroom/doc-vrp_vroomPlain.test.sql b/docqueries/vroom/vroomPlain.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroomPlain.test.sql rename to docqueries/vroom/vroomPlain.pg diff --git a/docqueries/vroom/doc-vrp_vroomPlain.result b/docqueries/vroom/vroomPlain.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroomPlain.result rename to docqueries/vroom/vroomPlain.result diff --git a/docqueries/vroom/doc-vrp_vroomShipments.test.sql b/docqueries/vroom/vroomShipments.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroomShipments.test.sql rename to docqueries/vroom/vroomShipments.pg diff --git a/docqueries/vroom/doc-vrp_vroomShipments.result b/docqueries/vroom/vroomShipments.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroomShipments.result rename to docqueries/vroom/vroomShipments.result diff --git a/docqueries/vroom/doc-vrp_vroomShipmentsPlain.test.sql b/docqueries/vroom/vroomShipmentsPlain.pg similarity index 100% rename from docqueries/vroom/doc-vrp_vroomShipmentsPlain.test.sql rename to docqueries/vroom/vroomShipmentsPlain.pg diff --git a/docqueries/vroom/doc-vrp_vroomShipmentsPlain.result b/docqueries/vroom/vroomShipmentsPlain.result similarity index 100% rename from docqueries/vroom/doc-vrp_vroomShipmentsPlain.result rename to docqueries/vroom/vroomShipmentsPlain.result diff --git a/locale/en/LC_MESSAGES/release_notes.po b/locale/en/LC_MESSAGES/release_notes.po index d9fe78d04..e496c449e 100644 --- a/locale/en/LC_MESSAGES/release_notes.po +++ b/locale/en/LC_MESSAGES/release_notes.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vrpRouting v0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-24 18:32+0000\n" +"POT-Creation-Date: 2024-07-24 18:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,15 +64,23 @@ msgstr "" msgid "vrpRouting 0.4.2 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:44 -msgid "No changes yet." +#: ../../build/doc/release_notes.rst:45 +msgid "Documentation queries" +msgstr "" + +#: ../../build/doc/release_notes.rst:46 +msgid "Renamed to extension `.pg`" msgstr "" #: ../../build/doc/release_notes.rst:47 +msgid "Removed `doc-` and `doc-vrp_` suffixes on file names" +msgstr "" + +#: ../../build/doc/release_notes.rst:50 msgid "vrpRouting 0.4.1 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:49 +#: ../../build/doc/release_notes.rst:52 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -81,23 +89,23 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:55 +#: ../../build/doc/release_notes.rst:58 msgid "Modification on experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:56 +#: ../../build/doc/release_notes.rst:59 msgid "OR Tools" msgstr "" -#: ../../build/doc/release_notes.rst:58 +#: ../../build/doc/release_notes.rst:61 msgid "vrp_bin_packing" msgstr "" -#: ../../build/doc/release_notes.rst:59 +#: ../../build/doc/release_notes.rst:62 msgid "vrp_knapsack" msgstr "" -#: ../../build/doc/release_notes.rst:60 +#: ../../build/doc/release_notes.rst:63 msgid "vrp_multiple_knapsack" msgstr "" @@ -105,7 +113,7 @@ msgstr "" msgid "Support for or-tools v9.10.4067" msgstr "" -#: ../../build/doc/release_notes.rst:66 +#: ../../build/doc/release_notes.rst:69 msgid "vrp_oneDepot" msgstr "" @@ -117,15 +125,15 @@ msgstr "" msgid "Result columns changed" msgstr "" -#: ../../build/doc/release_notes.rst:73 +#: ../../build/doc/release_notes.rst:76 msgid "Removal of Boost on the build" msgstr "" -#: ../../build/doc/release_notes.rst:74 ../../build/doc/release_notes.rst:172 +#: ../../build/doc/release_notes.rst:77 ../../build/doc/release_notes.rst:175 msgid "vrp_full_version" msgstr "" -#: ../../build/doc/release_notes.rst:75 ../../build/doc/release_notes.rst:171 +#: ../../build/doc/release_notes.rst:78 ../../build/doc/release_notes.rst:174 msgid "vrp_version" msgstr "" @@ -133,11 +141,11 @@ msgstr "" msgid "Boost removed from the result columns" msgstr "" -#: ../../build/doc/release_notes.rst:82 +#: ../../build/doc/release_notes.rst:85 msgid "vrpRouting 0.4.0 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:84 +#: ../../build/doc/release_notes.rst:87 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -146,39 +154,39 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:89 +#: ../../build/doc/release_notes.rst:92 msgid "" "Added support for VROOM 1.12.0 (`#34 " "`_)" msgstr "" -#: ../../build/doc/release_notes.rst:90 +#: ../../build/doc/release_notes.rst:93 msgid "No visible changes on user side with respect to signatures." msgstr "" -#: ../../build/doc/release_notes.rst:91 +#: ../../build/doc/release_notes.rst:94 msgid "Adjusted to VROOM v1.12.0 due to internal breaking changes:" msgstr "" -#: ../../build/doc/release_notes.rst:93 +#: ../../build/doc/release_notes.rst:96 msgid "Made changes according to new vroom::Input signature." msgstr "" -#: ../../build/doc/release_notes.rst:94 +#: ../../build/doc/release_notes.rst:97 msgid "" "CI changes to compile without routing support, with Position Independent " "Code." msgstr "" -#: ../../build/doc/release_notes.rst:95 +#: ../../build/doc/release_notes.rst:98 msgid "Removed support for VROOM 1.11.0" msgstr "" -#: ../../build/doc/release_notes.rst:98 +#: ../../build/doc/release_notes.rst:101 msgid "vrpRouting 0.3" msgstr "" -#: ../../build/doc/release_notes.rst:100 +#: ../../build/doc/release_notes.rst:103 #, python-format msgid "" "To see all issues & pull requests closed by this release see the `Git " @@ -187,87 +195,87 @@ msgid "" " on Github." msgstr "" -#: ../../build/doc/release_notes.rst:105 +#: ../../build/doc/release_notes.rst:108 msgid "Modification of experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:106 ../../build/doc/release_notes.rst:144 +#: ../../build/doc/release_notes.rst:109 ../../build/doc/release_notes.rst:147 msgid "VROOM" msgstr "" -#: ../../build/doc/release_notes.rst:108 ../../build/doc/release_notes.rst:146 +#: ../../build/doc/release_notes.rst:111 ../../build/doc/release_notes.rst:149 msgid "vrp_vroom" msgstr "" -#: ../../build/doc/release_notes.rst:109 ../../build/doc/release_notes.rst:147 +#: ../../build/doc/release_notes.rst:112 ../../build/doc/release_notes.rst:150 msgid "vrp_vroomJobs" msgstr "" -#: ../../build/doc/release_notes.rst:110 ../../build/doc/release_notes.rst:148 +#: ../../build/doc/release_notes.rst:113 ../../build/doc/release_notes.rst:151 msgid "vrp_vroomShipments" msgstr "" -#: ../../build/doc/release_notes.rst:111 ../../build/doc/release_notes.rst:149 +#: ../../build/doc/release_notes.rst:114 ../../build/doc/release_notes.rst:152 msgid "vrp_vroomPlain" msgstr "" -#: ../../build/doc/release_notes.rst:112 ../../build/doc/release_notes.rst:150 +#: ../../build/doc/release_notes.rst:115 ../../build/doc/release_notes.rst:153 msgid "vrp_vroomJobsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:113 ../../build/doc/release_notes.rst:151 +#: ../../build/doc/release_notes.rst:116 ../../build/doc/release_notes.rst:154 msgid "vrp_vroomShipmentsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:116 +#: ../../build/doc/release_notes.rst:119 msgid "" "Added support for VROOM 1.11.0 (`#24 " "`_)" msgstr "" -#: ../../build/doc/release_notes.rst:117 +#: ../../build/doc/release_notes.rst:120 msgid "Added setup time in jobs and shipments to refine service time modeling." msgstr "" -#: ../../build/doc/release_notes.rst:118 +#: ../../build/doc/release_notes.rst:121 msgid "Added support for custom cost matrices, along with the duration matrix." msgstr "" -#: ../../build/doc/release_notes.rst:120 +#: ../../build/doc/release_notes.rst:123 msgid "Using start_id, end_id, duration, cost as matrix table columns." msgstr "" -#: ../../build/doc/release_notes.rst:121 +#: ../../build/doc/release_notes.rst:124 msgid "" "Added timeout and exploration_level parameters to vroom-category " "functions." msgstr "" -#: ../../build/doc/release_notes.rst:122 +#: ../../build/doc/release_notes.rst:125 msgid "Added max_tasks column in vehicles." msgstr "" -#: ../../build/doc/release_notes.rst:123 +#: ../../build/doc/release_notes.rst:126 msgid "Added tests for empty skills arrays." msgstr "" -#: ../../build/doc/release_notes.rst:124 +#: ../../build/doc/release_notes.rst:127 msgid "Added custom scaling logic for speed_factor." msgstr "" -#: ../../build/doc/release_notes.rst:125 +#: ../../build/doc/release_notes.rst:128 msgid "Modified parameter names to make the naming consistent." msgstr "" -#: ../../build/doc/release_notes.rst:128 +#: ../../build/doc/release_notes.rst:131 msgid "Fixes" msgstr "" -#: ../../build/doc/release_notes.rst:129 +#: ../../build/doc/release_notes.rst:132 msgid "Honor client cancel requests for vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:130 +#: ../../build/doc/release_notes.rst:133 msgid "" "Added more information in the inner query and result columns of VROOM " "category functions (`#26 " @@ -275,79 +283,79 @@ msgid "" "`_):" msgstr "" -#: ../../build/doc/release_notes.rst:133 +#: ../../build/doc/release_notes.rst:136 msgid "Summary row in the output, for each vehicle and for the complete problem." msgstr "" -#: ../../build/doc/release_notes.rst:134 +#: ../../build/doc/release_notes.rst:137 msgid "Uassigned rows in the output with vehicle_id = -1." msgstr "" -#: ../../build/doc/release_notes.rst:135 +#: ../../build/doc/release_notes.rst:138 msgid "" "Modified travel_time result column to return travel time between current " "and last step." msgstr "" -#: ../../build/doc/release_notes.rst:136 +#: ../../build/doc/release_notes.rst:139 msgid "" "Added data jsonb field in jobs, shipments, vehicles, breaks as well as in" " the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:137 +#: ../../build/doc/release_notes.rst:140 msgid "Added departure field and location_id field in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:140 +#: ../../build/doc/release_notes.rst:143 msgid "vrpRouting 0.2" msgstr "" -#: ../../build/doc/release_notes.rst:143 +#: ../../build/doc/release_notes.rst:146 msgid "New experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:153 +#: ../../build/doc/release_notes.rst:156 msgid "VRP" msgstr "" -#: ../../build/doc/release_notes.rst:155 +#: ../../build/doc/release_notes.rst:158 msgid "vrp_compatibleVehicles" msgstr "" -#: ../../build/doc/release_notes.rst:156 +#: ../../build/doc/release_notes.rst:159 msgid "vrp_optimize" msgstr "" -#: ../../build/doc/release_notes.rst:157 +#: ../../build/doc/release_notes.rst:160 msgid "vrp_pickDeliverAdd" msgstr "" -#: ../../build/doc/release_notes.rst:158 +#: ../../build/doc/release_notes.rst:161 msgid "vrp_pickDeliver" msgstr "" -#: ../../build/doc/release_notes.rst:159 +#: ../../build/doc/release_notes.rst:162 msgid "vrp_simulation" msgstr "" -#: ../../build/doc/release_notes.rst:160 +#: ../../build/doc/release_notes.rst:163 msgid "vrp_viewRoute" msgstr "" -#: ../../build/doc/release_notes.rst:163 +#: ../../build/doc/release_notes.rst:166 msgid "vrpRouting 0.1" msgstr "" -#: ../../build/doc/release_notes.rst:166 +#: ../../build/doc/release_notes.rst:169 msgid "Extraction tasks" msgstr "" -#: ../../build/doc/release_notes.rst:167 +#: ../../build/doc/release_notes.rst:170 msgid "Porting pgRouting's VRP functionality" msgstr "" -#: ../../build/doc/release_notes.rst:170 +#: ../../build/doc/release_notes.rst:173 msgid "New official functions" msgstr "" diff --git a/locale/pot/release_notes.pot b/locale/pot/release_notes.pot index 42d6a1016..8eeae3f33 100644 --- a/locale/pot/release_notes.pot +++ b/locale/pot/release_notes.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: vrpRouting v0.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-24 18:32+0000\n" +"POT-Creation-Date: 2024-07-24 18:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,35 +56,43 @@ msgstr "" msgid "vrpRouting 0.4.2 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:44 -msgid "No changes yet." +#: ../../build/doc/release_notes.rst:45 +msgid "Documentation queries" +msgstr "" + +#: ../../build/doc/release_notes.rst:46 +msgid "Renamed to extension `.pg`" msgstr "" #: ../../build/doc/release_notes.rst:47 +msgid "Removed `doc-` and `doc-vrp_` suffixes on file names" +msgstr "" + +#: ../../build/doc/release_notes.rst:50 msgid "vrpRouting 0.4.1 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:49 +#: ../../build/doc/release_notes.rst:52 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.1 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:55 +#: ../../build/doc/release_notes.rst:58 msgid "Modification on experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:56 +#: ../../build/doc/release_notes.rst:59 msgid "OR Tools" msgstr "" -#: ../../build/doc/release_notes.rst:58 +#: ../../build/doc/release_notes.rst:61 msgid "vrp_bin_packing" msgstr "" -#: ../../build/doc/release_notes.rst:59 +#: ../../build/doc/release_notes.rst:62 msgid "vrp_knapsack" msgstr "" -#: ../../build/doc/release_notes.rst:60 +#: ../../build/doc/release_notes.rst:63 msgid "vrp_multiple_knapsack" msgstr "" @@ -92,7 +100,7 @@ msgstr "" msgid "Support for or-tools v9.10.4067" msgstr "" -#: ../../build/doc/release_notes.rst:66 +#: ../../build/doc/release_notes.rst:69 msgid "vrp_oneDepot" msgstr "" @@ -104,17 +112,17 @@ msgstr "" msgid "Result columns changed" msgstr "" -#: ../../build/doc/release_notes.rst:73 +#: ../../build/doc/release_notes.rst:76 msgid "Removal of Boost on the build" msgstr "" -#: ../../build/doc/release_notes.rst:74 -#: ../../build/doc/release_notes.rst:172 +#: ../../build/doc/release_notes.rst:77 +#: ../../build/doc/release_notes.rst:175 msgid "vrp_full_version" msgstr "" -#: ../../build/doc/release_notes.rst:75 -#: ../../build/doc/release_notes.rst:171 +#: ../../build/doc/release_notes.rst:78 +#: ../../build/doc/release_notes.rst:174 msgid "vrp_version" msgstr "" @@ -122,201 +130,201 @@ msgstr "" msgid "Boost removed from the result columns" msgstr "" -#: ../../build/doc/release_notes.rst:82 +#: ../../build/doc/release_notes.rst:85 msgid "vrpRouting 0.4.0 Release Notes" msgstr "" -#: ../../build/doc/release_notes.rst:84 +#: ../../build/doc/release_notes.rst:87 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.4.0 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:89 +#: ../../build/doc/release_notes.rst:92 msgid "Added support for VROOM 1.12.0 (`#34 `_)" msgstr "" -#: ../../build/doc/release_notes.rst:90 +#: ../../build/doc/release_notes.rst:93 msgid "No visible changes on user side with respect to signatures." msgstr "" -#: ../../build/doc/release_notes.rst:91 +#: ../../build/doc/release_notes.rst:94 msgid "Adjusted to VROOM v1.12.0 due to internal breaking changes:" msgstr "" -#: ../../build/doc/release_notes.rst:93 +#: ../../build/doc/release_notes.rst:96 msgid "Made changes according to new vroom::Input signature." msgstr "" -#: ../../build/doc/release_notes.rst:94 +#: ../../build/doc/release_notes.rst:97 msgid "CI changes to compile without routing support, with Position Independent Code." msgstr "" -#: ../../build/doc/release_notes.rst:95 +#: ../../build/doc/release_notes.rst:98 msgid "Removed support for VROOM 1.11.0" msgstr "" -#: ../../build/doc/release_notes.rst:98 +#: ../../build/doc/release_notes.rst:101 msgid "vrpRouting 0.3" msgstr "" -#: ../../build/doc/release_notes.rst:100 +#: ../../build/doc/release_notes.rst:103 msgid "To see all issues & pull requests closed by this release see the `Git closed milestone for 0.3.0 `_ on Github." msgstr "" -#: ../../build/doc/release_notes.rst:105 +#: ../../build/doc/release_notes.rst:108 msgid "Modification of experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:106 -#: ../../build/doc/release_notes.rst:144 +#: ../../build/doc/release_notes.rst:109 +#: ../../build/doc/release_notes.rst:147 msgid "VROOM" msgstr "" -#: ../../build/doc/release_notes.rst:108 -#: ../../build/doc/release_notes.rst:146 +#: ../../build/doc/release_notes.rst:111 +#: ../../build/doc/release_notes.rst:149 msgid "vrp_vroom" msgstr "" -#: ../../build/doc/release_notes.rst:109 -#: ../../build/doc/release_notes.rst:147 +#: ../../build/doc/release_notes.rst:112 +#: ../../build/doc/release_notes.rst:150 msgid "vrp_vroomJobs" msgstr "" -#: ../../build/doc/release_notes.rst:110 -#: ../../build/doc/release_notes.rst:148 +#: ../../build/doc/release_notes.rst:113 +#: ../../build/doc/release_notes.rst:151 msgid "vrp_vroomShipments" msgstr "" -#: ../../build/doc/release_notes.rst:111 -#: ../../build/doc/release_notes.rst:149 +#: ../../build/doc/release_notes.rst:114 +#: ../../build/doc/release_notes.rst:152 msgid "vrp_vroomPlain" msgstr "" -#: ../../build/doc/release_notes.rst:112 -#: ../../build/doc/release_notes.rst:150 +#: ../../build/doc/release_notes.rst:115 +#: ../../build/doc/release_notes.rst:153 msgid "vrp_vroomJobsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:113 -#: ../../build/doc/release_notes.rst:151 +#: ../../build/doc/release_notes.rst:116 +#: ../../build/doc/release_notes.rst:154 msgid "vrp_vroomShipmentsPlain" msgstr "" -#: ../../build/doc/release_notes.rst:116 +#: ../../build/doc/release_notes.rst:119 msgid "Added support for VROOM 1.11.0 (`#24 `_)" msgstr "" -#: ../../build/doc/release_notes.rst:117 +#: ../../build/doc/release_notes.rst:120 msgid "Added setup time in jobs and shipments to refine service time modeling." msgstr "" -#: ../../build/doc/release_notes.rst:118 +#: ../../build/doc/release_notes.rst:121 msgid "Added support for custom cost matrices, along with the duration matrix." msgstr "" -#: ../../build/doc/release_notes.rst:120 +#: ../../build/doc/release_notes.rst:123 msgid "Using start_id, end_id, duration, cost as matrix table columns." msgstr "" -#: ../../build/doc/release_notes.rst:121 +#: ../../build/doc/release_notes.rst:124 msgid "Added timeout and exploration_level parameters to vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:122 +#: ../../build/doc/release_notes.rst:125 msgid "Added max_tasks column in vehicles." msgstr "" -#: ../../build/doc/release_notes.rst:123 +#: ../../build/doc/release_notes.rst:126 msgid "Added tests for empty skills arrays." msgstr "" -#: ../../build/doc/release_notes.rst:124 +#: ../../build/doc/release_notes.rst:127 msgid "Added custom scaling logic for speed_factor." msgstr "" -#: ../../build/doc/release_notes.rst:125 +#: ../../build/doc/release_notes.rst:128 msgid "Modified parameter names to make the naming consistent." msgstr "" -#: ../../build/doc/release_notes.rst:128 +#: ../../build/doc/release_notes.rst:131 msgid "Fixes" msgstr "" -#: ../../build/doc/release_notes.rst:129 +#: ../../build/doc/release_notes.rst:132 msgid "Honor client cancel requests for vroom-category functions." msgstr "" -#: ../../build/doc/release_notes.rst:130 +#: ../../build/doc/release_notes.rst:133 msgid "Added more information in the inner query and result columns of VROOM category functions (`#26 `_, `#27 `_):" msgstr "" -#: ../../build/doc/release_notes.rst:133 +#: ../../build/doc/release_notes.rst:136 msgid "Summary row in the output, for each vehicle and for the complete problem." msgstr "" -#: ../../build/doc/release_notes.rst:134 +#: ../../build/doc/release_notes.rst:137 msgid "Uassigned rows in the output with vehicle_id = -1." msgstr "" -#: ../../build/doc/release_notes.rst:135 +#: ../../build/doc/release_notes.rst:138 msgid "Modified travel_time result column to return travel time between current and last step." msgstr "" -#: ../../build/doc/release_notes.rst:136 +#: ../../build/doc/release_notes.rst:139 msgid "Added data jsonb field in jobs, shipments, vehicles, breaks as well as in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:137 +#: ../../build/doc/release_notes.rst:140 msgid "Added departure field and location_id field in the result columns." msgstr "" -#: ../../build/doc/release_notes.rst:140 +#: ../../build/doc/release_notes.rst:143 msgid "vrpRouting 0.2" msgstr "" -#: ../../build/doc/release_notes.rst:143 +#: ../../build/doc/release_notes.rst:146 msgid "New experimental functions" msgstr "" -#: ../../build/doc/release_notes.rst:153 +#: ../../build/doc/release_notes.rst:156 msgid "VRP" msgstr "" -#: ../../build/doc/release_notes.rst:155 +#: ../../build/doc/release_notes.rst:158 msgid "vrp_compatibleVehicles" msgstr "" -#: ../../build/doc/release_notes.rst:156 +#: ../../build/doc/release_notes.rst:159 msgid "vrp_optimize" msgstr "" -#: ../../build/doc/release_notes.rst:157 +#: ../../build/doc/release_notes.rst:160 msgid "vrp_pickDeliverAdd" msgstr "" -#: ../../build/doc/release_notes.rst:158 +#: ../../build/doc/release_notes.rst:161 msgid "vrp_pickDeliver" msgstr "" -#: ../../build/doc/release_notes.rst:159 +#: ../../build/doc/release_notes.rst:162 msgid "vrp_simulation" msgstr "" -#: ../../build/doc/release_notes.rst:160 +#: ../../build/doc/release_notes.rst:163 msgid "vrp_viewRoute" msgstr "" -#: ../../build/doc/release_notes.rst:163 +#: ../../build/doc/release_notes.rst:166 msgid "vrpRouting 0.1" msgstr "" -#: ../../build/doc/release_notes.rst:166 +#: ../../build/doc/release_notes.rst:169 msgid "Extraction tasks" msgstr "" -#: ../../build/doc/release_notes.rst:167 +#: ../../build/doc/release_notes.rst:170 msgid "Porting pgRouting's VRP functionality" msgstr "" -#: ../../build/doc/release_notes.rst:170 +#: ../../build/doc/release_notes.rst:173 msgid "New official functions" msgstr "" diff --git a/pgtap/or_tools/inner_query.sql b/pgtap/or_tools/inner_query.pg similarity index 100% rename from pgtap/or_tools/inner_query.sql rename to pgtap/or_tools/inner_query.pg diff --git a/pgtap/or_tools/no_crash_test.sql b/pgtap/or_tools/no_crash_test.pg similarity index 100% rename from pgtap/or_tools/no_crash_test.sql rename to pgtap/or_tools/no_crash_test.pg diff --git a/pgtap/or_tools/types_check.sql b/pgtap/or_tools/types_check.pg similarity index 100% rename from pgtap/or_tools/types_check.sql rename to pgtap/or_tools/types_check.pg diff --git a/pgtap/pgr_pickDeliver/oneDepot/no_crash_test.sql b/pgtap/pgr_pickDeliver/oneDepot/no_crash_test.pg similarity index 100% rename from pgtap/pgr_pickDeliver/oneDepot/no_crash_test.sql rename to pgtap/pgr_pickDeliver/oneDepot/no_crash_test.pg diff --git a/pgtap/pgr_pickDeliver/order_id_is_neg1.sql b/pgtap/pgr_pickDeliver/order_id_is_neg1.pg similarity index 100% rename from pgtap/pgr_pickDeliver/order_id_is_neg1.sql rename to pgtap/pgr_pickDeliver/order_id_is_neg1.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql b/pgtap/pgr_pickDeliver/pickDeliver-VS-pickDeliverEuclidean.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliver-VS-pickDeliverEuclidean.sql rename to pgtap/pgr_pickDeliver/pickDeliver-VS-pickDeliverEuclidean.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliver/innerQuery.sql b/pgtap/pgr_pickDeliver/pickDeliver/innerQuery.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliver/innerQuery.sql rename to pgtap/pgr_pickDeliver/pickDeliver/innerQuery.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliver/issue-1725.sql b/pgtap/pgr_pickDeliver/pickDeliver/issue-1725.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliver/issue-1725.sql rename to pgtap/pgr_pickDeliver/pickDeliver/issue-1725.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliver/many-calls.sql b/pgtap/pgr_pickDeliver/pickDeliver/many-calls.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliver/many-calls.sql rename to pgtap/pgr_pickDeliver/pickDeliver/many-calls.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliver/types_check.sql b/pgtap/pgr_pickDeliver/pickDeliver/types_check.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliver/types_check.sql rename to pgtap/pgr_pickDeliver/pickDeliver/types_check.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliverEuclidean/innerQuery.sql b/pgtap/pgr_pickDeliver/pickDeliverEuclidean/innerQuery.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliverEuclidean/innerQuery.sql rename to pgtap/pgr_pickDeliver/pickDeliverEuclidean/innerQuery.pg diff --git a/pgtap/pgr_pickDeliver/pickDeliverEuclidean/types_check.sql b/pgtap/pgr_pickDeliver/pickDeliverEuclidean/types_check.pg similarity index 100% rename from pgtap/pgr_pickDeliver/pickDeliverEuclidean/types_check.sql rename to pgtap/pgr_pickDeliver/pickDeliverEuclidean/types_check.pg diff --git a/pgtap/pgr_pickDeliver/wrong_data_pickDeliverEuclidean.sql b/pgtap/pgr_pickDeliver/wrong_data_pickDeliverEuclidean.pg similarity index 100% rename from pgtap/pgr_pickDeliver/wrong_data_pickDeliverEuclidean.sql rename to pgtap/pgr_pickDeliver/wrong_data_pickDeliverEuclidean.pg diff --git a/pgtap/version/full_version.sql b/pgtap/version/full_version.pg similarity index 100% rename from pgtap/version/full_version.sql rename to pgtap/version/full_version.pg diff --git a/pgtap/version/version.sql b/pgtap/version/version.pg similarity index 100% rename from pgtap/version/version.sql rename to pgtap/version/version.pg diff --git a/pgtap/vroom/edge_cases.sql b/pgtap/vroom/edge_cases.pg similarity index 100% rename from pgtap/vroom/edge_cases.sql rename to pgtap/vroom/edge_cases.pg diff --git a/pgtap/vroom/inner_query.sql b/pgtap/vroom/inner_query.pg similarity index 100% rename from pgtap/vroom/inner_query.sql rename to pgtap/vroom/inner_query.pg diff --git a/pgtap/vroom/no_crash_test.sql b/pgtap/vroom/no_crash_test.pg similarity index 100% rename from pgtap/vroom/no_crash_test.sql rename to pgtap/vroom/no_crash_test.pg diff --git a/pgtap/vroom/types_check.sql b/pgtap/vroom/types_check.pg similarity index 100% rename from pgtap/vroom/types_check.sql rename to pgtap/vroom/types_check.pg diff --git a/pgtap/vroom/vroom-plain-eq-timestamp.test.sql b/pgtap/vroom/vroom-plain-eq-timestamp.test.pg similarity index 100% rename from pgtap/vroom/vroom-plain-eq-timestamp.test.sql rename to pgtap/vroom/vroom-plain-eq-timestamp.test.pg diff --git a/pgtap/vroom/vroomJobs-eq-vroom.test.sql b/pgtap/vroom/vroomJobs-eq-vroom.test.pg similarity index 100% rename from pgtap/vroom/vroomJobs-eq-vroom.test.sql rename to pgtap/vroom/vroomJobs-eq-vroom.test.pg diff --git a/pgtap/vroom/vroomShipments-eq-vroom.test.sql b/pgtap/vroom/vroomShipments-eq-vroom.test.pg similarity index 100% rename from pgtap/vroom/vroomShipments-eq-vroom.test.sql rename to pgtap/vroom/vroomShipments-eq-vroom.test.pg diff --git a/tools/developer/taptest.sh b/tools/developer/taptest.sh index a2a984aee..178a89e60 100755 --- a/tools/developer/taptest.sh +++ b/tools/developer/taptest.sh @@ -2,27 +2,35 @@ set -e +QUIET="-v" +QUIET="-q" + if [[ -z $1 ]]; then - echo "Directory missing"; - echo "Usage" - echo "tools/developer/taptest.sh []"; + echo "taptest.sh help:" + echo Copy on the repository root directory and adjust to your needs + echo "Usage:" + echo "taptest.sh []"; echo "Examples:" - echo "tools/developer/taptest.sh withPoints/undirected_equalityDD.sql -p 5433" + echo "taptest.sh pgtap/withPoints/directed_equalityDD.pg -v -p 5433" + echo "taptest.sh pgtap/withPoints -p 5433" exit 1; fi DIR="$1" shift -PGFLAGS=$* - -PGDATABASE="___vrp___test___" +PGFLAGS="$*" -dropdb --if-exists "${PGFLAGS}" "${PGDATABASE}" -createdb "${PGFLAGS}" "${PGDATABASE}" +echo "----------------------------------------------------" +echo "----------- taptest of: $DIR" +echo "----------------------------------------------------" +PGDATABASE="___vrp___taptest___" -echo "../../${DIR}" +dropdb "${PGFLAGS[@]}" --if-exists "${PGDATABASE}" +createdb "${PGFLAGS[@]}" "${PGDATABASE}" -cd tools/testers/ -psql "$PGFLAGS" -f setup_db.sql -d "${PGDATABASE}" -pg_prove -v --recurse --ext .sql "${PGFLAGS}" -d "${PGDATABASE}" "../../${DIR}" -dropdb --if-exists "${PGFLAGS}" "${PGDATABASE}" +pushd tools/testers/ +psql "${PGFLAGS[@]}" -f setup_db.sql -d "${PGDATABASE}" +popd +pg_prove --recurse "${QUIET}" "${PGFLAGS[@]}" -d "${PGDATABASE}" "${DIR}" +echo pg_prove --recurse "${QUIET}" "${PGFLAGS[@]}" -d "${PGDATABASE}" "${DIR}" +#dropdb --if-exists "${PGFLAGS[@]}" "${PGDATABASE}" diff --git a/tools/testers/doc_queries_generator.pl b/tools/testers/doc_queries_generator.pl index 880f5c5aa..3c245cff5 100755 --- a/tools/testers/doc_queries_generator.pl +++ b/tools/testers/doc_queries_generator.pl @@ -283,7 +283,7 @@ sub process_single_test{ my $activate = shift; my $res = shift; - my $test_file = "$dir/$test_file_name.test.sql"; + my $test_file = "$dir/$test_file_name.pg"; my $result_file = "$dir/$test_file_name.result"; print "Processing test: $test_file"; my $t0 = [gettimeofday]; @@ -302,7 +302,7 @@ sub process_single_test{ }; } else { open(PSQL, "|$psql $connopts --set='VERBOSITY terse' -e $DBNAME > $TMP 2>\&1 ") || do { - $res->{"$dir/$test_file_name.test.sql"} = "FAILED: could not open connection to db : $!"; + $res->{"$dir/$test_file_name.pg"} = "FAILED: could not open connection to db : $!"; $stats{z_fail}++; return; }; diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index aa7a1a59f..f3af975ee 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -58,7 +58,7 @@ fi cd ./tools/testers/ psql "${PGPORT[@]}" "${PGUSER[@]}" -d "${PGDATABASE}" -X -q -v ON_ERROR_STOP=1 --pset pager=off -f setup_db.sql -pg_prove --ext .sql --failures --quiet --recurse "${PGPORT[@]}" "${PGUSER[@]}" -d "${PGDATABASE}" ../../pgtap/ +pg_prove --failures --quiet --recurse "${PGPORT[@]}" "${PGUSER[@]}" -d "${PGDATABASE}" ../../pgtap/ # database wont be removed unless script does not fails if [ -n "$CLEANDB" ]; then