[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-636-gf93359b21
git at osgeo.org
git at osgeo.org
Fri Feb 17 16:55:18 PST 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 f93359b21380998e86a38805f069bd22383ccf6e (commit)
via 6bedfb72ca0ab3e5919d17f3f52f259573c0a56a (commit)
from 5930a3ff2f321548223e9a9147a3eea6870b52cd (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 f93359b21380998e86a38805f069bd22383ccf6e
Author: Regina Obe <lr at pcorp.us>
Date: Mon Jan 23 12:01:01 2023 -0500
Garden test changes
1. Add in infinity check tests
2. Update the log table version name
diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 7fbd4512c..36bae0635 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -33,7 +33,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_log33</xsl:variable>
+ <xsl:variable name='var_logtable'>postgis_garden_log34</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>
@@ -269,6 +269,25 @@ FROM (VALUES ( ST_GeomFromEWKT('SRID=4326;MULTIPOLYGON(((-71.0821 42.3036 2,-71.
UNION ALL SELECT ST_MakePolygon(ST_GeomFromText('LINESTRING(1 2, 1 2,1 2, 1 2, 3 2, 1 2)',4326)) As the_geom
)
</pgis:gset>
+ <pgis:gset ID="Infinite Polygons" GeometryType="POLYGON" createtable="true">(SELECT '0106000020E61000000100000001030000000100000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry AS the_geom
+ )
+ </pgis:gset>
+
+ <pgis:gset ID="Infinite 3D Polygons" GeometryType="POLYGON" createtable="true">(SELECT '01060000A0E61000000100000001030000800100000005000000000000000000F07F000000000000F07F000000000000F03F000000000000F07F000000000000F07F000000000000F03F000000000000F07F000000000000F07F000000000000F03F000000000000F07F000000000000F07F000000000000F03F000000000000F07F000000000000F07F000000000000F03F'::geometry AS the_geom
+ )
+ </pgis:gset>
+
+ <pgis:gset ID="Infinite Linestrings" GeometryType="LINESTRING" createtable="true">(SELECT '0102000020E610000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry AS the_geom
+ )
+ </pgis:gset>
+
+ <pgis:gset ID="Infinite Point" GeometryType="POINT" createtable="true">(SELECT '0101000020E6100000000000000000F07F000000000000F07F'::geometry AS the_geom )
+ </pgis:gset>
+
+ <pgis:gset ID="Infinite MultiPoint" GeometryType="MULTIPOINT" createtable="true">(SELECT
+ '0104000020E6100000050000000101000000000000000000F07F000000000000F07F0101000000000000000000F07F000000000000F07F0101000000000000000000F07F000000000000F07F0101000000000000000000F07F000000000000F07F0101000000000000000000F07F000000000000F07F'::geometry AS the_geom )
+ </pgis:gset>
+
<!-- TODO: Finish off MULTI list -->
</pgis:gardens>
<!--This is just a placeholder to hold geometries that will crash server when hitting against some functions
diff --git a/doc/xsl/postgis_gardentest_subset.sql.xsl b/doc/xsl/postgis_gardentest_subset.sql.xsl
deleted file mode 100644
index 21e5c34e4..000000000
--- a/doc/xsl/postgis_gardentest_subset.sql.xsl
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:pgis="http://www.postgis.org/pgis">
-<!-- ********************************************************************
- ********************************************************************
- Copyright 2009, Regina Obe
- License: BSD
- Purpose: This is an xsl transform that generates an sql test script from xml docs to test all the functions we have documented
- using a garden variety of geometries. Its intent is to flag major crashes. This version is similar to the full but designed to
- test more geometries but only against one function. Useful for intro of new functions or comparing major changes from function of one version of PostGIS to the other
- ******************************************************************** -->
- <xsl:output method="text" />
- <xsl:variable name='testversion'>3.3.0</xsl:variable>
- <xsl:variable name="fninclude"><xsl:value-of select="$inputfninclude"/></xsl:variable>
- <xsl:variable name='var_srid'>3395</xsl:variable>
- <xsl:variable name='var_position'>1</xsl:variable>
- <xsl:variable name='var_integer1'>3</xsl:variable>
- <xsl:variable name='var_integer2'>5</xsl:variable>
- <xsl:variable name='var_float1'>0.5</xsl:variable>
- <xsl:variable name='var_float2'>0.75</xsl:variable>
- <xsl:variable name='var_distance'>100</xsl:variable>
- <xsl:variable name='var_version1'>1</xsl:variable>
- <xsl:variable name='var_version2'>2</xsl:variable>
- <xsl:variable name='var_NDRXDR'>XDR</xsl:variable>
- <xsl:variable name='var_text'>'monkey'</xsl:variable>
- <xsl:variable name='var_varchar'>'test'</xsl:variable>
- <xsl:variable name='var_spheroid'>'SPHEROID["GRS_1980",6378137,298.257222101]'</xsl:variable>
- <xsl:variable name='var_matrix'>'FF1FF0102'</xsl:variable>
- <xsl:variable name='var_boolean'>false</xsl:variable>
- <pgis:gardens>
- <pgis:gset ID='PointSet' GeometryType='POINT'>(SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 15) j
- ORDER BY i,j
- )</pgis:gset>
- <pgis:gset ID='LineSet' GeometryType='LINESTRING'>(SELECT ST_MakeLine(ST_SetSRID(ST_Point(i,j),4326),ST_SetSRID(ST_Point(j,i),4326)) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 15) As j
- WHERE NOT(i = j)
- ORDER BY i, i*j)</pgis:gset>
- <pgis:gset ID='PolySet' GeometryType='POLYGON'>(SELECT ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j*0.05) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 20) As j
- ORDER BY i, i*j, j)</pgis:gset>
- <pgis:gset ID='PointMSet' GeometryType='POINTM'>(SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 20) AS j
- CROSS JOIN generate_series(1,2) As m
- ORDER BY i, j, i*j*m)</pgis:gset>
- <pgis:gset ID='LineMSet' GeometryType='LINESTRINGM'>(SELECT ST_MakeLine(ST_SetSRID(ST_MakePointM(i,j,m),4326),ST_SetSRID(ST_MakePointM(j,i,m),4326)) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 20) As j
- CROSS JOIN generate_series(1,2) As m
- WHERE NOT(i = j)
- ORDER BY i, j, m, i*j*m)</pgis:gset>
- <pgis:gset ID='PolygonMSet' GeometryType='POLYGONM'>(SELECT ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePointM(i+m,j,m),4326),ST_SetSRID(ST_MakePointM(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePointM(i,j,m),4326)),ST_SetSRID(ST_MakePointM(i+m,j,m),4326))) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 20) As j
- CROSS JOIN generate_series(1,2) As m
- ORDER BY i, j, m, i*j*m
- )</pgis:gset>
- <pgis:gset ID='PointSet3D' GeometryType='POINTZ'>(SELECT ST_SetSRID(ST_MakePoint(i,j,k),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 20) j
- CROSS JOIN generate_series(1,2) k
- ORDER BY i,i*j, j*k, i + j + k)</pgis:gset>
- <pgis:gset ID='LineSet3D' GeometryType='LINESTRINGZ'>(SELECT ST_SetSRID(ST_MakeLine(ST_MakePoint(i,j,k), ST_MakePoint(i+k,j+k,k)),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 20) j
- CROSS JOIN generate_series(1,2) k
- ORDER BY i, j, i+j+k, k, i*j*k)</pgis:gset>
- <pgis:gset ID='PolygonSet3D' GeometryType='POLYGONZ'>(SELECT ST_SetSRID(ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_MakePoint(i+m,j,m),ST_MakePoint(j+m,i-m,m)),ST_MakePoint(i,j,m)),ST_MakePointM(i+m,j,m))),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 20) As j
- CROSS JOIN generate_series(1,2) As m
- ORDER BY i, j, i+j+m, m, i*j*m)</pgis:gset>
-
- <pgis:gset ID='PolyhedralSurface' GeometryType='PolyhedralSurface'>(SELECT ST_GeomFromEWKT(
-'SRID=0;PolyhedralSurface(
-((0 0 0, 0 0 1, 0 1 1, 0 1 0, 0 0 0)),
-((0 0 0, 0 1 0, 1 1 0, 1 0 0, 0 0 0)), ((0 0 0, 1 0 0, 1 0 1, 0 0 1, 0 0 0)), ((1 1 0, 1 1 1, 1 0 1, 1 0 0, 1 1 0)),
-((0 1 0, 0 1 1, 1 1 1, 1 1 0, 0 1 0)), ((0 0 1, 1 0 1, 1 1 1, 0 1 1, 0 0 1))
-)') )</pgis:gset>
-
- <pgis:gset ID='GCSet3D' GeometryType='GEOMETRYCOLLECTIONZ' SkipUnary='1'>(SELECT ST_Collect(ST_Collect(ST_SetSRID(ST_MakePoint(i,j,m),4326),ST_SetSRID(ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_MakePoint(i+m,j,m),ST_MakePoint(j+m,i-m,m)),ST_MakePoint(i,j,m)),ST_MakePointM(i+m,j,m))),4326))) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 20) As j
- CROSS JOIN generate_series(1,2) As m
- )</pgis:gset>
-
-<!-- MULTIs start here -->
- <pgis:gset ID='MultiPointSet' GeometryType='MULTIPOINT'>(SELECT ST_Collect(s.the_geom) As the_geom
- FROM (SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 15) j
- ) As s)</pgis:gset>
-
- <pgis:gset ID='MultiLineSet' GeometryType='MULTILINESTRING'>(SELECT ST_Collect(s.the_geom) As the_geom
- FROM (SELECT ST_MakeLine(ST_SetSRID(ST_Point(i,j),4326),ST_SetSRID(ST_Point(j,i),4326)) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 15) As j
- WHERE NOT(i = j)) As s)</pgis:gset>
-
- <pgis:gset ID='MultiPolySet' GeometryType='MULTIPOLYGON'>(SELECT ST_Multi(ST_Union(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j*0.05))) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 25) As j)</pgis:gset>
-
- <pgis:gset ID='MultiPointSet3D' GeometryType='MULTIPOINTZ'>(SELECT ST_Collect(ST_SetSRID(ST_MakePoint(i,j,k),4326)) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 25) j
- CROSS JOIN generate_series(1,3) k
- )</pgis:gset>
-
- <pgis:gset ID='MultiLineSet3D' GeometryType='MULTILINESTRINGZ'>(SELECT ST_Multi(ST_Union(ST_SetSRID(ST_MakeLine(ST_MakePoint(i,j,k), ST_MakePoint(i+k,j+k,k)),4326))) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(40,70, 25) j
- CROSS JOIN generate_series(1,2) k
- )</pgis:gset>
-
- <pgis:gset ID='MultiPolySet3D' GeometryType='MULTIPOLYGONZ'>(SELECT ST_Multi(ST_Union(s.the_geom)) As the_geom
- FROM (SELECT ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePoint(i+m,j,m),4326),ST_SetSRID(ST_MakePoint(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePoint(i,j,m),4326)),ST_SetSRID(ST_MakePoint(i+m,j,m),4326))) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 25) As j
- CROSS JOIN generate_series(1,2) As m
- ) As s)</pgis:gset>
-
- <pgis:gset ID='MultiPointMSet' GeometryType='MULTIPOINTM'>(SELECT ST_Collect(s.the_geom) As the_geom
- FROM (SELECT ST_SetSRID(ST_MakePointM(i,j,m),4326) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 25) AS j
- CROSS JOIN generate_series(1,2) As m
- ) As s)</pgis:gset>
-
- <pgis:gset ID='MultiLineMSet' GeometryType='MULTILINESTRINGM'>(SELECT ST_Collect(s.the_geom) As the_geom
- FROM (SELECT ST_MakeLine(ST_SetSRID(ST_MakePointM(i,j,m),4326),ST_SetSRID(ST_MakePointM(j,i,m),4326)) As the_geom
- FROM (SELECT a*1.01234567890 FROM generate_series(-10,50,10) As a) As i(i)
- CROSS JOIN generate_series(50,70, 25) As j
- CROSS JOIN generate_series(1,2) As m
- WHERE NOT(i = j)) As s)</pgis:gset>
-
- <pgis:gset ID='MultiPolygonMSet' GeometryType='MULTIPOLYGONM'>(
- SELECT ST_GeomFromEWKT('SRID=4326;MULTIPOLYGONM(((0 0 2,10 0 1,10 10 -2,0 10 -5,0 0 -5),(5 5 6,7 5 6,7 7 6,5 7 10,5 5 -2)))') As the_geom
- )</pgis:gset>
-
- <!--These are special case geometries -->
- <pgis:gset ID="Empty" GeometryType="GEOMETRY" createtable="false">(SELECT ST_GeomFromText('GEOMETRYCOLLECTION EMPTY',4326) As the_geom
- UNION ALL SELECT ST_GeomFromText('POLYGON EMPTY',4326) As the_geom
- )
- </pgis:gset>
-
- <pgis:gset ID="SingleNULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>
- <pgis:gset ID="MultipleNULLs" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom FROM generate_series(1,4) As foo)</pgis:gset>
-
-
- <!-- TODO: Finish off MULTI list -->
- </pgis:gardens>
- <!--This is just a placeholder to hold geometries that will crash server when hitting against some functions
- We'll fix these crashers in 1.4 -->
- <pgis:gardencrashers>
- <pgis:gset ID='CurvePolySet' GeometryType='CURVEPOLYGON'>(SELECT ST_LineToCurve(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)) As the_geom
- FROM generate_series(-10,50,10) As i
- CROSS JOIN generate_series(40,70, 20) As j
- ORDER BY i, j, i*j)</pgis:gset>
- <pgis:gset ID='CircularStringSet' GeometryType='CIRCULARSTRING'>(SELECT ST_LineToCurve(ST_Boundary(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j))) As the_geom
- FROM generate_series(-10,50,10) As i
- CROSS JOIN generate_series(40,70, 20) As j
- ORDER BY i, j, i*j)</pgis:gset>
-
- </pgis:gardencrashers>
-
- <!-- We deal only with the reference chapter -->
- <xsl:template match="/">
- <xsl:apply-templates select="/book/chapter[@id='reference']" />
- </xsl:template>
-
- <xsl:template match='chapter'>
-<!-- Start regular function checks excluding operators -->
- <xsl:for-each select="sect1[not(contains(@id,'Operator'))]/refentry">
- <xsl:sort select="@id"/>
-
- <xsl:for-each select="refsynopsisdiv/funcsynopsis/funcprototype">
-<!--Create dummy parameters to be used later -->
- <xsl:variable name='fnfakeparams'><xsl:call-template name="replaceparams"><xsl:with-param name="func" select="." /></xsl:call-template></xsl:variable>
- <xsl:variable name='fnargs'><xsl:call-template name="listparams"><xsl:with-param name="func" select="." /></xsl:call-template></xsl:variable>
- <xsl:variable name='fnname'><xsl:value-of select="funcdef/function"/></xsl:variable>
- <xsl:variable name='fndef'><xsl:value-of select="funcdef"/></xsl:variable>
- <xsl:variable name='numparams'><xsl:value-of select="count(paramdef/parameter)" /></xsl:variable>
- <xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'geography') or contains(text(),'box') or contains(text(), 'bytea')]) + count(paramdef/parameter[contains(text(),'WKT')]) + count(paramdef/parameter[contains(text(),'geomgml')])" /></xsl:variable>
- <xsl:variable name='numparamgeogs'><xsl:value-of select="count(paramdef/type[contains(text(),'geography')] )" /></xsl:variable>
- <!-- For each function prototype generate a test sql statement -->
- <xsl:choose>
-<!--Test functions that take no arguments or take no geometries -->
- <xsl:when test="$numparamgeoms = '0' and contains($fninclude,funcdef/function)">SELECT 'Starting <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)';BEGIN;
-SELECT <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnfakeparams" />);
-COMMIT;
-SELECT 'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)';
- </xsl:when>
-<!--Start Test aggregate and unary functions -->
-<!-- put functions that take only one geometry no need to cross with another geom collection, these are unary geom, aggregates, and so forth -->
- <xsl:when test="$numparamgeoms = '1' and contains($fninclude,funcdef/function)" >
- <xsl:for-each select="document('')//pgis:gardens/pgis:gset">
- <xsl:choose>
- <xsl:when test="contains(paramdef, 'geometry ')">
-
- SELECT 'Geometry <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />: Start Testing <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geometry show ewkt rep -->
- SELECT ST_AsEWKT(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />))
- </xsl:when>
- <xsl:when test="contains(paramdef, 'geography ')">
- SELECT 'Geography <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />: Start Testing <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geometry show astext rep -->
- SELECT ST_AsText(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />))
- </xsl:when>
- <xsl:otherwise>
- SELECT 'Other <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />: Start Testing <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geometry show ewkt rep -->
- SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)
- </xsl:otherwise>
- </xsl:choose>
- FROM (<xsl:value-of select="." />) As foo1
- LIMIT 3;
- COMMIT;
- SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text> <xsl:value-of select="@ID" />: End Testing <xsl:value-of select="@GeometryType" />';
- <xsl:text>
-
- </xsl:text>
- </xsl:for-each>
- </xsl:when>
-
-<!--Functions more than 1 args not already covered this will cross every geometry type with every other -->
- <xsl:when test="contains($fninclude,funcdef/function)">
- <xsl:for-each select="document('')//pgis:gardens/pgis:gset">
- <!--Store first garden sql geometry from -->
- <xsl:variable name="from1"><xsl:value-of select="." /></xsl:variable>
- <xsl:variable name='geom1type'><xsl:value-of select="@ID"/></xsl:variable>
-SELECT '<xsl:value-of select="$fnname" /> <xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): Start Testing <xsl:value-of select="$geom1type" /> against other types';
- <xsl:for-each select="document('')//pgis:gardens/pgis:gset">
- <xsl:choose>
- <xsl:when test="$numparamgeogs > '0'">
- SELECT 'Geography <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): Start Testing <xsl:value-of select="$geom1type" />, <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geography show wkt rep -->
- SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsText(foo1.the_geom) As ref1_geom, ST_AsText(foo2.the_geom) As ref2_geom
- </xsl:when>
- <xsl:when test="$numparamgeoms > '0'">
- SELECT 'Geometry <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): Start Testing <xsl:value-of select="$geom1type" />, <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geometry show ewkt rep -->
- SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsEWKT(foo1.the_geom) As ref1_geom, ST_AsEWKT(foo2.the_geom) As ref2_geom
- </xsl:when>
- <xsl:otherwise>
- SELECT 'Other <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): Start Testing <xsl:value-of select="$geom1type" />, <xsl:value-of select="@GeometryType" />';
- BEGIN; <!-- If output is geography show wkt rep -->
- SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)
- </xsl:otherwise>
- </xsl:choose>
- FROM (<xsl:value-of select="$from1" />) As foo1 CROSS JOIN (<xsl:value-of select="." />) As foo2
- LIMIT 2;
- COMMIT;
- SELECT '<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnargs" />) <xsl:text> </xsl:text> <xsl:value-of select="@ID" />: End Testing <xsl:value-of select="$geom1type" />, <xsl:value-of select="@GeometryType" />';
- <xsl:text>
-
- </xsl:text>
- </xsl:for-each>
-SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): End Testing <xsl:value-of select="@GeometryType" /> against other types';
- </xsl:for-each>
- </xsl:when>
- </xsl:choose>
- </xsl:for-each>
- </xsl:for-each>
- </xsl:template>
-
- <!--macro to replace func args with dummy var args -->
- <xsl:template name="replaceparams">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="contains(parameter, 'matrix') or contains(parameter, 'Matrix')">
- <xsl:value-of select="$var_matrix" />
- </xsl:when>
- <xsl:when test="contains(parameter, 'distance')">
- <xsl:value-of select="$var_distance" />
- </xsl:when>
- <xsl:when test="contains(parameter, 'srid')">
- <xsl:value-of select="$var_srid" />
- </xsl:when>
- <xsl:when test="contains(parameter, 'position')">
- <xsl:value-of select="$var_position" />
- </xsl:when>
- <xsl:when test="contains(parameter, 'NDR')">
- '<xsl:value-of select="$var_NDRXDR" />'
- </xsl:when>
- <xsl:when test="contains(parameter, 'version') and position() = 2">
- <xsl:value-of select="$var_version1" />
- </xsl:when>
- <xsl:when test="(contains(parameter, 'version'))">
- <xsl:value-of select="$var_version2" />
- </xsl:when>
- <xsl:when test="(contains(parameter,'geomgml'))">
- <xsl:text>ST_AsGML(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="(contains(type,'box') or type = 'geometry' or type = 'geometry ' or contains(type,'geometry set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1')">
- <xsl:text>foo1.the_geom</xsl:text>
- </xsl:when>
- <xsl:when test="(type = 'geography' or type = 'geography ' or contains(type,'geography set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geography')]) = '1' )">
- <xsl:text>geography(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(type,'box') or type = 'geometry' or type = 'geometry '">
- <xsl:text>foo2.the_geom</xsl:text>
- </xsl:when>
- <xsl:when test="type = 'geography' or type = 'geography '">
- <xsl:text>geography(foo2.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(type, 'geometry[]') and count($func/paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1'">
- ARRAY[foo1.the_geom]
- </xsl:when>
- <xsl:when test="contains(type, 'geometry[]')">
- ARRAY[foo2.the_geom]
- </xsl:when>
- <xsl:when test="contains(parameter, 'EWKT')">
- <xsl:text>ST_AsEWKT(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(parameter, 'WKT')">
- <xsl:text>ST_AsText(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(parameter, 'EWKB')">
- <xsl:text>ST_AsEWKB(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(type, 'bytea')">
- <xsl:text>ST_AsBinary(foo1.the_geom)</xsl:text>
- </xsl:when>
- <xsl:when test="contains(type, 'float') or contains(type, 'double')">
- <xsl:value-of select="$var_float1" />
- </xsl:when>
- <xsl:when test="contains(type, 'spheroid')">
- <xsl:value-of select="$var_spheroid" />
- </xsl:when>
- <xsl:when test="contains(type, 'integer') and position() = 2">
- <xsl:value-of select="$var_integer1" />
- </xsl:when>
- <xsl:when test="contains(type, 'integer')">
- <xsl:value-of select="$var_integer2" />
- </xsl:when>
- <xsl:when test="contains(type, 'text')">
- <xsl:value-of select="$var_text" />
- </xsl:when>
- <xsl:when test="contains(type, 'varchar')">
- <xsl:value-of select="$var_varchar" />
- </xsl:when>
- <xsl:when test="contains(type,'timestamp') or type = 'date'">
- <xsl:text>'2009-01-01'</xsl:text>
- </xsl:when>
- <xsl:when test="contains(type,'boolean')">
- <xsl:value-of select="$var_boolean" />
- </xsl:when>
- </xsl:choose>
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:for-each>
- </xsl:for-each>
- </xsl:template>
-
- <!--macro to pull out function parameter names so we can provide a pretty arg list prefix for each function -->
- <xsl:template name="listparams">
- <xsl:param name="func" />
- <xsl:for-each select="$func">
- <xsl:if test="count(paramdef/parameter) > 0"> </xsl:if>
- <xsl:for-each select="paramdef">
- <xsl:choose>
- <xsl:when test="count(parameter) > 0">
- <xsl:value-of select="parameter" />
- </xsl:when>
- </xsl:choose>
- <xsl:if test="position()<last()"><xsl:text>, </xsl:text></xsl:if>
- </xsl:for-each>
- </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 053df77ef..6f7ff25cf 100644
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -8,7 +8,7 @@
using a garden variety of rasters. Its intent is to flag major crashes.
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='testversion'>3.3.0</xsl:variable>
+ <xsl:variable name='testversion'>3.4.0</xsl:variable>
<xsl:variable name='fnexclude'>AddRasterColumn AddRasterConstraints DropRasterConstraints DropRasterColumn DropRasterTable</xsl:variable>
<!--This is just a place holder to state functions not supported in 1.3 or tested separately -->
@@ -31,7 +31,7 @@
<xsl:variable name='var_rastercolumn'>'rast'</xsl:variable>
<xsl:variable name='var_rastertable'>'pgis_rgarden_1bb'</xsl:variable>
<xsl:variable name='var_boolean'>false</xsl:variable>
- <xsl:variable name='var_logtable'>raster_garden_log33</xsl:variable>
+ <xsl:variable name='var_logtable'>raster_garden_log34</xsl:variable>
<xsl:variable name='var_pixeltypes'>{8BUI,1BB}</xsl:variable>
<xsl:variable name='var_pixelvalues'>{255,0}</xsl:variable>
<xsl:variable name='var_algorithm'>'Lanczos'</xsl:variable>
@@ -67,6 +67,10 @@
<pgis:gset ID="SingleNULL" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom)</pgis:gset>
<pgis:gset ID="MultipleNULLs" GeometryType="GEOMETRY" createtable="false">(SELECT CAST(Null As geometry) As the_geom FROM generate_series(1,4) As foo)</pgis:gset>
+
+ <pgis:gset ID="Infinite Polygons" GeometryType="POLYGON" createtable="true">(SELECT '0106000020E61000000100000001030000000100000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F'::geometry AS the_geom
+ )
+ </pgis:gset>
</pgis:gardens>
<!--changed all to no skew so they pass the world tests -->
<pgis:pixeltypes>
commit 6bedfb72ca0ab3e5919d17f3f52f259573c0a56a
Author: Regina Obe <lr at pcorp.us>
Date: Fri Feb 17 19:21:37 2023 -0500
remove dump_restore from debbie run it's currently failing with schema exists errors topology, tiger
diff --git a/ci/debbie/postgis_regress.sh b/ci/debbie/postgis_regress.sh
index 801f21c60..e51925692 100644
--- a/ci/debbie/postgis_regress.sh
+++ b/ci/debbie/postgis_regress.sh
@@ -14,7 +14,7 @@ set -e
# export SFCGAL_VER=1.3
export MAKE_GARDEN=0
export MAKE_EXTENSION=1
-export DUMP_RESTORE=1
+export DUMP_RESTORE=0
export MAKE_LOGBT=0
export NO_SFCGAL=0
export MAKE_UPGRADE=1
-----------------------------------------------------------------------
Summary of changes:
ci/debbie/postgis_regress.sh | 2 +-
doc/xsl/postgis_gardentest.sql.xsl | 21 +-
doc/xsl/postgis_gardentest_subset.sql.xsl | 375 ------------------------------
doc/xsl/raster_gardentest.sql.xsl | 8 +-
4 files changed, 27 insertions(+), 379 deletions(-)
delete mode 100644 doc/xsl/postgis_gardentest_subset.sql.xsl
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list