-
-
Notifications
You must be signed in to change notification settings - Fork 369
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5354 from rouault/fix_5347
Fix segfault on WFS filters with empty literals (PostGIS + Spatialite). Implement PropertyIsNull for those layers (#5347)
- Loading branch information
Showing
13 changed files
with
254 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
16 changes: 16 additions & 0 deletions
16
msautotest/wxs/expected/wfs_filter_postgis_property_is_equal_empty.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
Content-Type: text/xml; charset=UTF-8 | ||
|
||
<?xml version='1.0' encoding="UTF-8" ?> | ||
<wfs:FeatureCollection | ||
xmlns:ms="http://mapserver.gis.umn.edu/mapserver" | ||
xmlns:wfs="http://www.opengis.net/wfs" | ||
xmlns:gml="http://www.opengis.net/gml" | ||
xmlns:ogc="http://www.opengis.net/ogc" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.0.0/WFS-basic.xsd | ||
http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.0.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=XMLSCHEMA"> | ||
<gml:boundedBy> | ||
<gml:null>missing</gml:null> | ||
</gml:boundedBy> | ||
</wfs:FeatureCollection> | ||
|
51 changes: 51 additions & 0 deletions
51
msautotest/wxs/expected/wfs_filter_postgis_property_is_null_result.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
Content-Type: text/xml; subtype=gml/3.1.1; charset=UTF-8 | ||
|
||
<?xml version='1.0' encoding="UTF-8" ?> | ||
<wfs:FeatureCollection | ||
xmlns:ms="http://mapserver.gis.umn.edu/mapserver" | ||
xmlns:gml="http://www.opengis.net/gml" | ||
xmlns:wfs="http://www.opengis.net/wfs" | ||
xmlns:ogc="http://www.opengis.net/ogc" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.1.0/wfs.xsd"> | ||
<gml:boundedBy> | ||
<gml:Envelope srsName="EPSG:4326"> | ||
<gml:lowerCorner>46.980843 -64.052355</gml:lowerCorner> | ||
<gml:upperCorner>46.980843 -64.052355</gml:upperCorner> | ||
</gml:Envelope> | ||
</gml:boundedBy> | ||
<gml:featureMember> | ||
<ms:popplace> | ||
<gml:boundedBy> | ||
<gml:Envelope srsName="EPSG:4326"> | ||
<gml:lowerCorner>46.980843 -64.052355</gml:lowerCorner> | ||
<gml:upperCorner>46.980843 -64.052355</gml:upperCorner> | ||
</gml:Envelope> | ||
</gml:boundedBy> | ||
<ms:msGeometry> | ||
<gml:Point srsName="EPSG:4326"> | ||
<gml:pos>46.980843 -64.052355</gml:pos> | ||
</gml:Point> | ||
</ms:msGeometry> | ||
<ms:gid>1</ms:gid> | ||
<ms:area>0</ms:area> | ||
<ms:perimeter>0</ms:perimeter> | ||
<ms:popplace_>8</ms:popplace_> | ||
<ms:popplace_i>1</ms:popplace_i> | ||
<ms:unique_key>BACMK</ms:unique_key> | ||
<ms:name>"Tignish</ms:name> | ||
<ms:name_e></ms:name_e> | ||
<ms:name_f></ms:name_f> | ||
<ms:unique_k_1></ms:unique_k_1> | ||
<ms:unique_k_2></ms:unique_k_2> | ||
<ms:reg_code>11</ms:reg_code> | ||
<ms:nts50>021I16</ms:nts50> | ||
<ms:lat>465700</ms:lat> | ||
<ms:long>640200</ms:long> | ||
<ms:sgc_code>0</ms:sgc_code> | ||
<ms:capital>0</ms:capital> | ||
<ms:pop_range>1</ms:pop_range> | ||
</ms:popplace> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> | ||
|
15 changes: 15 additions & 0 deletions
15
msautotest/wxs/expected/wfs_filter_postgis_property_is_null_zero_result.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
Content-Type: text/xml; subtype=gml/3.1.1; charset=UTF-8 | ||
|
||
<?xml version='1.0' encoding="UTF-8" ?> | ||
<wfs:FeatureCollection | ||
xmlns:ms="http://mapserver.gis.umn.edu/mapserver" | ||
xmlns:gml="http://www.opengis.net/gml" | ||
xmlns:wfs="http://www.opengis.net/wfs" | ||
xmlns:ogc="http://www.opengis.net/ogc" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=popplace&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://ogc.dmsolutions.ca/wfs/1.1.0/wfs.xsd"> | ||
<gml:boundedBy> | ||
<gml:Null>missing</gml:Null> | ||
</gml:boundedBy> | ||
</wfs:FeatureCollection> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
Content-Type: text/xml; subtype=gml/3.1.1; charset=UTF-8 | ||
|
||
<?xml version='1.0' encoding="UTF-8" ?> | ||
<wfs:FeatureCollection | ||
xmlns:ms="http://mapserver.gis.umn.edu/mapserver" | ||
xmlns:gml="http://www.opengis.net/gml" | ||
xmlns:wfs="http://www.opengis.net/wfs" | ||
xmlns:ogc="http://www.opengis.net/ogc" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wfs_simple?SERVICE=WFS&VERSION=1.1.0&REQUEST=DescribeFeatureType&TYPENAME=towns_with_null&OUTPUTFORMAT=text/xml;%20subtype=gml/3.1.1 http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"> | ||
<gml:boundedBy> | ||
<gml:Envelope srsName="EPSG:32632"> | ||
<gml:lowerCorner>653901.530000 4866278.050000</gml:lowerCorner> | ||
<gml:upperCorner>653901.530000 4866278.050000</gml:upperCorner> | ||
</gml:Envelope> | ||
</gml:boundedBy> | ||
<!-- WARNING: FeatureId item 'ID' not found in typename 'towns_with_null'. --> | ||
<gml:featureMember> | ||
<ms:towns_with_null> | ||
<gml:boundedBy> | ||
<gml:Envelope srsName="EPSG:32632"> | ||
<gml:lowerCorner>653901.530000 4866278.050000</gml:lowerCorner> | ||
<gml:upperCorner>653901.530000 4866278.050000</gml:upperCorner> | ||
</gml:Envelope> | ||
</gml:boundedBy> | ||
<ms:msGeometry> | ||
<gml:Point srsName="EPSG:32632"> | ||
<gml:pos>653901.530000 4866278.050000</gml:pos> | ||
</gml:Point> | ||
</ms:msGeometry> | ||
<ms:name></ms:name> | ||
<ms:peoples>84274</ms:peoples> | ||
<ms:localcounc>1</ms:localcounc> | ||
<ms:county>1</ms:county> | ||
<ms:region>0</ms:region> | ||
</ms:towns_with_null> | ||
</gml:featureMember> | ||
</wfs:FeatureCollection> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters