[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-736-gaa3f0ceeb

git at osgeo.org git at osgeo.org
Fri Apr 21 12:36:37 PDT 2023


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  aa3f0ceeb0ad00f46d37656fa6931bfdd785a609 (commit)
      from  8d074fc3a2c7ab2f4677f71629a38a5cc13358ba (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 aa3f0ceeb0ad00f46d37656fa6931bfdd785a609
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Apr 21 21:35:56 2023 +0200

    Force C locale and libc provider in regress test db with PG15+
    
    This is probably a workaround to a bug in PostgreSQL 16, but it
    feels like the smallest change to fix #5375

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 543eb7d64..3f143f225 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -285,6 +285,10 @@ psql -tAc "
 " template1
 `));
 
+my $pgvernum = `
+psql -tAc "SELECT current_setting('server_version_num')" template1
+`;
+
 my $defextver = `
 psql -XtAc "
 	SELECT default_version
@@ -323,7 +327,6 @@ else
 	}
 }
 
-my $pgvernum = sql("SELECT current_setting('server_version_num')");
 my $libver = sql("select postgis_lib_version()");
 
 if ( ! $libver )
@@ -1441,7 +1444,11 @@ sub count_postgis_objects
 ##################################################################
 sub create_db
 {
-	my $createcmd = "createdb --encoding=UTF-8 --template=template0 --lc-collate=C $DB > $REGRESS_LOG";
+	my $createcmd = "createdb --encoding=UTF-8 --template=template0 --lc-collate=C";
+	if ( $pgvernum ge 150000 ) {
+		$createcmd .= " --locale=C --locale-provider=libc"
+	}
+	$createcmd .= " $DB > $REGRESS_LOG";
 	return not system($createcmd);
 }
 

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

Summary of changes:
 regress/run_test.pl | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list