[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-24-gff6855b

[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  ff6855bb4f8894db2e713a6f4ca0ff5213aa3db4 (commit)
      from  a4e8d02e24e7fef16b54b334addabc25bb3a2cf9 (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 ff6855bb4f8894db2e713a6f4ca0ff5213aa3db4
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Mar 2 14:23:17 2020 -0800

    re-enable aggregate/view upgrade test, for better or worse, closes #4386

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 16a1290..c3412e3 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -312,14 +312,15 @@ sub create_upgrade_test_objects
     exit(1);
   }
 
-  # 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);
-  # }
+
+  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 ( $OPT_WITH_RASTER )
   {
@@ -357,12 +358,12 @@ sub drop_upgrade_test_objects
 {
   # TODO: allow passing the "upgrade-cleanup" script via commandline
 
-  # my $ret = sql("drop view upgrade_view_test;");
-  # unless ( $ret =~ /^DROP/ ) {
-  #   `dropdb $DB`;
-  #   print "\nSomething went wrong dropping spatial view: $ret.\n";
-  #   exit(1);
-  # }
+  my $ret = sql("drop view upgrade_view_test;");
+  unless ( $ret =~ /^DROP/ ) {
+    `dropdb $DB`;
+    print "\nSomething went wrong dropping spatial view: $ret.\n";
+    exit(1);
+  }
 
   my $ret = sql("drop table upgrade_test;");
   unless ( $ret =~ /^DROP/ ) {
diff --git a/topology/test/load_topology.sql.in b/topology/test/load_topology.sql.in
index d47d8a5..0537020 100644
--- a/topology/test/load_topology.sql.in
+++ b/topology/test/load_topology.sql.in
@@ -22,7 +22,7 @@ BEGIN;
 -- NOTE:
 --  Returns topology id... which depend on how many
 --  topologies where created in the regress database
---  so we just check it's a number greater than 0
+--  so we just check it is a number greater than 0
 --
 SELECT topology.CreateTopology('city_data', @SRID@) > 0;
 

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

Summary of changes:
 regress/run_test.pl                | 29 +++++++++++++++--------------
 topology/test/load_topology.sql.in |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
PostGIS