[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-710-g9f249630e

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  9f249630ecf9723b043ec76d151b3b24464ffb1b (commit)
      from  ccc2a38d0d9726818953c63017bf3b59303019c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f249630ecf9723b043ec76d151b3b24464ffb1b
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Apr 11 17:07:37 2022 +0200

    Have installcheck (or RUNTESTFLAGS=--extension) also load tiger
    
    Make typmod test survive presence of tiger extension

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 76edf3f87..5ecc286ab 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -202,6 +202,7 @@ topsrcdir = $(top_srcdir)
 include $(top_builddir)/regress/core/tests.mk
 include $(top_srcdir)/regress/loader/tests.mk
 include $(top_srcdir)/regress/dumper/tests.mk
+include $(top_srcdir)/extensions/postgis_tiger_geocoder/tests.mk
 ifeq ($(HAVE_SFCGAL),yes)
 	override RUNTESTFLAGS := $(RUNTESTFLAGS) --sfcgal
 	include $(top_srcdir)/sfcgal/regress/tests.mk
diff --git a/extensions/postgis_tiger_geocoder/tests.mk b/extensions/postgis_tiger_geocoder/tests.mk
new file mode 100644
index 000000000..5991bca7c
--- /dev/null
+++ b/extensions/postgis_tiger_geocoder/tests.mk
@@ -0,0 +1,6 @@
+# TODO: always pass --tiger when run_test.pl supports it non-extension based
+# TODO: run actual tests
+
+ifeq (,$(findstring --extension,$(RUNTESTFLAGS)))
+  override RUNTESTFLAGS := $(RUNTESTFLAGS) --tiger
+endif
diff --git a/regress/core/typmod.sql b/regress/core/typmod.sql
index 5fcec8faa..108e772d6 100644
--- a/regress/core/typmod.sql
+++ b/regress/core/typmod.sql
@@ -216,7 +216,9 @@ CREATE TABLE tm.trianglezm4326 (id serial, g geometry(trianglezm, 4326) );
 SELECT 'g',
  f_table_name, f_geometry_column,
  coord_dimension, srid, type
-from geometry_columns ORDER BY f_table_name;
+from geometry_columns
+where f_table_schema != 'tiger'
+ORDER BY f_table_name;
 
 SELECT 'gg',
  f_table_name, f_geography_column,
@@ -224,6 +226,7 @@ SELECT 'gg',
 from geography_columns ORDER BY f_table_name;
 
 SELECT distinct 'catalog-schema', f_table_catalog = current_database(),f_table_schema FROM geometry_columns
+where f_table_schema != 'tiger'
 UNION
 SELECT distinct 'catalog-schema', f_table_catalog = current_database(),f_table_schema FROM geography_columns
 ;
@@ -288,8 +291,10 @@ BEGIN
 		EXECUTE sql;
 	END LOOP;
 
-	FOR rec IN SELECT * from geometry_columns
-		WHERE f_table_name != 'types' ORDER BY 3
+	FOR rec IN SELECT * FROM geometry_columns
+		WHERE f_table_name != 'types'
+		AND f_table_schema != 'tiger'
+		ORDER BY 3
 	LOOP
 		out_where := rec.f_table_name;
 

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile.in                             |  1 +
 extensions/postgis_tiger_geocoder/tests.mk |  6 ++++++
 regress/core/typmod.sql                    | 11 ++++++++---
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 extensions/postgis_tiger_geocoder/tests.mk


hooks/post-receive
-- 
PostGIS