[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-46-g93bb425

[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  93bb425c61fbfcef9d830a10b61aa74305114efc (commit)
      from  079e807123b8086f05416bba82305151df8a0ff0 (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 93bb425c61fbfcef9d830a10b61aa74305114efc
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Mar 23 22:04:37 2020 +0100

    Do not test upgrades with of postgis backed views on PG<12
    
    See #4386

diff --git a/regress/run_test.pl b/regress/run_test.pl
index c3412e3..dd7cdb0 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -244,6 +244,7 @@ else
 	}
 }
 
+my $pgvernum = sql("SELECT current_setting('server_version_num')");
 my $libver = sql("select postgis_lib_version()");
 my $defextver = sql("select default_version from pg_available_extensions where name = 'postgis'");
 
@@ -313,13 +314,23 @@ sub create_upgrade_test_objects
   }
 
 
-  my $query = "create view upgrade_view_test as ";
-  $query .= "select st_union(g1) from upgrade_test;";
-  my $ret = sql($query);
-  unless ( $ret =~ /^CREATE/ ) {
-    `dropdb $DB`;
-    print "\nSomething went wrong creating upgrade_view_test view: $ret.\n";
-    exit(1);
+  if ( $pgvernum >= 120000 ) {
+    # 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
+    #
+    $query = "create view upgrade_view_test as ";
+    $query .= "select st_union(g1) from upgrade_test;";
+    my $ret = sql($query);
+    unless ( $ret =~ /^CREATE/ ) {
+      `dropdb $DB`;
+      print "\nSomething went wrong creating upgrade_view_test view: $ret.\n";
+      exit(1);
+    }
   }
 
   if ( $OPT_WITH_RASTER )
@@ -358,7 +369,7 @@ sub drop_upgrade_test_objects
 {
   # TODO: allow passing the "upgrade-cleanup" script via commandline
 
-  my $ret = sql("drop view upgrade_view_test;");
+  my $ret = sql("drop view if exists upgrade_view_test;");
   unless ( $ret =~ /^DROP/ ) {
     `dropdb $DB`;
     print "\nSomething went wrong dropping spatial view: $ret.\n";

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

Summary of changes:
 regress/run_test.pl | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS