[SCM] PostGIS branch master updated. 3.5.0-381-g8060d5ef4
git at osgeo.org
git at osgeo.org
Fri Jun 6 19:27:54 PDT 2025
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 8060d5ef40161ac8240073846f602fdf3d9db233 (commit)
from 496a9b33481691e76671a210083308386aee5b02 (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 8060d5ef40161ac8240073846f602fdf3d9db233
Author: Regina Obe <lr at pcorp.us>
Date: Fri Jun 6 21:08:08 2025 -0400
GARDEN FIXINS
- Fix raster garden tests - Closes #5926 for PostGIS 3.6.0
- More input handlings for postgis_garden core
- Lower case all topogeometry type references to match with other type casing
Needed cause garden test is looking for lower case
- other topology garden type replace Closes #2297 for PostGIS 3.6.0
diff --git a/.gitignore b/.gitignore
index b2f46cfcd..56da459ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -178,6 +178,7 @@ regress/sfcgal/Makefile
regress/postgis.sql
regress/postgis_garden_result.txt
regress/raster_garden_result.txt
+regress/topology_garden_result.txt
sfcgal/Makefile
sfcgal/regress/Makefile
sfcgal/regress/tests.mk
diff --git a/doc/extras_topology.xml b/doc/extras_topology.xml
index 9d4b2d01f..6dd944a30 100644
--- a/doc/extras_topology.xml
+++ b/doc/extras_topology.xml
@@ -1095,7 +1095,7 @@ SELECT topology.MakeTopologyPrecise(
<funcsynopsis>
<funcprototype>
<funcdef>topology <function>FindTopology</function></funcdef>
- <paramdef><type>TopoGeometry</type> <parameter>topogeom</parameter></paramdef>
+ <paramdef><type>topogeometry</type> <parameter>topogeom</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>topology <function>FindTopology</function></funcdef>
@@ -1159,7 +1159,7 @@ SELECT name(findTopology('features.land_parcels', 'feature'));
<funcsynopsis>
<funcprototype>
<funcdef>topology.layer <function>FindLayer</function></funcdef>
- <paramdef><type>TopoGeometry</type> <parameter>tg</parameter></paramdef>
+ <paramdef><type>topogeometry</type> <parameter>tg</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>topology.layer <function>FindLayer</function></funcdef>
@@ -3490,7 +3490,7 @@ faceid
<funcsynopsis>
<funcprototype>
<funcdef>geometry <function>ST_Simplify</function></funcdef>
- <paramdef><type>TopoGeometry</type> <parameter>tg</parameter></paramdef>
+ <paramdef><type>topogeometry</type> <parameter>tg</parameter></paramdef>
<paramdef><type>float8</type> <parameter>tolerance</parameter></paramdef>
</funcprototype>
</funcsynopsis>
diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index f7a09e657..cb367a6b7 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -11,7 +11,7 @@
using a garden variety of geometries. Its intent is to flag major crashes.
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='testversion'>3.5.0</xsl:variable>
+ <xsl:variable name='testversion'>3.6.0</xsl:variable>
<xsl:variable name='fnexclude14'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>
<xsl:variable name='fnexclude'>AddGeometryColumn DropGeometryColumn DropGeometryTable CG_Visibility CG_YMonotonePartition ST_AlphaShape ST_OptimalAlphaShape</xsl:variable>
<!--This is just a place holder to state functions not supported or tested separately -->
@@ -36,7 +36,7 @@
<xsl:variable name='var_matrix'>'FF1FF0102'</xsl:variable>
<xsl:variable name='var_boolean'>false</xsl:variable>
<xsl:variable name='var_geom_name'>the_geom</xsl:variable>
- <xsl:variable name='var_logtable'>postgis_garden_log35</xsl:variable>
+ <xsl:variable name='var_logtable'>postgis_garden_log36</xsl:variable>
<xsl:variable name='var_logupdatesql'>UPDATE <xsl:value-of select="$var_logtable" /> SET log_end = clock_timestamp()
FROM (SELECT logid FROM <xsl:value-of select="$var_logtable" /> ORDER BY logid DESC limit 1) As foo
WHERE <xsl:value-of select="$var_logtable" />.logid = foo.logid AND <xsl:value-of select="$var_logtable" />.log_end IS NULL;</xsl:variable>
@@ -717,6 +717,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
<xsl:when test="contains(db:parameter, 'NDR')">
'<xsl:value-of select="$var_NDRXDR" />'
</xsl:when>
+ <xsl:when test="(contains(db:parameter, 'target_version'))">
+ '<xsl:value-of select="$testversion" />'
+ </xsl:when>
<xsl:when test="contains(db:parameter, 'gj_version')">
<xsl:value-of select="$var_gj_version" />
</xsl:when>
@@ -739,6 +742,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
'<xsl:value-of select="$var_geom_name" />'
</xsl:when>
+ <xsl:when test="contains(db:parameter, 'relation_oid')">
+ '<xsl:value-of select="$var_logtable" />'::regclass
+ </xsl:when>
<xsl:when test="contains(db:parameter, 'bounds')">
ST_MakeBox2D(ST_Point(0, 0), ST_Point(4096, 4096))
</xsl:when>
@@ -762,11 +768,11 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
<xsl:when test="contains(db:type, 'bigint[]')">
<xsl:text>ARRAY[ST_XMin(foo1.the_geom)::bigint]</xsl:text>
</xsl:when>
- <xsl:when test="contains(db:type, 'geometry[]') and count($func/paramdef/db:type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1'">
- ARRAY[foo1.the_geom]
+ <xsl:when test="contains(db:type, 'geometry[]') and count($func/paramdef/db:type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '2'">
+ ARRAY[foo2.the_geom]
</xsl:when>
<xsl:when test="contains(db:type, 'geometry[]')">
- ARRAY[foo2.the_geom]
+ ARRAY[foo1.the_geom]
</xsl:when>
<xsl:when test="contains(db:parameter, 'EWKT')">
<xsl:text>ST_AsEWKT(foo1.the_geom)</xsl:text>
diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 61d6a9fa8..01ed0e637 100644
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -133,8 +133,8 @@ DROP TABLE IF EXISTS <xsl:value-of select="$var_logtable" />;
CREATE TABLE <xsl:value-of select="$var_logtable" />(logid serial PRIMARY KEY, log_label text, spatial_class text DEFAULT 'raster', func text, g1 text, g2 text, log_start timestamp, log_end timestamp, log_sql text);
DROP TABLE IF EXISTS <xsl:value-of select="$var_logtable" />_output;
CREATE TABLE <xsl:value-of select="$var_logtable" />_output(logid integer PRIMARY KEY, log_output xml);
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='RT_reference']" />
- <xsl:apply-templates select="/db:book/db:chapter[@xml:id='RT_reference']/db:section[contains(@xml:id, 'Type')]" />
+ <xsl:apply-templates select="/db:book/db:chapter[@xml:id='RT_reference']" />
+
</xsl:template>
<xsl:template match='db:chapter'>
<!-- define a table we call pgis_rgarden_mega that will contain a raster column with a band for all types of pixels we support -->
diff --git a/doc/xsl/topology_gardentest.sql.xsl b/doc/xsl/topology_gardentest.sql.xsl
index 95f5d77f3..75c0f7ee3 100644
--- a/doc/xsl/topology_gardentest.sql.xsl
+++ b/doc/xsl/topology_gardentest.sql.xsl
@@ -600,6 +600,19 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
'<xsl:value-of select="$var_geom_name" />'
</xsl:when>
+ <xsl:when test="contains(db:parameter, 'feature_column') and db:type = 'name'">
+ 'topo'
+ </xsl:when>
+
+ <xsl:when test="contains(db:parameter, 'layer_table') and db:type = 'regclass'">
+ 'public.pgis_tgarden_point'::regclass
+ </xsl:when>
+
+ <xsl:when test="contains(db:parameter, 'new_name') and db:type = 'name'">
+ 'topo'
+ </xsl:when>
+
+
<xsl:when test="contains(db:parameter, 'bounds')">
ST_MakeBox2D(ST_Point(0, 0), ST_Point(4096, 4096))
</xsl:when>
@@ -632,6 +645,7 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
<xsl:when test="contains(db:type, 'bigint[]')">
<xsl:text>ARRAY[ST_XMin(foo1.the_geom)::bigint]</xsl:text>
</xsl:when>
+
<xsl:when test="contains(db:type, 'geometry[]') and count($func/paramdef/db:type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1'">
ARRAY[foo1.the_geom]
</xsl:when>
@@ -683,10 +697,10 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
<xsl:when test="contains(db:type, 'spheroid')">
<xsl:value-of select="$var_spheroid" />
</xsl:when>
- <xsl:when test="contains(db:type, 'integer') and position() = 2">
+ <xsl:when test="contains(db:type, 'int') and position() = 2">
<xsl:value-of select="$var_integer1" />
</xsl:when>
- <xsl:when test="contains(db:type, 'integer') or contains(db:type, 'int4')">
+ <xsl:when test="contains(db:type, 'int') or contains(db:type, 'int4')">
<xsl:value-of select="$var_integer2" />
</xsl:when>
<xsl:when test="contains(db:type, 'text')">
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
doc/extras_topology.xml | 6 +++---
doc/xsl/postgis_gardentest.sql.xsl | 16 +++++++++++-----
doc/xsl/raster_gardentest.sql.xsl | 4 ++--
doc/xsl/topology_gardentest.sql.xsl | 18 ++++++++++++++++--
5 files changed, 33 insertions(+), 12 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list