Commit b6ba3558 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.5.1

parent 2d47811f
......@@ -2,12 +2,7 @@
build
fix_typos
code_linter
tools/template/mycreate.sh
*.sh
.DS_Store
.vagrant
tools/vagrant/packaging.sh
tools/testers/pg_prove_dijkstraTRSP_tests.sh
.directory
notUsed
......@@ -5,7 +5,7 @@
# (http://www.cmake.org/cmake/help/v2.8.12/cmake.html)
#
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
if(POLICY CMP0046)
cmake_policy(SET CMP0046 OLD)
......@@ -182,7 +182,7 @@ endif()
set(PGROUTING_VERSION_MAJOR "2")
set(PGROUTING_VERSION_MINOR "5")
set(PGROUTING_VERSION_PATCH "0")
set(PGROUTING_VERSION_PATCH "1")
set(PGROUTING_VERSION_DEV "")
set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
......@@ -199,10 +199,10 @@ set(PGROUTING_GIT_HASH "")
string(REGEX REPLACE "^([0-9]+)-([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})
string(REGEX REPLACE "^([0-9]+)-([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_BRANCH ${PGROUTING_BUILD_STRING})
if ( NOT "${PGROUTING_GIT_BRANCH}" STREQUAL "master")
set (PGROUTING_GIT_HASH "")
set (PGROUTING_GIT_BRANCH "")
endif()
#if (NOT "${PGROUTING_GIT_BRANCH}" STREQUAL "master")
# set (PGROUTING_GIT_HASH "")
# set (PGROUTING_GIT_BRANCH "")
#endif()
if (PGROUTING_DEBUG)
......
pgRouting 2.5.1 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the [Git closed milestone for 2.5.1 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20) on Github.
*Bug fixes*
* Fixed prerequisite minimum version of: cmake
pgRouting 2.5.0 Release Notes
-------------------------------------------------------------------------------
......
......@@ -6,8 +6,8 @@
### Branches
* The *master* branch has the release 2.5.0
* The *release/2.5* branch has the next micro-release 2.5.1 (if needed)
* The *master* branch has the release 2.5.1
* The *release/2.5* branch has the next micro-release 2.5.2 (if needed)
* The *develop* branch has the development of the next minor-release 2.6.0-dev
For the complete list of releases go to:
......@@ -106,7 +106,7 @@ Building reqirements
* MSVC >= 18.0
* Postgresql >= 9.2
* The Boost Graph Library (BGL) >= 1.46
* CMake >= 2.8.8
* CMake >= 3.2
* CGAL >= 4.4
* Sphinx >= 1.2
......
5535-54b9b7a6b release/2.5
6238-de7557554 master
......@@ -143,12 +143,6 @@ Column Type Description
* When `negative`: edge (`target`, `source`) does not exist, therefore it’s not part of the graph.
============================ ================= ===================================================================
Examples
-------------------------------------------------------------------------------
.. literalinclude:: doc-pgr_lineGraph.queries
:start-after: -- q3
:end-before: -- q4
See Also
-------------------------------------------------------------------------------
......
......@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
2.5.0
2.5.1
(1 row)
-- q2
......
......@@ -136,7 +136,7 @@ To be able to compile pgRouting, make sure that the following dependencies are m
* Postgresql version >= 9.2
* PostGIS version >= 2.0
* The Boost Graph Library (BGL). Version >= 1.46
* CMake >= 2.8.8
* CMake >= 3.2
* CGAL >= 4.2
......
......@@ -18,6 +18,7 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog start
* :ref:`changelog_2_5_1`
* :ref:`changelog_2_5_0`
* :ref:`changelog_2_4_2`
* :ref:`changelog_2_4_1`
......@@ -37,6 +38,18 @@ To see the full list of changes check the list of `Git commits <https://github.c
.. changelog end
.. _changelog_2_5_1:
pgRouting 2.5.1 Release Notes
-------------------------------------------------------------------------------
To see the issues closed by this release see the `Git closed milestone for 2.5.1 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.1%22%20>`_ on Github.
.. rubric:: Bug fixes
* Fixed prerequisite minimum version of: cmake
.. _changelog_2_5_0:
pgRouting 2.5.0 Release Notes
......
......@@ -46,8 +46,8 @@ When points are also given as input:
Images
--------------
The squared vertices are the temporary vertices, The temporary vertices are added acordng to the
dirving side, The following images visualy show the diferences on how depending on the driving side the data is interpreted.
The squared vertices are the temporary vertices, The temporary vertices are added according to the
driving side, The following images visually show the differences on how depending on the driving side the data is interpreted.
.. rubric:: Right driving side
......@@ -67,7 +67,7 @@ dirving side, The following images visualy show the diferences on how depending
Introduction
--------------
This famly of functions was thought for routing vehicles, but might as well work
This family of functions was thought for routing vehicles, but might as well work
for some other application that we can not think of.
The with points family of function give you the ability to route between
......@@ -114,7 +114,7 @@ In all this functions we have to take care of as many aspects as possible:
- Transformation to negative is done internally.
- For results for involving vertices identifiers
- positive sign is a vertex of the original grpah
- positive sign is a vertex of the original graph
- negative sign is a point of the temporary points
The reason for doing this is to avoid confusion when there is a vertex with the same number as identifier as the points identifier.
......@@ -150,7 +150,7 @@ For edge (15, 9,12 10, 20), & lets insert point (2, 12, 0.3, r)
From first image above:
- We can arrive to the point only via vertex 9.
- It only afects the edge (15, 9,12, 10) so that edge is removed.
- It only affects the edge (15, 9,12, 10) so that edge is removed.
- Edge (15, 12,9, 20) is kept.
- Create new edges:
......@@ -162,7 +162,7 @@ From first image above:
From second image above:
- We can arrive to the point only via vertex 12.
- It only afects the edge (15, 12,9 20) so that edge is removed.
- It only affects the edge (15, 12,9 20) so that edge is removed.
- Edge (15, 9,12, 10) is kept.
- Create new edges:
......
SET(OLD_SIGNATURES
2.5.0
2.4.2
2.4.1
2.4.0
2.0.0
2.0.1
2.1.0
......@@ -10,9 +15,6 @@ SET(OLD_SIGNATURES
2.3.0
2.3.1
2.3.2
2.4.0
2.4.1
2.4.2
)
foreach (f ${OLD_SIGNATURES})
......
#VERSION pgrouting 2.5.1
#TYPES
pgr_costresult
pgr_costresult3
pgr_geomresult
#FUNCTIONS
pgr_alphashape(text,double precision)
pgr_analyzegraph(text,double precision,text,text,text,text,text)
pgr_analyzeoneway(text,text[],text[],text[],text[],boolean,text,text,text)
pgr_apspjohnson(text)
pgr_apspwarshall(text,boolean,boolean)
pgr_articulationpoints(text)
pgr_astarcostmatrix(text,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,anyarray,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,anyarray,bigint,boolean,integer,double precision,double precision)
pgr_astarcost(text,bigint,anyarray,boolean,integer,double precision,double precision)
pgr_astarcost(text,bigint,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision)
_pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean,boolean)
pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision)
pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision)
pgr_astar(text,integer,integer,boolean,boolean)
pgr_bdastarcostmatrix(text,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,anyarray,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,anyarray,bigint,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,bigint,anyarray,boolean,integer,numeric,numeric)
pgr_bdastarcost(text,bigint,bigint,boolean,integer,numeric,numeric)
_pgr_bdastar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean)
pgr_bdastar(text,anyarray,anyarray,boolean,integer,numeric,numeric)
pgr_bdastar(text,anyarray,bigint,boolean,integer,numeric,numeric)
pgr_bdastar(text,bigint,anyarray,boolean,integer,numeric,numeric)
pgr_bdastar(text,bigint,bigint)
pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric)
pgr_bdastar(text,integer,integer,boolean,boolean)
pgr_bddijkstracostmatrix(text,anyarray,boolean)
pgr_bddijkstracost(text,anyarray,anyarray,boolean)
pgr_bddijkstracost(text,anyarray,bigint,boolean)
pgr_bddijkstracost(text,bigint,anyarray,boolean)
pgr_bddijkstracost(text,bigint,bigint,boolean)
pgr_bddijkstra(text,anyarray,anyarray,boolean)
_pgr_bddijkstra(text,anyarray,anyarray,boolean,boolean)
pgr_bddijkstra(text,anyarray,bigint,boolean)
pgr_bddijkstra(text,bigint,anyarray,boolean)
pgr_bddijkstra(text,bigint,bigint)
pgr_bddijkstra(text,bigint,bigint,boolean)
pgr_bddijkstra(text,integer,integer,boolean,boolean)
pgr_biconnectedcomponents(text)
pgr_boykovkolmogorov(text,anyarray,anyarray)
pgr_boykovkolmogorov(text,anyarray,bigint)
pgr_boykovkolmogorov(text,bigint,anyarray)
pgr_boykovkolmogorov(text,bigint,bigint)
pgr_bridges(text)
_pgr_checkverttab(text,text[],integer,text)
pgr_connectedcomponents(text)
pgr_contractgraph(text,bigint[],integer,bigint[],boolean)
_pgr_createindex(text,text,text,integer,text)
_pgr_createindex(text,text,text,text,integer,text)
pgr_createtopology(text,double precision,text,text,text,text,text,boolean)
pgr_createverticestable(text,text,text,text,text)
pgr_dijkstracostmatrix(text,anyarray,boolean)
pgr_dijkstracost(text,anyarray,anyarray,boolean)
pgr_dijkstracost(text,anyarray,bigint,boolean)
pgr_dijkstracost(text,bigint,anyarray,boolean)
pgr_dijkstracost(text,bigint,bigint,boolean)
pgr_dijkstra(text,anyarray,anyarray,boolean)
_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean)
pgr_dijkstra(text,anyarray,bigint,boolean)
pgr_dijkstra(text,bigint,anyarray,boolean)
pgr_dijkstra(text,bigint,bigint)
pgr_dijkstra(text,bigint,bigint,boolean)
pgr_dijkstra(text,integer,integer,boolean,boolean)
pgr_dijkstravia(text,anyarray,boolean,boolean,boolean)
pgr_drivingdistance(text,anyarray,double precision,boolean,boolean)
pgr_drivingdistance(text,bigint,double precision,boolean)
pgr_drivingdistance(text,bigint,double precision,boolean,boolean)
pgr_edgedisjointpaths(text,anyarray,anyarray,boolean)
pgr_edgedisjointpaths(text,anyarray,bigint,boolean)
pgr_edgedisjointpaths(text,bigint,anyarray,boolean)
pgr_edgedisjointpaths(text,bigint,bigint,boolean)
pgr_edmondskarp(text,anyarray,anyarray)
pgr_edmondskarp(text,anyarray,bigint)
pgr_edmondskarp(text,bigint,anyarray)
pgr_edmondskarp(text,bigint,bigint)
_pgr_endpoint(geometry)
pgr_endpoint(geometry)
pgr_euclediantsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
pgr_flipedges(geometry[])
pgr_floydwarshall(text,boolean)
pgr_getcolumnname(text,text)
_pgr_getcolumnname(text,text,integer,text)
_pgr_getcolumnname(text,text,text,integer,text)
_pgr_getcolumntype(text,text,integer,text)
_pgr_getcolumntype(text,text,text,integer,text)
_pgr_get_statement(text)
pgr_gettablename(text)
_pgr_gettablename(text,integer,text)
_pgr_gsoc_vrppdtw(text,integer,double precision,double precision,integer)
pgr_gsoc_vrppdtw(text,integer,integer)
pgr_iscolumnindexed(text,text)
_pgr_iscolumnindexed(text,text,integer,text)
_pgr_iscolumnindexed(text,text,text,integer,text)
_pgr_iscolumnintable(text,text)
pgr_iscolumnintable(text,text)
pgr_johnson(text,boolean)
pgr_kdijkstracost(text,integer,integer[],boolean,boolean)
pgr_kdijkstrapath(text,integer,integer[],boolean,boolean)
_pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
pgr_ksp(text,integer,integer,integer,boolean)
pgr_labelgraph(text,text,text,text,text,text)
pgr_linegraph(text,boolean)
_pgr_makedistancematrix(text)
pgr_maxcardinalitymatch(text,boolean)
pgr_maxflowboykovkolmogorov(text,anyarray,anyarray)
pgr_maxflowboykovkolmogorov(text,anyarray,bigint)
pgr_maxflowboykovkolmogorov(text,bigint,anyarray)
pgr_maxflowboykovkolmogorov(text,bigint,bigint)
pgr_maxflowedmondskarp(text,anyarray,anyarray)
pgr_maxflowedmondskarp(text,anyarray,bigint)
pgr_maxflowedmondskarp(text,bigint,anyarray)
pgr_maxflowedmondskarp(text,bigint,bigint)
pgr_maxflowpushrelabel(text,anyarray,anyarray)
pgr_maxflowpushrelabel(text,anyarray,bigint)
pgr_maxflowpushrelabel(text,bigint,anyarray)
pgr_maxflowpushrelabel(text,bigint,bigint)
pgr_maxflow(text,anyarray,anyarray)
_pgr_maxflow(text,anyarray,anyarray,integer,boolean)
pgr_maxflow(text,anyarray,bigint)
pgr_maxflow(text,bigint,anyarray)
pgr_maxflow(text,bigint,bigint)
pgr_maximumcardinalitymatching(text,boolean)
_pgr_msg(integer,text,text)
pgr_nodenetwork(text,double precision,text,text,text,text,boolean)
_pgr_onerror(boolean,integer,text,text,text,text)
_pgr_parameter_check(text,text,boolean)
_pgr_pickdelivereuclidean(text,text,double precision,integer,integer)
_pgr_pickdeliver(text,text,text,double precision,integer,integer)
pgr_pointsaspolygon(character varying,double precision)
pgr_pointstodmatrix(geometry[],integer)
pgr_pointstovids(geometry[],text,double precision)
pgr_pointtoedgenode(text,geometry,double precision)
_pgr_pointtoid(geometry,double precision,text,integer)
pgr_pushrelabel(text,anyarray,anyarray)
pgr_pushrelabel(text,anyarray,bigint)
pgr_pushrelabel(text,bigint,anyarray)
pgr_pushrelabel(text,bigint,bigint)
_pgr_quote_ident(text)
pgr_quote_ident(text)
_pgr_startpoint(geometry)
pgr_startpoint(geometry)
pgr_strongcomponents(text)
pgr_texttopoints(text,integer)
_pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text)
_pgr_trsp(text,integer,integer,boolean,boolean,text)
pgr_trsp(text,integer,integer,boolean,boolean,text)
pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text)
pgr_trspviavertices(text,anyarray,boolean,boolean,text)
_pgr_trspviavertices(text,integer[],boolean,boolean,text)
pgr_tsp(double precision[],integer,integer)
pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean)
pgr_tsp(text,integer,integer)
_pgr_unnest_matrix(double precision[])
pgr_version()
_pgr_versionless(text,text)
pgr_versionless(text,text)
pgr_vidstodmatrix(integer[],geometry[],text,double precision)
pgr_vidstodmatrix(text,integer[],boolean,boolean,boolean)
_pgr_vrponedepot(text,text,text,integer)
pgr_vrponedepot(text,text,text,integer)
pgr_withpointscostmatrix(text,text,anyarray,boolean,character)
pgr_withpointscost(text,text,anyarray,anyarray,boolean,character)
pgr_withpointscost(text,text,anyarray,bigint,boolean,character)
pgr_withpointscost(text,text,bigint,anyarray,boolean,character)
pgr_withpointscost(text,text,bigint,bigint,boolean,character)
pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean)
pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean)
pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean)
pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean)
_pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean,boolean,boolean)
pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean)
pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean)
pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean)
_pgr_withpointsvia(text,bigint[],double precision[],boolean)
......@@ -6,7 +6,7 @@ SET
SELECT version FROM pgr_version();
version
---------
2.5.0
2.5.1
(1 row)
-- q2
......
......@@ -91,8 +91,8 @@ MINOR=$2
MICRO=$3
PREV_REL=$4
BRANCH=$5
RC=$6
DEBUG=$7
DEBUG=$6
RC=$7
if [[ -z "$DEBUG" ]]; then
......@@ -264,19 +264,27 @@ if [[ -n $DEBUG ]]; then
echo "\`\`\`"
fi
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
if [[ "$BRANCH" != "master" ]]; then
if [[ $(cat VERSION | grep "release/$MAYOR.$MINOR") != *"release/$MAYOR.$MINOR" ]]; then
error_msg "VERSION should have release/$MAYOR.$MINOR"
exit 1
fi
else
echo " -[x] VERSION file branch: OK"
if [[ $(cat VERSION | grep "$BRANCH") != *"master" ]]; then
error_msg "VERSION should have master"
exit 1
fi
fi
echo " -[x] VERSION file branch: OK"
#---------------------------------------------------------------------
echo
echo "### Checking signature files"
echo "### Checking signature files exist"
echo
#---------------------------------------------------------------------
test_file $PREV_REL
test_file 2.5.1
test_file 2.5.0
test_file 2.4.2
test_file 2.4.1
test_file 2.4.0
test_file 2.3.2
......@@ -322,22 +330,22 @@ echo - [x] completed local builds
echo "### checking the signature files dont change"
#---------------------------------------------------------------------
sh tools/release-scripts/get_signatures.sh 2.5.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.4.2 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.4.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.4.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.3.2 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.3.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.3.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.2.4 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.2.3 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.2.2 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.2.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.2.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.1.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
#version 2.0.1 can not be upgraded
#sh tools/release-scripts/get_signatures.sh 2.0.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.0.0 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
sh tools/release-scripts/get_signatures.sh 2.5.1 ___sig_generate___ sql/sigs >> build/tmp_sigs.txt
test_file 2.5.0
test_file 2.4.2
test_file 2.4.1
test_file 2.4.0
test_file 2.3.2
test_file 2.3.1
test_file 2.3.0
test_file 2.2.4
test_file 2.2.3
test_file 2.2.2
test_file 2.2.1
test_file 2.2.0
test_file 2.1.0
test_file 2.0.1
test_file 2.0.0
echo
echo - [x] completed check: OK
......
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- pgRouting extension upgrade from 2.0.0 to 2.5.0
-- pgRouting extension upgrade from 2.0.0 to 2.5.1
-- generated by tools/build-extension-update-files
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
\echo Use "ALTER extension pgrouting update to '2.5.0'" to load this file. \quit
\echo Use "ALTER extension pgrouting update to '2.5.1'" to load this file. \quit
-------------------------------------
-- remove functions no longer in the 2.5.0 extension
-- remove functions no longer in the 2.5.1 extension
-------------------------------------
......@@ -50,7 +50,7 @@ DROP FUNCTION IF EXISTS pgr_pointtoid(geometry,double precision,text,integer);
------------------------------------------
-- pgr_dijkstra:
-- 2.0.0: { sql, source_id, target_id, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_dijkstra(text,integer,integer,boolean,boolean);
DROP FUNCTION IF EXISTS pgr_dijkstra(text,integer,integer,boolean,boolean);
......@@ -65,7 +65,7 @@ DROP FUNCTION IF EXISTS pgr_dijkstra(text,integer,integer,boolean,boolean);
------------------------------------------
-- pgr_ksp
-- 2.0.0: { sql, source_id, target_id, no_paths,has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, k, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, k, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_ksp(text,integer,integer,integer,boolean);
DROP FUNCTION IF EXISTS pgr_ksp(text,integer,integer,integer,boolean);
......@@ -80,7 +80,7 @@ DROP FUNCTION IF EXISTS pgr_ksp(text,integer,integer,integer,boolean);
------------------------------------------
-- pgr_apspjohnson
-- 2.0.0: { sql}
-- 2.5.0: {edges_sql}
-- 2.5.1: {edges_sql}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_apspjohnson(text);
DROP FUNCTION IF EXISTS pgr_apspjohnson(text);
......@@ -88,7 +88,7 @@ DROP FUNCTION IF EXISTS pgr_apspjohnson(text);
-- pgr_apspwarshall
-- 2.0.0: { sql, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, directed, has_rcost}
-- 2.5.1: {edges_sql, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_apspwarshall(text,boolean,boolean);
DROP FUNCTION IF EXISTS pgr_apspwarshall(text,boolean,boolean);
......@@ -96,7 +96,7 @@ DROP FUNCTION IF EXISTS pgr_apspwarshall(text,boolean,boolean);
-- pgr_kdijkstrapath
-- 2.0.0: {sql,source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {sql, source, targets, directed, has_rcost}
-- 2.5.1: {sql, source, targets, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_kdijkstrapath(text,integer,integer[],boolean,boolean);
DROP FUNCTION IF EXISTS pgr_kdijkstrapath(text,integer,integer[],boolean,boolean);
......@@ -104,7 +104,7 @@ DROP FUNCTION IF EXISTS pgr_kdijkstrapath(text,integer,integer[],boolean,boolean
-- pgr_kdijkstracost
-- 2.0.0: {sql,source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {sql, source, targets, directed, has_rcost}
-- 2.5.1: {sql, source, targets, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_kdijkstracost(text,integer,integer[],boolean,boolean);
DROP FUNCTION IF EXISTS pgr_kdijkstracost(text,integer,integer[],boolean,boolean);
......@@ -118,7 +118,7 @@ DROP FUNCTION IF EXISTS pgr_kdijkstracost(text,integer,integer[],boolean,boolean
------------------------------------------
-- pgr_version
-- 2.0.0: {version,tag,build,hash,branch,boost}
-- 2.5.0: {version,tag,hash,branch,boost}
-- 2.5.1: {version,tag,hash,branch,boost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_version();
DROP FUNCTION IF EXISTS pgr_version();
......@@ -132,7 +132,7 @@ DROP FUNCTION IF EXISTS pgr_version();
------------------------------------------
-- pgr_trsp
-- 2.0.0: { sql, source_vid, target_vid, directed, has_reverse_cost, turn_restrict_sql}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost, restrictions_sql}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost, restrictions_sql}
UPDATE pg_proc SET
proargnames = '{"edges_sql","start_vid","end_vid","directed","has_rcost","restrictions_sql"}'
......@@ -147,7 +147,7 @@ WHERE proname = 'pgr_trsp'
------------------------------------------
-- pgr_bddijkstra
-- 2.0.0: { sql, source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost}
UPDATE pg_proc SET
proargnames = '{"edges_sql","start_vid","end_vid","directed","has_rcost"}'
......@@ -227,10 +227,10 @@ RETURNS TABLE(
boost varchar
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,
'1.54.0'::varchar AS boost;
$BODY$
LANGUAGE sql IMMUTABLE;
......
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-- pgRouting extension upgrade from 2.0.1 to 2.5.0
-- pgRouting extension upgrade from 2.0.1 to 2.5.1
-- generated by tools/build-extension-update-files
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
\echo Use "ALTER extension pgrouting update to '2.5.0'" to load this file. \quit
\echo Use "ALTER extension pgrouting update to '2.5.1'" to load this file. \quit
-------------------------------------
-- remove functions no longer in the 2.5.0 extension
-- remove functions no longer in the 2.5.1 extension
-------------------------------------
......@@ -50,7 +50,7 @@ DROP FUNCTION IF EXISTS pgr_pointtoid(geometry,double precision,text,integer);
------------------------------------------
-- pgr_dijkstra:
-- 2.0.1: { sql, source_id, target_id, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_dijkstra(text,integer,integer,boolean,boolean);
DROP FUNCTION IF EXISTS pgr_dijkstra(text,integer,integer,boolean,boolean);
......@@ -65,7 +65,7 @@ DROP FUNCTION IF EXISTS pgr_dijkstra(text,integer,integer,boolean,boolean);
------------------------------------------
-- pgr_ksp
-- 2.0.1: { sql, source_id, target_id, no_paths,has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, k, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, k, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_ksp(text,integer,integer,integer,boolean);
DROP FUNCTION IF EXISTS pgr_ksp(text,integer,integer,integer,boolean);
......@@ -80,7 +80,7 @@ DROP FUNCTION IF EXISTS pgr_ksp(text,integer,integer,integer,boolean);
------------------------------------------
-- pgr_apspjohnson
-- 2.0.1: { sql}
-- 2.5.0: {edges_sql}
-- 2.5.1: {edges_sql}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_apspjohnson(text);
DROP FUNCTION IF EXISTS pgr_apspjohnson(text);
......@@ -88,7 +88,7 @@ DROP FUNCTION IF EXISTS pgr_apspjohnson(text);
-- pgr_apspwarshall
-- 2.0.1: { sql, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, directed, has_rcost}
-- 2.5.1: {edges_sql, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_apspwarshall(text,boolean,boolean);
DROP FUNCTION IF EXISTS pgr_apspwarshall(text,boolean,boolean);
......@@ -96,7 +96,7 @@ DROP FUNCTION IF EXISTS pgr_apspwarshall(text,boolean,boolean);
-- pgr_kdijkstrapath
-- 2.0.1: {sql,source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {sql, source, targets, directed, has_rcost}
-- 2.5.1: {sql, source, targets, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_kdijkstrapath(text,integer,integer[],boolean,boolean);
DROP FUNCTION IF EXISTS pgr_kdijkstrapath(text,integer,integer[],boolean,boolean);
......@@ -104,7 +104,7 @@ DROP FUNCTION IF EXISTS pgr_kdijkstrapath(text,integer,integer[],boolean,boolean
-- pgr_kdijkstracost
-- 2.0.1: {sql,source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {sql, source, targets, directed, has_rcost}
-- 2.5.1: {sql, source, targets, directed, has_rcost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_kdijkstracost(text,integer,integer[],boolean,boolean);
DROP FUNCTION IF EXISTS pgr_kdijkstracost(text,integer,integer[],boolean,boolean);
......@@ -118,7 +118,7 @@ DROP FUNCTION IF EXISTS pgr_kdijkstracost(text,integer,integer[],boolean,boolean
------------------------------------------
-- pgr_version
-- 2.0.1: {version,tag,build,hash,branch,boost}
-- 2.5.0: {version,tag,hash,branch,boost}
-- 2.5.1: {version,tag,hash,branch,boost}
ALTER EXTENSION pgrouting DROP FUNCTION pgr_version();
DROP FUNCTION IF EXISTS pgr_version();
......@@ -132,7 +132,7 @@ DROP FUNCTION IF EXISTS pgr_version();
------------------------------------------
-- pgr_trsp
-- 2.0.1: { sql, source_vid, target_vid, directed, has_reverse_cost, turn_restrict_sql}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost, restrictions_sql}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost, restrictions_sql}
UPDATE pg_proc SET
proargnames = '{"edges_sql","start_vid","end_vid","directed","has_rcost","restrictions_sql"}'
......@@ -147,7 +147,7 @@ WHERE proname = 'pgr_trsp'
------------------------------------------
-- pgr_bddijkstra
-- 2.0.1: { sql, source_vid, target_vid, directed, has_reverse_cost}
-- 2.5.0: {edges_sql, start_vid, end_vid, directed, has_rcost}
-- 2.5.1: {edges_sql, start_vid, end_vid, directed, has_rcost}
UPDATE pg_proc SET
proargnames = '{"edges_sql","start_vid","end_vid","directed","has_rcost"}'
......@@ -227,10 +227,10 @@ RETURNS TABLE(
boost varchar
) AS
$BODY$
SELECT '2.5.0'::varchar AS version,
'v2.5.0'::varchar AS tag,
''::varchar AS hash,
''::varchar AS branch,
SELECT '2.5.1'::varchar AS version,
'v2.5.1'::varchar AS tag,
'de7557554'::varchar AS hash,
'master'::varchar AS branch,