(sampledata/pgtap) use of pgr_findCloseEdges depends on version

Author: cvvergara

doc/src/sampledata.rst

@@ -241,8 +241,8 @@ reached from both sides.
 The points of interest:
 
 .. literalinclude:: sampledata.queries
-   :start-after: -- p5
-   :end-before: -- p6
+   :start-after: -- p6
+   :end-before: -- p7
 
 .. pois_end
 

docqueries/src/sampledata.result

@@ -150,6 +150,10 @@ FROM edges ORDER BY id;
 
 /* -- q5 */
 /* --POINTS CREATE start */
+DO LANGUAGE plpgsql $BODY$
+DECLARE v FLOAT;
+BEGIN
+SELECT (parts[1]||'.'||parts[2])::FLOAT FROM STRING_TO_ARRAY(pgr_version(), '.') AS parts INTO v;
 /* -- p1 */
 CREATE TABLE pointsOfInterest(
     pid BIGSERIAL PRIMARY KEY,
@@ -160,7 +164,7 @@ CREATE TABLE pointsOfInterest(
     edge geometry,
     newPoint geometry,
     geom geometry);
-CREATE TABLE
+IF v > 3.4 THEN
 /* -- p2 */
 INSERT INTO pointsOfInterest (geom) VALUES
 (ST_Point(1.8, 0.4)),
@@ -169,7 +173,6 @@ INSERT INTO pointsOfInterest (geom) VALUES
 (ST_Point(0.3, 1.8)),
 (ST_Point(2.9, 1.8)),
 (ST_Point(2.2, 1.7));
-INSERT 0 6
 /* -- p3 */
 UPDATE pointsofinterest SET
   edge_id = poi.edge_id,
@@ -183,11 +186,21 @@ FROM (
   FROM pgr_findCloseEdges(
     $$SELECT id, geom FROM edges$$,(SELECT array_agg(geom) FROM pointsOfInterest), 0.5) ) AS poi
 WHERE pointsOfInterest.geom = poi.geom;
-UPDATE 6
 /* -- p4 */
 UPDATE pointsOfInterest SET side = 'b' WHERE pid = 6;
-UPDATE 1
 /* -- p5 */
+ELSE
+INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES
+(1, 'l' , 0.4, ST_POINT(1.8, 0.4)),
+(15, 'r' , 0.4, ST_POINT(4.2, 2.4)),
+(12, 'l' , 0.6, ST_POINT(2.6, 3.2)),
+(6, 'r' , 0.3, ST_POINT(0.3, 1.8)),
+(5, 'l' , 0.8, ST_POINT(2.9, 1.8)),
+(4, 'b' , 0.7, ST_POINT(2.2, 1.7));
+END IF;
+END;
+$BODY$;
+DO
 SELECT
   pid, ST_AsText(geom) geom,
   edge_id, fraction AS frac, side, distance AS dist,

docqueries/src/test.conf

@@ -4,9 +4,6 @@
     'any' => {
         'files' => [qw(
             sampledata.pg
-            withPoints-category.pg
-            migration.pg
-            concepts.pg
             )],
     },
 );

sql/scripts/build-extension-update-files.pl

@@ -271,7 +271,7 @@ sub generate_upgrade_script {
         }
 
         # updating to 3.7+
-        if ($old_mayor == 3 && $old_minor < 8) {
+        if ($old_mayor == 3 && $old_minor >= 4 && $old_minor < 8) {
             push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry,double precision,integer,boolean,boolean)");
             push @commands, drop_special_case_function("pgr_findcloseedges(text,geometry[],double precision,integer,boolean,boolean)");
         }

tools/testers/sampledata.sql

@@ -87,6 +87,10 @@ FROM edges ORDER BY id;
 
 /* --POINTS CREATE start */
 
+DO LANGUAGE plpgsql $BODY$
+DECLARE v FLOAT;
+BEGIN
+SELECT (parts[1]||'.'||parts[2])::FLOAT FROM STRING_TO_ARRAY(pgr_version(), '.') AS parts INTO v;
 /* -- p1 */
 CREATE TABLE pointsOfInterest(
     pid BIGSERIAL PRIMARY KEY,
@@ -97,6 +101,7 @@ CREATE TABLE pointsOfInterest(
     edge geometry,
     newPoint geometry,
     geom geometry);
+IF v > 3.4 THEN
 /* -- p2 */
 INSERT INTO pointsOfInterest (geom) VALUES
 (ST_Point(1.8, 0.4)),
@@ -121,12 +126,24 @@ WHERE pointsOfInterest.geom = poi.geom;
 /* -- p4 */
 UPDATE pointsOfInterest SET side = 'b' WHERE pid = 6;
 /* -- p5 */
+ELSE
+INSERT INTO pointsOfInterest (edge_id, side, fraction, geom) VALUES
+(1, 'l' , 0.4, ST_POINT(1.8, 0.4)),
+(15, 'r' , 0.4, ST_POINT(4.2, 2.4)),
+(12, 'l' , 0.6, ST_POINT(2.6, 3.2)),
+(6, 'r' , 0.3, ST_POINT(0.3, 1.8)),
+(5, 'l' , 0.8, ST_POINT(2.9, 1.8)),
+(4, 'b' , 0.7, ST_POINT(2.2, 1.7));
+END IF;
+END;
+$BODY$;
+/* -- p6 */
 SELECT
   pid, ST_AsText(geom) geom,
   edge_id, fraction AS frac, side, distance AS dist,
   ST_AsText(edge) edge, ST_AsText(newPoint) newPoint
 FROM pointsOfInterest;
-/* -- p6 */
+/* -- p7 */
 /* --POINTS CREATE end */
 
 /* --COMBINATIONS CREATE start */