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 b5bf441e96ee86b958fcc3b3d0f265c6b7dd69fb (commit)
from d52fc5c03904a34df6f8695d4e9d674e5d443aab (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 b5bf441e96ee86b958fcc3b3d0f265c6b7dd69fb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Feb 11 12:49:06 2021 -0800
Support build on PgSQL 14+, Closes #4845
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3445bc..a5c2f5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
- { tag: pg13-geos39-gdal31-proj71, mode: usan_gcc }
- { tag: pg13-clang-geos39-gdal31-proj71, mode: usan_clang }
# Run tests with different dependency combinations
- - { tag: latest, mode: tests }
+ # - { tag: latest, mode: tests }
- { tag: pg13-geos38-gdal31-proj71, mode: tests }
- { tag: pg12-geos37-gdal30-proj611, mode: tests }
- { tag: pg11-geos37-gdal24-proj52, mode: tests }
diff --git a/postgis/gserialized_supportfn.c b/postgis/gserialized_supportfn.c
index ce53816..8c69e88 100644
--- a/postgis/gserialized_supportfn.c
+++ b/postgis/gserialized_supportfn.c
@@ -417,7 +417,11 @@ Datum postgis_index_supportfn(PG_FUNCTION_ARGS)
* The comparison expression has to be a pseudo constant,
* (not volatile or dependent on the target index table)
*/
+#if POSTGIS_PGSQL_VERSION >= 140
+ if (!is_pseudo_constant_for_index(req->root, (Node*)expandexpr, req->index))
+#else
if (!is_pseudo_constant_for_index((Node*)expandexpr, req->index))
+#endif
PG_RETURN_POINTER((Node*)NULL);
/* OK, we can make an index expression */
@@ -440,7 +444,11 @@ Datum postgis_index_supportfn(PG_FUNCTION_ARGS)
* The comparison expression has to be a pseudoconstant
* (not volatile or dependent on the target index's table)
*/
+#if POSTGIS_PGSQL_VERSION >= 140
+ if (!is_pseudo_constant_for_index(req->root, rightarg, req->index))
+#else
if (!is_pseudo_constant_for_index(rightarg, req->index))
+#endif
PG_RETURN_POINTER((Node*)NULL);
/*
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 2 +-
postgis/gserialized_supportfn.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
hooks/post-receive
--
PostGIS