[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.6-19-g23f145901

[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, stable-3.1 has been updated
       via  23f1459010c4271fe74a18720116ffd9c0a4617e (commit)
      from  6be61f557ae24392ed9db5943f8a71264bd5e80e (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 23f1459010c4271fe74a18720116ffd9c0a4617e
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 21:40:51 2022 +0200

    run_test: don't try to handle raster split when coming from unpackaged
    
    References #5213 in 3.1 branch (3.1.7dev)

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 192286b2f..fcd350741 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1664,41 +1664,28 @@ sub upgrade_spatial_extensions
       die;
     }
 
-    # Handle raster split if coming from pre-split and going
-    # to splitted raster
-    if ( $OPT_UPGRADE_FROM && has_split_raster_ext($OPT_UPGRADE_TO) &&
+    # Handle raster split if coming from pre-split extension
+    # and going to splitted raster
+    if ( $OPT_UPGRADE_FROM &&
+         ! $OPT_UPGRADE_FROM =~ /^unpackaged/ &&
+         has_split_raster_ext($OPT_UPGRADE_TO) &&
          ! has_split_raster_ext($OPT_UPGRADE_FROM) )
     {
-      if ( $OPT_WITH_RASTER )
-      {
-        # upgrade of postgis must have unpackaged raster, so
-        # we create it again here
-				my $sql = package_extension_sql('postgis_raster', ${nextver});
+      # upgrade of postgis must have unpackaged raster, so
+      # we create it again here
+      my $sql = package_extension_sql('postgis_raster', ${nextver});
 
-        print "Upgrading PostGIS Raster in '${DB}' using: ${sql}\n" ;
+      print "Packaging PostGIS Raster in '${DB}' using: ${sql}\n" ;
 
-        my $cmd = "psql $psql_opts -c \"" . $sql . "\" $DB >> $REGRESS_LOG 2>&1";
-        my $rv = system($cmd);
-        if ( $rv ) {
-          fail "Error encountered creating EXTENSION POSTGIS_RASTER from unpackaged on upgrade", $REGRESS_LOG;
-          die;
-        }
+      my $cmd = "psql $psql_opts -c \"" . $sql . "\" $DB >> $REGRESS_LOG 2>&1";
+      my $rv = system($cmd);
+      if ( $rv ) {
+        fail "Error encountered creating EXTENSION POSTGIS_RASTER from unpackaged on upgrade", $REGRESS_LOG;
+        die;
       }
-      else
-      {
-        # Raster support was not requested, so drop it if
-        # left unpackaged
-        print "Packaging PostGIS Raster in '${DB}' for later drop using: ${sql}\n" ;
-
-				$sql = package_extension_sql('postgis_raster', ${nextver});
-
-        $cmd = "psql $psql_opts -c \"" . $sql . "\" $DB >> $REGRESS_LOG 2>&1";
-        $rv = system($cmd);
-        if ( $rv ) {
-          fail "Error encountered creating EXTENSION POSTGIS_RASTER from unpackaged on upgrade", $REGRESS_LOG;
-          die;
-        }
 
+      if ( ! $OPT_WITH_RASTER )
+      {
         print "Dropping PostGIS Raster in '${DB}' using: ${sql}\n" ;
 
         $sql = "DROP EXTENSION postgis_raster";

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

Summary of changes:
 regress/run_test.pl | 45 ++++++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
PostGIS