[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-565-ga830a8833
git at osgeo.org
git at osgeo.org
Thu Sep 14 22:27:07 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, master has been updated
via a830a8833ffccd18e53f8ae500a77c4c20783b60 (commit)
from 3a4b92978a0abcc6683a7342a6efdfc7befd2967 (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 a830a8833ffccd18e53f8ae500a77c4c20783b60
Author: Regina Obe <lr at pcorp.us>
Date: Fri Sep 15 01:25:20 2023 -0400
FIX GARDEN TESTS
1. Makefile, was generating postgis for raster
2. Fix namespaces in xsl
3. Prefix tables with 35 instead of 34
Closes #5540 for PostGIS 3.5.0
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 36519e36e..9a59bc361 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -604,7 +604,7 @@ else
garden: postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql
endif
-%_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql: xsl/postgis_gardentest.sql.xsl postgis-out.xml
+%_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql: xsl/%_gardentest.sql.xsl postgis-out.xml
$(XSLTPROC) -o $@ $(XSLTPROC_PATH_OPT) $^
check: check-unit
diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 06a942649..bd1dcfb1c 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -1,5 +1,8 @@
<?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">
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:db="http://docbook.org/ns/docbook" xmlns:pgis="http://postgis.net/pgis"
+>
<!-- ********************************************************************
********************************************************************
Copyright 2008-2010, Regina Obe
@@ -8,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.4.0</xsl:variable>
+ <xsl:variable name='testversion'>3.5.0</xsl:variable>
<xsl:variable name='fnexclude14'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>
<xsl:variable name='fnexclude'>AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>
<!--This is just a place holder to state functions not supported or tested separately -->
@@ -33,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_log34</xsl:variable>
+ <xsl:variable name='var_logtable'>postgis_garden_log35</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>
@@ -330,7 +333,7 @@ CREATE TABLE <xsl:value-of select="$var_logtable" />_output(logid integer PRIMAR
<xsl:apply-templates select="/db:book/db:chapter[@xml:id='reference']" />
</xsl:template>
- <xsl:template match='chapter'>
+ <xsl:template match='db:chapter'>
<!--Start Test table creation, insert, analyze crash test, drop -->
<xsl:for-each select="document('')//pgis:gardens/pgis:gset[not(contains(@createtable,'false'))]">
<xsl:variable name='log_label'>table Test <xsl:value-of select="@GeometryType" /></xsl:variable>
@@ -468,7 +471,7 @@ SELECT '<xsl:value-of select="$log_label" /> Geography: End Testing';
<!--End Test table creation, insert, drop -->
<!--Start test on operators -->
- <xsl:for-each select="db:sect1[contains(@xml:id,'Operator') and not(contains($fnexclude,db:funcdef/db:function))]/db:refentry">
+ <xsl:for-each select="db:section[contains(@xml:id,'Operator') and not(contains($fnexclude,db:funcdef/db:function))]/db:refentry">
<xsl:sort select="@id"/>
<xsl:for-each select="db:refsynopsisdiv/db:funcsynopsis/db:funcprototype">
<xsl:variable name='fnname'><xsl:value-of select="db:funcdef/db:function"/></xsl:variable>
@@ -521,7 +524,7 @@ SELECT '<xsl:value-of select="$log_label" /> Geography: End Testing';
</xsl:for-each>
<!--End test on operators -->
<!-- Start regular function checks excluding operators -->
- <xsl:for-each select="db:sect1[not(contains(@xml:id,'Operator'))]//db:refentry">
+ <xsl:for-each select="db:section[not(contains(@xml:id,'Operator'))]//db:refentry">
<xsl:sort select="@id"/>
<xsl:for-each select="db:refsynopsisdiv/db:funcsynopsis/db:funcprototype">
diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 275532314..1565dc041 100644
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -1,6 +1,8 @@
<?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">
-<!-- ********************************************************************
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:db="http://docbook.org/ns/docbook" xmlns:pgis="http://postgis.net/pgis"
+><!-- ********************************************************************
********************************************************************
Copyright 2010, Regina Obe
License: BSD-3-Clause
@@ -8,7 +10,7 @@
using a garden variety of rasters. Its intent is to flag major crashes.
******************************************************************** -->
<xsl:output method="text" />
- <xsl:variable name='testversion'>3.4.0</xsl:variable>
+ <xsl:variable name='testversion'>3.5.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 +33,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_log34</xsl:variable>
+ <xsl:variable name='var_logtable'>raster_garden_log35</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>
@@ -131,9 +133,10 @@ 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']" />
+ <xsl:apply-templates select="/db:book/db:chapter[@xml:id='RT_reference']/db:section[contains(@xml:id, 'Type')]" />
</xsl:template>
- <xsl:template match='chapter'>
+ <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 -->
DROP TABLE IF EXISTS pgis_rgarden_mega;
CREATE TABLE pgis_rgarden_mega(rid serial PRIMARY KEY, rast raster);
@@ -189,7 +192,7 @@ COMMIT;
<!--Start test on operators -->
- <xsl:for-each select="db:sect1[contains(@xml:id,'RT_Operator')]//db:refentry">
+ <xsl:for-each select="db:section[contains(@xml:id,'RT_Operator')]/db:refentry">
<xsl:sort select="@id"/>
<xsl:for-each select="db:refsynopsisdiv/db:funcsynopsis/db:funcprototype">
<xsl:variable name='fnname'><xsl:value-of select="db:funcdef/db:function"/></xsl:variable>
@@ -239,7 +242,7 @@ COMMIT;
<!--End test on operators -->
<!-- Start regular function checks excluding operators -->
- <xsl:for-each select="db:sect1[not(contains(@xml:id,'Operator'))]/db:refentry">
+ <xsl:for-each select="db:section[not(contains(@xml:id,'Operator'))]/db:refentry">
<xsl:sort select="@id"/>
<xsl:for-each select="db:refsynopsisdiv/db:funcsynopsis/db:funcprototype">
-----------------------------------------------------------------------
Summary of changes:
doc/Makefile.in | 2 +-
doc/xsl/postgis_gardentest.sql.xsl | 15 +++++++++------
doc/xsl/raster_gardentest.sql.xsl | 19 +++++++++++--------
3 files changed, 21 insertions(+), 15 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list