summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-07-21 10:09:31 +0100
committerAndrew Godwin <andrew@aeracode.org>2014-07-21 10:09:31 +0100
commit2984b30ce84eccedfcc5b5241d12720913d0b80a (patch)
tree0000ffd55720cb4ab9a3c38ce0cc0fed9b69c864
parent5875b8d13333bf709b54f91a143304826d57f2fd (diff)
Fixed #23039: Don't try to serialize unmanaged models in tests
-rw-r--r--django/db/backends/creation.py2
-rw-r--r--tests/migration_test_data_persistence/models.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py
index e8308c9a91..4e6c1e52c6 100644
--- a/django/db/backends/creation.py
+++ b/django/db/backends/creation.py
@@ -424,7 +424,7 @@ class BaseDatabaseCreation(object):
# Make a function to iteratively return every object
def get_objects():
for model in sort_dependencies(app_list):
- if not model._meta.proxy and router.allow_migrate(self.connection.alias, model):
+ if not model._meta.proxy and model._meta.managed and router.allow_migrate(self.connection.alias, model):
queryset = model._default_manager.using(self.connection.alias).order_by(model._meta.pk.name)
for obj in queryset.iterator():
yield obj
diff --git a/tests/migration_test_data_persistence/models.py b/tests/migration_test_data_persistence/models.py
index 1b0b795d2c..c1572d5ddf 100644
--- a/tests/migration_test_data_persistence/models.py
+++ b/tests/migration_test_data_persistence/models.py
@@ -3,3 +3,10 @@ from django.db import models
class Book(models.Model):
title = models.CharField(max_length=100)
+
+
+class Unmanaged(models.Model):
+ title = models.CharField(max_length=100)
+
+ class Meta:
+ managed = False