p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove u prefixes, skip test unless spatial db. 

Refs #22001, d22b291890
This commit is contained in:
Marc Tamlyn 2014-03-15 12:47:32 +00:00
parent 659b5678fc
commit 834d78ffc3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/contrib/gis/tests/migrations/migrations/0001_initial.py
View File

@ -9,7 +9,7 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Neighborhood', name='Neighborhood',
fields=[ fields=[
(u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('name', models.TextField(unique=True)), ('name', models.TextField(unique=True)),
('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True)), ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True)),
], ],
@ -20,8 +20,8 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Household', name='Household',
fields=[ fields=[
(u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('neighborhood', models.ForeignKey(to='gis.Neighborhood', to_field=u'id', null=True)), ('neighborhood', models.ForeignKey(to='gis.Neighborhood', to_field='id', null=True)),
('address', models.TextField()), ('address', models.TextField()),
('zip_code', models.IntegerField(null=True, blank=True)), ('zip_code', models.IntegerField(null=True, blank=True)),
('geom', django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, geography=True)), ('geom', django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, geography=True)),

5
django/contrib/gis/tests/migrations/test_commands.py
View File

@ -1,6 +1,8 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from unittest import skipUnless
from django.contrib.gis.tests.utils import HAS_SPATIAL_DB
from django.core.management import call_command from django.core.management import call_command
from django.db import connection from django.db import connection
from django.test import override_settings, override_system_checks, TransactionTestCase from django.test import override_settings, override_system_checks, TransactionTestCase
@ -24,6 +26,7 @@ class MigrateTests(TransactionTestCase):
with connection.cursor() as cursor: with connection.cursor() as cursor:
self.assertNotIn(table, connection.introspection.get_table_list(cursor)) self.assertNotIn(table, connection.introspection.get_table_list(cursor))
@skipUnless(HAS_SPATIAL_DB, "Spatial db is required.")
@override_system_checks([]) @override_system_checks([])
@override_settings(MIGRATION_MODULES={"gis": "django.contrib.gis.tests.migrations.migrations"}) @override_settings(MIGRATION_MODULES={"gis": "django.contrib.gis.tests.migrations.migrations"})
def test_migrate_gis(self): def test_migrate_gis(self):