Merge pull request #572 from cvvergara/hotfix/issue549

Hotfix/issue549

Author: cvvergara

.travis.yml

@@ -27,7 +27,7 @@ branches:
   only:
     - master
     - develop
-    - hotFix/issue552
+    - hotfix/issue549
 
 env:
   - POSTGRESQL_VERSION=9.1
@@ -79,12 +79,12 @@ before_script:
 
 script: 
   - ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
-
-after_script: 
-  # note: right takes the travis default
   - ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION postgres
   - ./tools/testers/pg_prove_tests.sh postgres
 
+after_script: 
+  # nothing
+
 #after_success:
   #- ./tools/travis/pgrouting_deploy.sh $POSTGRESQL_VERSION $POSTGIS_VERSION
 

CMakeLists.txt

@@ -31,7 +31,7 @@ SET(POSTGRESQL_BIN "" CACHE STRING "Define optional path to PostgreSQL binaries
 # PGROUTING version number.
 set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "2")
-set(PGROUTING_VERSION_PATCH "2")
+set(PGROUTING_VERSION_PATCH "3")
 
 set(PGROUTING_VERSION_STRING "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")
 set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
@@ -41,7 +41,7 @@ set(POSTGIS_MINIMUM_VERSION "2.0.0")
 
 file(STRINGS "${PGROUTING_SOURCE_DIR}/VERSION" PGROUTING_BUILD_STRING)
 
-set(PGROUTING_GIT_TAG "pgrouting-2.2.2")
+set(PGROUTING_GIT_TAG "pgrouting-2.2.3")
 #string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\1" PGROUTING_GIT_TAG ${PGROUTING_BUILD_STRING})
 string(REGEX REPLACE "^(.+)-([^-]+)-[0-9]+-g([0-9a-f]+) (.*)$" "\\2" PGROUTING_GIT_BUILD ${PGROUTING_BUILD_STRING})
 string(REGEX REPLACE "^(.+)-([0-9]+)-g([0-9a-f]+) (.*)$" "\\3" PGROUTING_GIT_HASH ${PGROUTING_BUILD_STRING})

NEWS

@@ -1,3 +1,9 @@
+Changes for 2.2.3
+-------------------------------------------------------------------------------
+
+- Fixed  compatibility issues with PostgreSQL 9.6.
+
+
 Changes for 2.2.2
 -------------------------------------------------------------------------------
 

README.md

@@ -6,7 +6,7 @@
 
 ### Branches
 
-The *master* branch reflects the current 2.2.2 release.
+The *master* branch reflects the current 2.2.3 release.
 The *develop* branch reflects the 2.3.0-dev
 
 

VERSION

@@ -1 +1 @@
-pgrouting-2.2.2-12-g544044b master
+pgrouting-2.2.3-4-g6d05b9b master

doc/index.rst

@@ -177,6 +177,7 @@ Change Log
 
 :ref:`change_log`
 
+   - :ref:`changelog_2_2_3`
    - :ref:`changelog_2_2_2`
    - :ref:`changelog_2_2_1`
    - :ref:`changelog_2_2_0`

doc/src/changelog/2_2_3.rst

@@ -0,0 +1,28 @@
+..
+   ****************************************************************************
+    pgRouting Manual
+    Copyright(c) pgRouting Contributors
+
+    This documentation is licensed under a Creative Commons Attribution-Share
+    Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/
+   ****************************************************************************
+
+.. _changelog_2_2_3:
+
+pgRouting 2.2.3 Release Notes
+===============================================================================
+
+With the release of pgRouting 2.2.e fixes  compatibility issues with PostgreSQL 9.6.
+
+ - To see the full list of changes check the list of `Git commits <https://github.com/pgRouting/pgrouting/commits>`_ on Github.
+ - To see the issues closed by this release see the `Git closed issues <https://github.com/pgRouting/pgrouting/issues?q=milestone%3ARelease-2.2.3+is%3Aclosed>`_ on Github.
+ - For important changes see the following release notes.
+
+
+Release Notes
+-------------------------------------------------------------------------------
+
+
+Changes for release 2.2.3
+
+* Fixed  compatibility issues with PostgreSQL 9.6.

doc/src/changelog/index.rst

@@ -12,6 +12,7 @@
 Release Notes
 ===============================================================================
 
+   - :ref:`changelog_2_2_3`
    - :ref:`changelog_2_2_2`
    - :ref:`changelog_2_2_1`
    - :ref:`changelog_2_2_0`  
@@ -22,6 +23,7 @@ Release Notes
 .. toctree::
    :hidden: 
 
+   2_2_3
    2_2_2
    2_2_1
    2_2_0

doc/test/utilities-any.result

@@ -1 +1 @@
-2.2.2
+2.2.3

src/allpairs/src/floydWarshall.c

@@ -164,22 +164,22 @@ floydWarshall(PG_FUNCTION_ARGS) {
         HeapTuple    tuple;
         Datum        result;
         Datum        *values;
-        char*        nulls;
+        bool*        nulls;
 
         /*********************************************************************/
         values = palloc(3 * sizeof(Datum));
-        nulls = palloc(3 * sizeof(char));
+        nulls = palloc(3 * sizeof(bool));
 
         // postgres starts counting from 1
         values[0] = Int64GetDatum(result_tuples[call_cntr].from_vid);
-        nulls[0] = ' ';
+        nulls[0] = false;
         values[1] = Int64GetDatum(result_tuples[call_cntr].to_vid);
-        nulls[1] = ' ';
+        nulls[1] = false;
         values[2] = Float8GetDatum(result_tuples[call_cntr].cost);
-        nulls[2] = ' ';
+        nulls[2] = false;
         /*********************************************************************/
 
-        tuple = heap_formtuple(tuple_desc, values, nulls);
+        tuple = heap_form_tuple(tuple_desc, values, nulls);
         result = HeapTupleGetDatum(tuple);
         SRF_RETURN_NEXT(funcctx, result);
     } else {