From 4680d25df23875bced0f17d361782bda80ce79d6 Mon Sep 17 00:00:00 2001 From: Andrew Pinkham Date: Fri, 5 Sep 2014 17:07:42 -0700 Subject: [PATCH] Fixed #22951 -- Checked for types during deep_deconstruct migration serialization process. Thanks Sam Hartsfield for the report. --- django/db/migrations/autodetector.py | 2 +- docs/releases/1.7.1.txt | 2 ++ tests/migrations/test_autodetector.py | 25 +++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py index 41884058b7..076eb7c778 100644 --- a/django/db/migrations/autodetector.py +++ b/django/db/migrations/autodetector.py @@ -49,7 +49,7 @@ class MigrationAutodetector(object): Used for full comparison for rename/alter; sometimes a single-level deconstruction will not compare correctly. """ - if not hasattr(obj, 'deconstruct'): + if not hasattr(obj, 'deconstruct') or isinstance(obj, type): return obj deconstructed = obj.deconstruct() if isinstance(obj, models.Field): diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt index 90673a826f..2222ef2a7b 100644 --- a/docs/releases/1.7.1.txt +++ b/docs/releases/1.7.1.txt @@ -16,3 +16,5 @@ Bugfixes * Reinstated missing ``CHECK`` SQL clauses which were omitted on some backends when not using migrations (:ticket:`23416`). + +* Fixed serialization of ``type`` objects in migrations (:ticket:`22951`). diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py index 42569d354d..e944ac87ca 100644 --- a/tests/migrations/test_autodetector.py +++ b/tests/migrations/test_autodetector.py @@ -702,6 +702,31 @@ class AutodetectorTests(TestCase): changes = autodetector._detect_changes() self.assertEqual(changes, {}) + def test_deconstruct_type(self): + """ + #22951 -- Uninstanted classes with deconstruct are correctly returned + by deep_deconstruct during serialization. + """ + author = ModelState( + "testapp", + "Author", + [ + ("id", models.AutoField(primary_key=True)), + ("name", models.CharField( + max_length=200, + # IntegerField intentionally not instantiated. + default=models.IntegerField, + )) + ], + ) + # Make state + before = self.make_project_state([]) + after = self.make_project_state([author]) + autodetector = MigrationAutodetector(before, after) + changes = autodetector._detect_changes() + self.assertNumberMigrations(changes, 'testapp', 1) + self.assertOperationTypes(changes, 'testapp', 0, ["CreateModel"]) + def test_replace_string_with_foreignkey(self): """ Adding an FK in the same "spot" as a deleted CharField should work. (#22300).