fixing conflicts

Author: cvvergara

docqueries/topologicalSort/doc-topologicalSort.result

@@ -24,9 +24,9 @@ INSERT INTO edge_table1 (source,target,cost,reverse_cost) VALUES (3,2,1,-1);
 INSERT 0 1
 -- q1
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table1\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table1'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |        0
    2 |        1
@@ -36,47 +36,47 @@ SELECT * FROM pgr_topologicalsort(
 
 -- q2
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=2\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=2'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |        3
    2 |        2
 (2 rows)
 
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=3\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=3'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |        4
    2 |        3
 (2 rows)
 
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=2 or id=3\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=2 or id=3'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |        4
    2 |        3
    3 |        2
 (3 rows)
 
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=11\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table where id=11'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |        6
    2 |       11
 (2 rows)
 
 -- q3
 SELECT * FROM pgr_topologicalsort(
-  \'SELECT id,source,target,cost,reverse_cost FROM edge_table where cost=-1 or reverse_cost=-1\'
+  'SELECT id,source,target,cost,reverse_cost FROM edge_table where cost=-1 or reverse_cost=-1'
 );
- seq | sorted_v 
+ seq | sorted_v
 -----+----------
    1 |       10
    2 |        4
@@ -89,4 +89,4 @@ SELECT * FROM pgr_topologicalsort(
 
 -- q4
 ROLLBACK;
-ROLLBACK
+ROLLBACK

docqueries/version/doc-full_version.result

@@ -6,7 +6,7 @@ SET
 SELECT * FROM pgr_full_version();
   version  | build_type | compile_date |    library    |         system          |    postgresql     | compiler  | boost  |   hash
 -----------+------------+--------------+---------------+-------------------------+-------------------+-----------+--------+-----------
- 3.0.0-dev | Debug      | 2019/07/24   | pgrouting-3.0 | Linux-4.15.0-54-generic | PostgreSQL 9.5.16 | GNU-8.3.0 | 1.65.1 | ec66aef5a
+ 3.0.0-dev | Debug      | 2019/09/05   | pgrouting-3.0 | Linux-4.15.0-60-generic | PostgreSQL 9.5.19 | GNU-8.3.0 | 1.65.1 | d93c618ae
 (1 row)
 
 -- q2