mirror of
https://github.com/django/django.git
synced 2025-10-29 16:46:11 +00:00
boulder-oracle-sprint: Merged to [5113]
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -173,6 +173,8 @@ def _get_sql_model_create(model, known_models=set()):
|
||||
for f in opts.fields:
|
||||
if isinstance(f, (models.ForeignKey, models.OneToOneField)):
|
||||
rel_field = f.rel.get_related_field()
|
||||
while isinstance(rel_field, (models.ForeignKey, models.OneToOneField)):
|
||||
rel_field = rel_field.rel.get_related_field()
|
||||
data_type = get_rel_data_type(rel_field)
|
||||
else:
|
||||
rel_field = f
|
||||
@@ -1377,6 +1379,8 @@ def load_data(fixture_labels, verbosity=1):
|
||||
from django.conf import settings
|
||||
import sys
|
||||
|
||||
disable_termcolors()
|
||||
|
||||
# Keep a count of the installed objects and fixtures
|
||||
count = [0,0]
|
||||
models = set()
|
||||
|
||||
Reference in New Issue
Block a user