[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. e14749cbc2339e643d5aa7d801c31d2e85a60bae

[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-2.5 has been updated
       via  e14749cbc2339e643d5aa7d801c31d2e85a60bae (commit)
      from  3158f39e5bf75798b4e68fce855e7c669bb10c5f (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 e14749cbc2339e643d5aa7d801c31d2e85a60bae
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Dec 18 10:46:56 2019 +0100

    Fix postgis_restore.pl for use with PostgreSQL 12
    
    Retains compatibilty with PostgreSQL 9.4 onward
    (PostgreSQL 9.3 would break)
    
    See https://www.postgresql.org/docs/VERSION/app-pgrestore.html
    
    Patch by Matti Linnanvuori
    
    Closes #4605 in 2.5 branch

diff --git a/NEWS b/NEWS
index 1fd587a..d5f0d31 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ PostGIS 2.5.4
   - #4546, Fix PLPGSQL functions missing the schema qualification (Raúl Marín)
   - #4588, Fix update when st_union(geometry) doesn't exist (Raúl Marín)
   - #4599, ST_AddPoint: Accept -1 as a valid position (Raúl Marín)
+  - #4605, Fix postgis_upgrade.pl with PostgreSQL 12 (Matti Linnanvuori)
 
 
 PostGIS 2.5.3
diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index c3bc57c..f7fb551 100644
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -116,7 +116,7 @@ while(my $l = <DATA>) {
 if(!defined($POSTGIS_TOC)) {
   print STDERR "  Writing manifest of things to read from dump file...\n";
 
-  open( DUMP, "pg_restore -l $dumpfile |" ) || die "$me:\tCannot open dump file '$dumpfile'\n";
+  open( DUMP, "pg_restore -f - -l $dumpfile |" ) || die "$me:\tCannot open dump file '$dumpfile'\n";
 } else {
   open( DUMP, '<' . $POSTGIS_TOC) || die "$me:\tCannot open TOC file '$POSTGIS_TOC'\n";
 }
@@ -143,7 +143,7 @@ close(DUMP) || die "$me: pg_restore returned an error\n";
 # unwanted bits.
 #
 print STDERR "  Writing ASCII to stdout...\n";
-open( INPUT, "pg_restore -L $manifest $dumpfile |") || die "$me:\tCan't run pg_restore\n";
+open( INPUT, "pg_restore -L $manifest $dumpfile -f - |") || die "$me:\tCan't run pg_restore\n";
 
 if ( defined $POSTGIS_SCHEMA ) {
   print STDOUT "SET search_path = \"" . $POSTGIS_SCHEMA . "\";\n";

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

Summary of changes:
 NEWS                        | 1 +
 utils/postgis_restore.pl.in | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS