[SCM] PostGIS branch master updated. 3.4.0rc1-879-g841713668
git at osgeo.org
git at osgeo.org
Thu Jan 11 07:22:58 PST 2024
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 84171366808536a4662976e50af91321147a06f2 (commit)
via 809efdc2d9a75749dcea9c54c79965015a6e2ecd (commit)
from 60795830a15c9c0907f58ed20a21422fbc10eae2 (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 84171366808536a4662976e50af91321147a06f2
Author: Sandro Santilli <strk at kbt.io>
Date: Fri Jan 5 00:52:21 2024 +0100
woodie: run all tests with standard_conforming_strings off
Other bots will run the tests without forcing standard_configrming_strings
See https://trac.osgeo.org/osgeo/ticket/3081#comment:4
diff --git a/.woodpecker/regress.yml b/.woodpecker/regress.yml
index 642b5bb7a..6064250e8 100644
--- a/.woodpecker/regress.yml
+++ b/.woodpecker/regress.yml
@@ -4,7 +4,9 @@ variables:
- export PATH=/usr/lib/postgresql/$${PGVER}/bin:$${PATH}
- export PGPORT=$$(grep ^port /etc/postgresql/$${PGVER}/main/postgresql.conf | awk '{print $$3}')
- export POSTGIS_REGRESS_DB_OWNER=postgis_reg_unprivileged_user
- - export RUNTESTFLAGS="-v --after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql"
+ - export RUNTESTFLAGS="-v
+ --after-create-db-script $${CI_WORKSPACE}/regress/hooks/configure-pgextwlist.sql
+ --after-create-db-script $${CI_WORKSPACE}/regress/hooks/standard-conforming-strings-off.sql"
- export SRCDIR=$${CI_WORKSPACE}
- export BUILDDIR=$${SRCDIR}/build/pg$${PGVER}
- export CURRENTVERSION=$$(grep '^POSTGIS_' $${SRCDIR}/Version.config | cut -d= -f2 | paste -sd '.')
@@ -39,10 +41,6 @@ variables:
- wait # for tee process to flush its buffers
- echo "-- Summary of upgrade tests --"
- egrep '(PASS|FAIL|SKIP|INFO|ERROR)' check.log
- - echo "-- Upgrade tests with standard_conforming_strings off --"
- - RUNTESTFLAGS="$${RUNTESTFLAGS} --after-create-db-script $${SRCDIR}/regress/hooks/standard-conforming-strings-off.sql"
- MAKE_ARGS='TESTS=$${SRCDIR}/regress/core/regress'
- $${SRCDIR}/utils/check_all_upgrades.sh -s :auto!
clone:
clone:
commit 809efdc2d9a75749dcea9c54c79965015a6e2ecd
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Jan 11 09:06:11 2024 +0100
Use escaped string or set standard_conforming_strings=on
References #5633
diff --git a/postgis/postgis_letters.sql b/postgis/postgis_letters.sql
index 5d924c003..24c0c94fb 100644
--- a/postgis/postgis_letters.sql
+++ b/postgis/postgis_letters.sql
@@ -146,4 +146,5 @@ BEGIN
END;
$$
LANGUAGE 'plpgsql'
+SET standard_conforming_strings = ON
IMMUTABLE _COST_MEDIUM PARALLEL SAFE;
diff --git a/raster/rt_pg/rtpostgis.sql.in b/raster/rt_pg/rtpostgis.sql.in
index 0d00ab36b..d0cb1e952 100644
--- a/raster/rt_pg/rtpostgis.sql.in
+++ b/raster/rt_pg/rtpostgis.sql.in
@@ -6851,7 +6851,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_srid(rastschema name, rasttab
SELECT
regexp_replace(
split_part(s.consrc, ' = ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
)::integer
FROM pg_class c, pg_namespace n, pg_attribute a
, (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
@@ -6925,7 +6925,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_scale(rastschema name, rastta
),
'round(', ''
),
- '[ ''''\(\)]', '', 'g'
+ E'[ ''''\\(\\)]', '', 'g'
)::text AS val
FROM pg_class c, pg_namespace n, pg_attribute a
, (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
@@ -7014,7 +7014,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_blocksize(rastschema name, ra
ELSE
regexp_replace(
split_part(s.consrc, '= ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
)::integer
END
FROM pg_class c, pg_namespace n, pg_attribute a
@@ -7415,7 +7415,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_num_bands(rastschema name, ra
SELECT
regexp_replace(
split_part(s.consrc, ' = ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
)::integer
FROM pg_class c, pg_namespace n, pg_attribute a
, (SELECT connamespace, conrelid, conkey, pg_get_constraintdef(oid) As consrc
@@ -7484,7 +7484,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_pixel_types(rastschema name,
both '''' from split_part(
regexp_replace(
split_part(s.consrc, ' = ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
),
'::', 1
)
@@ -7571,7 +7571,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_nodata_values(rastschema name
split_part(
regexp_replace(
split_part(s.consrc, ' = ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
),
'::', 1
)
@@ -7664,7 +7664,7 @@ CREATE OR REPLACE FUNCTION _raster_constraint_info_out_db(rastschema name, rastt
both '''' from split_part(
regexp_replace(
split_part(s.consrc, ' = ', 2),
- '[\(\)]', '', 'g'
+ E'[\\(\\)]', '', 'g'
),
'::', 1
)
diff --git a/sfcgal/regress/regress_sfcgal.sql b/sfcgal/regress/regress_sfcgal.sql
index 99141b887..17d6145a0 100644
--- a/sfcgal/regress/regress_sfcgal.sql
+++ b/sfcgal/regress/regress_sfcgal.sql
@@ -20,8 +20,8 @@ ELSE
regexp_replace(
regexp_replace(
ST_AsText(ST_Extrude(ST_Extrude(ST_Extrude('POINT(0 0)', 1, 0, 0), 0, 1, 0), 0, 0, 1)) ,
- '\(\(0 1 0,1 1 0,1 0 0,0 1 0\)\)', '((1 1 0,1 0 0,0 1 0,1 1 0))'),
- '\(\(0 1 0,1 0 0,0 0 0,0 1 0\)\)', '((1 0 0,0 0 0,0 1 0,1 0 0))')
+ E'\\(\\(0 1 0,1 1 0,1 0 0,0 1 0\\)\\)', '((1 1 0,1 0 0,0 1 0,1 1 0))'),
+ E'\\(\\(0 1 0,1 0 0,0 0 0,0 1 0\\)\\)', '((1 0 0,0 0 0,0 1 0,1 0 0))')
END;
SELECT 'ST_ForceLHR', ST_AsText(ST_ForceLHR('POLYGON((0 0,0 1,1 1,1 0,0 0))'));
-----------------------------------------------------------------------
Summary of changes:
.woodpecker/regress.yml | 8 +++-----
postgis/postgis_letters.sql | 1 +
raster/rt_pg/rtpostgis.sql.in | 14 +++++++-------
sfcgal/regress/regress_sfcgal.sql | 4 ++--
4 files changed, 13 insertions(+), 14 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list