diff options
| author | Jani Tiainen <jani.tiainen@tintti.net> | 2015-09-20 13:41:25 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-21 13:52:14 -0400 |
| commit | fcf494b48fea7c0c55ea29721ba0b2d250351ff8 (patch) | |
| tree | de5e53ea73a26e772aa5ddbc263248562d000eb9 /tests | |
| parent | fe3fc5210f0bb334a679ed420152af1c862c0239 (diff) | |
Fixed #24688 -- Added Oracle support for new-style GIS functions.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gis_tests/geoapp/models.py | 8 | ||||
| -rw-r--r-- | tests/gis_tests/geoapp/tests.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/gis_tests/geoapp/models.py b/tests/gis_tests/geoapp/models.py index a819c17ada..d6ca4f5010 100644 --- a/tests/gis_tests/geoapp/models.py +++ b/tests/gis_tests/geoapp/models.py @@ -62,6 +62,14 @@ class MultiFields(NamedModel): poly = models.PolygonField() class Meta: + required_db_features = ['gis_enabled'] + + +class UniqueTogetherModel(models.Model): + city = models.CharField(max_length=30) + point = models.PointField() + + class Meta: unique_together = ('city', 'point') required_db_features = ['gis_enabled', 'supports_geometry_field_unique_index'] diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index 64af08aa77..0d6ee0362f 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -615,7 +615,7 @@ class GeoQuerySetTest(TestCase): if oracle: # No precision parameter for Oracle :-/ gml_regex = re.compile( - r'^<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml">' + r'^<gml:Point srsName="EPSG:4326" xmlns:gml="http://www.opengis.net/gml">' r'<gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ ' r'</gml:coordinates></gml:Point>' ) |