mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Fixed #25040 -- Fixed migrations state crash with GenericForeignKey

Browse Source 
Backport of 60f795c0608119cdb02d61d3eb59f34ebdb55754 from master
This commit is contained in:
Kai Richard Koenig 2015-07-01 09:21:17 +02:00 committed by Tim Graham
parent 0e3a8c22df
commit 181528726e
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/state.py
View File

@ -45,7 +45,7 @@ def get_related_models_recursive(model):
def _related_models(m): def _related_models(m):
return [ return [
f.related_model for f in m._meta.get_fields(include_parents=True, include_hidden=True) f.related_model for f in m._meta.get_fields(include_parents=True, include_hidden=True)
if f.is_relation and not isinstance(f.related_model, six.string_types) if f.is_relation and f.related_model is not None and not isinstance(f.related_model, six.string_types)
] + [ ] + [
subclass for subclass in m.__subclasses__() subclass for subclass in m.__subclasses__()
if issubclass(subclass, models.Model) if issubclass(subclass, models.Model)

2
docs/releases/1.8.5.txt
View File

@ -11,3 +11,5 @@ Bugfixes
* Fixed ``AssertionError`` in some delete queries with a model containing a * Fixed ``AssertionError`` in some delete queries with a model containing a
field that is both a foreign and primary key (:ticket:`24951`). field that is both a foreign and primary key (:ticket:`24951`).
* Fixed a migrations crash with ``GenericForeignKey`` (:ticket:`25040`).

7
tests/migrations/test_state.py
View File

@ -1,4 +1,5 @@
from django.apps.registry import Apps from django.apps.registry import Apps
from django.contrib.contenttypes.fields import GenericForeignKey
from django.db import models from django.db import models
from django.db.migrations.operations import ( from django.db.migrations.operations import (
AddField, AlterField, DeleteModel, RemoveField, AddField, AlterField, DeleteModel, RemoveField,
@ -976,6 +977,12 @@ class RelatedModelsTests(SimpleTestCase):
self.assertRelated(S, [A, B, T]) self.assertRelated(S, [A, B, T])
self.assertRelated(T, [A, B, S]) self.assertRelated(T, [A, B, S])
def test_generic_fk(self):
A = self.create_model("A", foreign_keys=[models.ForeignKey('B'), GenericForeignKey()])
B = self.create_model("B", foreign_keys=[models.ForeignKey('C')])
self.assertRelated(A, [B])
self.assertRelated(B, [A])
def test_abstract_base(self): def test_abstract_base(self):
A = self.create_model("A", abstract=True) A = self.create_model("A", abstract=True)
B = self.create_model("B", bases=(A,)) B = self.create_model("B", bases=(A,))