Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed `inspectapp` tests to work with improved PG driver in GDAL 1.9+.

  • Loading branch information...
commit 75301d99d314a992a202fad64b2667528f9d51c8 1 parent 08eb54a
@jbronn jbronn authored
Showing with 20 additions and 2 deletions.
  1. +20 −2 django/contrib/gis/tests/inspectapp/tests.py
View
22 django/contrib/gis/tests/inspectapp/tests.py
@@ -4,7 +4,7 @@
from django.db import connections
from django.test import TestCase
-from django.contrib.gis.gdal import Driver
+from django.contrib.gis.gdal import Driver, GDAL_VERSION
from django.contrib.gis.geometry.test_data import TEST_DATA
from django.contrib.gis.utils.ogrinspect import ogrinspect
@@ -74,15 +74,33 @@ def test_time_field(self):
'',
'class Measurement(models.Model):',
' f_decimal = models.DecimalField(max_digits=0, decimal_places=0)',
+ ]
+
+ if GDAL_VERSION < (1, 9, 0):
+ # Prior to GDAL 1.9, the order of the model fields was not
+ # the same as the columns in the database.
+ expected.extend([
' f_int = models.IntegerField()',
' f_datetime = models.DateTimeField()',
' f_time = models.TimeField()',
' f_float = models.FloatField()',
' f_char = models.CharField(max_length=10)',
' f_date = models.DateField()',
+ ])
+ else:
+ expected.extend([
+ ' f_float = models.FloatField()',
+ ' f_int = models.IntegerField()',
+ ' f_char = models.CharField(max_length=10)',
+ ' f_date = models.DateField()',
+ ' f_datetime = models.DateTimeField()',
+ ' f_time = models.TimeField()',
+ ])
+
+ expected.extend([
' geom = models.PolygonField()',
' objects = models.GeoManager()',
- ]
+ ])
self.assertEqual(model_def, '\n'.join(expected))
Please sign in to comment.
Something went wrong with that request. Please try again.