Fixed #30800 -- Fixed migrations crash when altering a field with custom db_type().

Regression in 1378d665a1.
This commit is contained in:
Mariusz Felisiak 2019-09-25 12:32:24 +02:00 committed by GitHub
parent 566fca14b3
commit 580e644f24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions

View File

@ -42,7 +42,10 @@ class DatabaseSchemaEditor(BaseDatabaseSchemaEditor):
def _field_data_type(self, field): def _field_data_type(self, field):
if field.is_relation: if field.is_relation:
return field.rel_db_type(self.connection) return field.rel_db_type(self.connection)
return self.connection.data_types[field.get_internal_type()] return self.connection.data_types.get(
field.get_internal_type(),
field.db_type(self.connection),
)
def _create_like_index_sql(self, model, field): def _create_like_index_sql(self, model, field):
""" """

View File

@ -875,6 +875,26 @@ class SchemaTests(TransactionTestCase):
with self.assertRaisesMessage(DataError, msg): with self.assertRaisesMessage(DataError, msg):
editor.alter_field(Author, old_field, new_field, strict=True) editor.alter_field(Author, old_field, new_field, strict=True)
@unittest.skipUnless(connection.vendor == 'postgresql', 'PostgreSQL specific')
def test_alter_field_with_custom_db_type(self):
from django.contrib.postgres.fields import ArrayField
class Foo(Model):
field = ArrayField(CharField(max_length=255))
class Meta:
app_label = 'schema'
with connection.schema_editor() as editor:
editor.create_model(Foo)
self.isolated_local_models = [Foo]
old_field = Foo._meta.get_field('field')
new_field = ArrayField(CharField(max_length=16))
new_field.set_attributes_from_name('field')
new_field.model = Foo
with connection.schema_editor() as editor:
editor.alter_field(Foo, old_field, new_field, strict=True)
def test_alter_textfield_to_null(self): def test_alter_textfield_to_null(self):
""" """
#24307 - Should skip an alter statement on databases with #24307 - Should skip an alter statement on databases with