[postgis-tickets] [SCM] PostGIS branch stable-3.3 updated. 3.3.2-46-g4bdf7c2af

git at osgeo.org git at osgeo.org
Fri Apr 21 13:16:47 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, stable-3.3 has been updated
       via  4bdf7c2af7d3ebd2f85c8bb8dccc8960da7afed3 (commit)
      from  b0f44ce1eaed0d1d5862b0419a8eee31ff2f863a (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 4bdf7c2af7d3ebd2f85c8bb8dccc8960da7afed3
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 e31f7556d..0ec5b2db0 100755
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -236,6 +236,10 @@ psql -tAc "
 " template1
 `));
 
+my $pgvernum = `
+psql -tAc "SELECT current_setting('server_version_num')" template1
+`;
+
 my $defextver = `
 psql -XtAc "
 	SELECT default_version
@@ -273,7 +277,6 @@ else
 	}
 }
 
-my $pgvernum = sql("SELECT current_setting('server_version_num')");
 my $libver = sql("select postgis_lib_version()");
 
 if ( ! $libver )
@@ -1337,7 +1340,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 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