Merge pull request #1193 from iboates/master

fixed pgr_pointsAsPolygon breaking when comparing strings in WHERE clause
pgRouting · Mar 29, 2019 · 72c1e3d · 72c1e3d
2 parents 2489391 + 011e4a2
commit 72c1e3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pgtap/common/hasnt_v2_signatures.sql b/pgtap/common/hasnt_v2_signatures.sql
@@ -30,7 +30,7 @@ SELECT hasnt_function('pgr_ksp',ARRAY['text', 'integer', 'integer', 'integer', '
 SELECT hasnt_function('pgr_drivingdistance',ARRAY['text', 'integer', 'double precision', 'boolean', 'boolean']);
 SELECT hasnt_function('pgr_bdastar',ARRAY['text', 'integer', 'integer', 'boolean', 'boolean']);
 SELECT hasnt_function('pgr_bddijkstra',ARRAY['text', 'integer', 'integer', 'boolean', 'boolean']);
-SELECT hasnt_function('pgr_tsp',ARRAY['(double precision[]', 'integer', 'integer']);
+SELECT hasnt_function('pgr_tsp',ARRAY['double precision[]', 'integer', 'integer']);
 
 -- deprecated functions
 SELECT hasnt_function('pgr_kdijkstracost');

diff --git a/sql/alpha_shape/alpha_shape.sql b/sql/alpha_shape/alpha_shape.sql
@@ -59,7 +59,7 @@ CREATE OR REPLACE FUNCTION pgr_pointsAsPolygon(query varchar, alpha float8 DEFAU
 		geoms := array[]::geometry[];
 		i := 1;
 
-		FOR vertex_result IN EXECUTE 'SELECT x, y FROM pgr_alphashape('''|| query || ''', ' || alpha || ')'
+		FOR vertex_result IN EXECUTE 'SELECT x, y FROM pgr_alphashape('''|| REPLACE(query, E'\'', E'\'\'') || ''', ' || alpha || ')'
 		LOOP
 			x[i] = vertex_result.x;
 			y[i] = vertex_result.y;