From 3c0a81aaf0a4ba675f80d50c788aea706d0c812c Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 31 Jan 2013 20:40:53 +0100 Subject: [PATCH] Fixed #19709 -- Fixed TimeField introspection on MySQL Thanks Eugene Grachev for the report. --- django/db/backends/mysql/introspection.py | 1 + tests/regressiontests/inspectdb/tests.py | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/django/db/backends/mysql/introspection.py b/django/db/backends/mysql/introspection.py index 52e97baedb..0be99e08bb 100644 --- a/django/db/backends/mysql/introspection.py +++ b/django/db/backends/mysql/introspection.py @@ -21,6 +21,7 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): FIELD_TYPE.LONGLONG: 'BigIntegerField', FIELD_TYPE.SHORT: 'IntegerField', FIELD_TYPE.STRING: 'CharField', + FIELD_TYPE.TIME: 'TimeField', FIELD_TYPE.TIMESTAMP: 'DateTimeField', FIELD_TYPE.TINY: 'IntegerField', FIELD_TYPE.TINY_BLOB: 'TextField', diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py index 5fa1eb1095..faf4f2fb2a 100644 --- a/tests/regressiontests/inspectdb/tests.py +++ b/tests/regressiontests/inspectdb/tests.py @@ -87,11 +87,7 @@ class InspectDBTestCase(TestCase): else: assertFieldType('field19', "models.IntegerField()") assertFieldType('field20', "models.TextField()") - if connection.vendor == 'mysql': - # Ticket #19709 - assertFieldType('field21', "models.TextField() # This field type is a guess.") - else: - assertFieldType('field21', "models.TimeField()") + assertFieldType('field21', "models.TimeField()") # URLField assertFieldType('field22', "models.CharField(max_length=200)")