Commit d22b2918 authored by Marc Tamlyn's avatar Marc Tamlyn
Browse files

Fixed #22001 -- Ensure db_type is respected. 

db_parameters should respect an already existing db_type method and
return that as its type string. In particular, this was causing some
fields from gis to not be generated.

Thanks to @bigsassy and @blueyed for their work on the patch.

Also fixed #22260
parent 37f7f233

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ answer newbie questions, and generally made Django that much better: 
    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>

    Jeremy Carbaugh <jcarbaugh@gmail.com>

    Graham Carlyle <graham.carlyle@maplecroft.net>

    Eric Palakovich Carr <carreric@gmail.com>

    Juan Catalano <catalanojuan@gmail.com>

    Antonio Cavedoni <http://cavedoni.com/>

    cedric@terramater.net

django/contrib/gis/tests/migrations/__init__.py

0 → 100644
+0 −0

Empty file added.

django/contrib/gis/tests/migrations/migrations/0001_initial.py

0 → 100644
+33 −0
Original line number Diff line number Diff line 
from django.db import models, migrations

import django.contrib.gis.db.models.fields





# Used for regression test of ticket #22001: https://code.djangoproject.com/ticket/22001

class Migration(migrations.Migration):



    operations = [

        migrations.CreateModel(

            name='Neighborhood',

            fields=[

                (u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)),

                ('name', models.TextField(unique=True)),

                ('geom', django.contrib.gis.db.models.fields.MultiPolygonField(srid=4326, null=True)),

            ],

            options={

            },

            bases=(models.Model,),

        ),

        migrations.CreateModel(

            name='Household',

            fields=[

                (u'id', models.AutoField(verbose_name=u'ID', serialize=False, auto_created=True, primary_key=True)),

                ('neighborhood', models.ForeignKey(to='gis.Neighborhood', to_field=u'id', null=True)),

                ('address', models.TextField()),

                ('zip_code', models.IntegerField(null=True, blank=True)),

                ('geom', django.contrib.gis.db.models.fields.PointField(srid=4326, null=True, geography=True)),

            ],

            options={

            },

            bases=(models.Model,),

        )

    ]

django/contrib/gis/tests/migrations/migrations/__init__.py

0 → 100644
+0 −0

Empty file added.

django/contrib/gis/tests/migrations/test_commands.py

0 → 100644
+47 −0
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from __future__ import unicode_literals



from django.core.management import call_command

from django.db import connection

from django.test import override_settings, override_system_checks, TransactionTestCase





class MigrateTests(TransactionTestCase):

    """

    Tests running the migrate command in Geodjango.

    """

    available_apps = ["django.contrib.gis"]



    def get_table_description(self, table):

        with connection.cursor() as cursor:

            return connection.introspection.get_table_description(cursor, table)



    def assertTableExists(self, table):

        with connection.cursor() as cursor:

            self.assertIn(table, connection.introspection.get_table_list(cursor))



    def assertTableNotExists(self, table):

        with connection.cursor() as cursor:

            self.assertNotIn(table, connection.introspection.get_table_list(cursor))



    @override_system_checks([])

    @override_settings(MIGRATION_MODULES={"gis": "django.contrib.gis.tests.migrations.migrations"})

    def test_migrate_gis(self):

        """

        Tests basic usage of the migrate command when a model uses Geodjango

        fields. Regression test for ticket #22001:

        https://code.djangoproject.com/ticket/22001

        """

        # Make sure no tables are created

        self.assertTableNotExists("migrations_neighborhood")

        self.assertTableNotExists("migrations_household")

        # Run the migrations to 0001 only

        call_command("migrate", "gis", "0001", verbosity=0)

        # Make sure the right tables exist

        self.assertTableExists("gis_neighborhood")

        self.assertTableExists("gis_household")

        # Unmigrate everything

        call_command("migrate", "gis", "zero", verbosity=0)

        # Make sure it's all gone

        self.assertTableNotExists("gis_neighborhood")

        self.assertTableNotExists("gis_household")