[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.6-17-g6ec1e6caf
git at osgeo.org
git at osgeo.org
Fri Aug 12 12:03:40 PDT 2022
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, stable-3.1 has been updated
via 6ec1e6cafcd53df5890fef65dc776ccd02313181 (commit)
from 72f4159832dd9a6ac86fd3cb9f2f1c40b020fc3d (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 6ec1e6cafcd53df5890fef65dc776ccd02313181
Author: Sandro Santilli <strk at kbt.io>
Date: Tue May 4 18:13:22 2021 +0200
Move hard-coded upgrade data from run_test.pl to hook scripts
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a59fbabcb..bf2f9dd49 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -197,11 +197,9 @@ ifeq ($(HAVE_SFCGAL),yes)
include sfcgal/regress/tests.mk
endif
ifeq (@TOPOLOGY@,topology)
- override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
include topology/test/tests.mk
endif
ifeq (@RASTER@,raster)
- override RUNTESTFLAGS := $(RUNTESTFLAGS) --raster
include raster/test/regress/tests.mk
endif
diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index 5c0ea4854..91173802e 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -180,9 +180,8 @@ rtpostgis.sql: ../../rt_pg/rtpostgis.sql
$(PERL) -lpe "s'\\\$$libdir'$(REGRESS_INSTALLDIR)/lib'g" $< > $@
-override RUNTESTFLAGS := $(RUNTESTFLAGS) --raster
-
topsrcdir = $(realpath ../../../)
+srcdir = $(realpath .)
include tests.mk
include ../../../regress/runtest.mk
diff --git a/raster/test/regress/hooks/hook-after-upgrade-raster.sql b/raster/test/regress/hooks/hook-after-upgrade-raster.sql
new file mode 100644
index 000000000..49f51173b
--- /dev/null
+++ b/raster/test/regress/hooks/hook-after-upgrade-raster.sql
@@ -0,0 +1 @@
+DROP TABLE upgrade_test_raster;
diff --git a/raster/test/regress/hooks/hook-before-upgrade-raster.sql b/raster/test/regress/hooks/hook-before-upgrade-raster.sql
new file mode 100644
index 000000000..8c000dbaf
--- /dev/null
+++ b/raster/test/regress/hooks/hook-before-upgrade-raster.sql
@@ -0,0 +1,16 @@
+CREATE TABLE upgrade_test_raster(r raster);
+INSERT INTO upgrade_test_raster(r) VALUES
+(
+ ST_AddBand(
+ ST_MakeEmptyRaster(
+ 10, 10, 1, 1, 2, 2, 0, 0,4326
+ ),
+ 1,
+ '8BSI'::text,
+ -129,
+ NULL
+ )
+);
+
+--SET client_min_messages TO ERROR;
+SELECT AddRasterConstraints('upgrade_test_raster', 'r');
diff --git a/raster/test/regress/tests.mk b/raster/test/regress/tests.mk
index 39fb5297d..755acbb53 100644
--- a/raster/test/regress/tests.mk
+++ b/raster/test/regress/tests.mk
@@ -10,6 +10,12 @@
# *
# **********************************************************************
+override RUNTESTFLAGS := $(RUNTESTFLAGS) --raster
+
+RUNTESTFLAGS_INTERNAL += \
+ --before-upgrade-script $(topsrcdir)/raster/test/regress/hooks/hook-before-upgrade-raster.sql \
+ --after-upgrade-script $(topsrcdir)/raster/test/regress/hooks/hook-after-upgrade-raster.sql
+
RASTER_TEST_FIRST = \
check_gdal \
load_outdb
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index 1b32ec3d7..acdfeccde 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -20,6 +20,10 @@ INTERRUPTTESTS=@INTERRUPTTESTS@
current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+RUNTESTFLAGS_INTERNAL += \
+ --before-upgrade-script $(topsrcdir)/regress/hooks/hook-before-upgrade.sql \
+ --after-upgrade-script $(topsrcdir)/regress/hooks/hook-after-upgrade.sql
+
TESTS += \
$(topsrcdir)/regress/core/affine \
$(topsrcdir)/regress/core/bestsrid \
diff --git a/regress/hooks/hook-after-upgrade.sql b/regress/hooks/hook-after-upgrade.sql
new file mode 100644
index 000000000..459f80249
--- /dev/null
+++ b/regress/hooks/hook-after-upgrade.sql
@@ -0,0 +1,2 @@
+DROP VIEW IF EXISTS upgrade_view_test;
+DROP TABLE upgrade_test;
diff --git a/regress/hooks/hook-before-upgrade.sql b/regress/hooks/hook-before-upgrade.sql
new file mode 100644
index 000000000..d4bcb8cd6
--- /dev/null
+++ b/regress/hooks/hook-before-upgrade.sql
@@ -0,0 +1,26 @@
+CREATE TABLE upgrade_test(g1 geometry, g2 geography);
+INSERT INTO upgrade_test(g1,g2) VALUES
+('POINT(0 0)', 'LINESTRING(0 0, 1 1)'),
+('POINT(1 0)', 'LINESTRING(0 1, 1 1)');
+
+-- We know upgrading with an st_union() based view
+-- fails unless you're on PostgreSQL 12, so we don't
+-- even try that.
+--
+-- We could re-enable this test IF we fix the upgrade
+-- in pre-12 versions. Refer to
+-- https://trac.osgeo.org/postgis/ticket/4386
+--
+DO $BODY$
+DECLARE
+ vernum INT;
+BEGIN
+ show server_version_num INTO vernum;
+ IF vernum >= 120000
+ THEN
+ RAISE DEBUG '12+ server (%)', vernum;
+ CREATE VIEW upgrade_view_test AS
+ SELECT ST_Union(g1) FROM upgrade_test;
+ END IF;
+END;
+$BODY$ LANGUAGE 'plpgsql';
diff --git a/regress/runtest.mk b/regress/runtest.mk
index cd4cf261c..5df1a3968 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -4,17 +4,22 @@ abssrcdir := $(realpath .)
TESTS := $(patsubst $(topsrcdir)/%,$(abstopsrcdir)/%,$(TESTS))
TESTS := $(patsubst $(abssrcdir)/%,./%,$(TESTS))
-
check-regress:
- @$(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(TESTS)
+ @echo "RUNTESTFLAGS: $(RUNTESTFLAGS)"
+ @echo "RUNTESTFLAGS_INTERNAL: $(RUNTESTFLAGS_INTERNAL)"
+
+ @$(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
#
# Will now run upgrade test if RUNTESTFLAGS was not already doing that
#
@if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
- $(PERL) $(topsrcdir)/regress/run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS); \
+ $(PERL) $(topsrcdir)/regress/run_test.pl \
+ --upgrade \
+ $(RUNTESTFLAGS) \
+ $(TESTS); \
fi
check-long:
diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index cef910834..865151479 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -40,9 +40,8 @@ check-regress: check-regress-deps
check-regress-deps: topo_predicates.sql load_topology.sql load_topology-4326.sql
-override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
-
topsrcdir = $(realpath ../../)
+srcdir = $(realpath .)
include tests.mk
include ../../regress/runtest.mk
diff --git a/topology/test/regress/hooks/hook-after-upgrade-topology.sql b/topology/test/regress/hooks/hook-after-upgrade-topology.sql
new file mode 100644
index 000000000..c7e2e9ce8
--- /dev/null
+++ b/topology/test/regress/hooks/hook-after-upgrade-topology.sql
@@ -0,0 +1,2 @@
+SELECT topology.DropTopology('upgrade_test');
+
diff --git a/topology/test/regress/hooks/hook-before-upgrade-topology.sql b/topology/test/regress/hooks/hook-before-upgrade-topology.sql
new file mode 100644
index 000000000..9c5529f7e
--- /dev/null
+++ b/topology/test/regress/hooks/hook-before-upgrade-topology.sql
@@ -0,0 +1,2 @@
+SELECT topology.createTopology('upgrade_test');
+
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index eb8b4b598..c66c313f7 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -10,6 +10,12 @@
# *
# **********************************************************************
+override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
+
+RUNTESTFLAGS_INTERNAL += \
+ --before-upgrade-script $(topsrcdir)/topology/test/regress/hooks/hook-before-upgrade-topology.sql \
+ --after-upgrade-script $(topsrcdir)/topology/test/regress/hooks/hook-after-upgrade-topology.sql
+
TESTS += \
$(topsrcdir)/topology/test/regress/addedge.sql \
$(topsrcdir)/topology/test/regress/addface2.5d.sql \
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile.in | 2 --
raster/test/regress/Makefile.in | 3 +--
.../regress/hooks/hook-after-upgrade-raster.sql | 1 +
.../regress/hooks/hook-before-upgrade-raster.sql | 16 +++++++++++++
raster/test/regress/tests.mk | 6 +++++
regress/core/tests.mk.in | 4 ++++
regress/hooks/hook-after-upgrade.sql | 2 ++
regress/hooks/hook-before-upgrade.sql | 26 ++++++++++++++++++++++
regress/runtest.mk | 11 ++++++---
topology/test/Makefile.in | 3 +--
.../regress/hooks/hook-after-upgrade-topology.sql | 2 ++
.../regress/hooks/hook-before-upgrade-topology.sql | 2 ++
topology/test/tests.mk | 6 +++++
13 files changed, 75 insertions(+), 9 deletions(-)
create mode 100644 raster/test/regress/hooks/hook-after-upgrade-raster.sql
create mode 100644 raster/test/regress/hooks/hook-before-upgrade-raster.sql
create mode 100644 regress/hooks/hook-after-upgrade.sql
create mode 100644 regress/hooks/hook-before-upgrade.sql
create mode 100644 topology/test/regress/hooks/hook-after-upgrade-topology.sql
create mode 100644 topology/test/regress/hooks/hook-before-upgrade-topology.sql
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list