Fix scan type detection function to work with nested nodes

git-svn-id: http://svn.osgeo.org/postgis/trunk@13277 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/regress/regress_index.sql b/regress/regress_index.sql
index 0b27132d6827a47038016117e31873f10e85bac1..582cca543f5178081f5ad06691162b8b77b77005 100644 (file)
--- a/regress/regress_index.sql
+++ b/regress/regress_index.sql
@@ -3,14 +3,25 @@
 
 --- test some of the searching capabilities
 
-CREATE FUNCTION qnodes(q text) RETURNS text
+CREATE OR REPLACE FUNCTION qnodes(q text) RETURNS text
 LANGUAGE 'plpgsql' AS
 $$
 DECLARE
   exp TEXT;
+  mat TEXT[];
+  ret TEXT[];
 BEGIN
-  EXECUTE 'EXPLAIN ' || q INTO exp;
-  RETURN (regexp_matches(exp, ' *(.*Scan)'))[1];
+  FOR exp IN EXECUTE 'EXPLAIN ' || q
+  LOOP
+    --RAISE NOTICE 'EXP: %', exp;
+    mat := regexp_matches(exp, ' *(?:-> *)?(.*Scan)');
+    --RAISE NOTICE 'MAT: %', mat;
+    IF mat IS NOT NULL THEN
+      ret := array_append(ret, mat[1]);
+    END IF;
+    --RAISE NOTICE 'RET: %', ret;
+  END LOOP;
+  RETURN array_to_string(ret,',');
 END;
 $$;