mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
[multi-db] Fixed bug in execution of pending references in install.
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@4137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e4e6bf0712
commit
c000f6a480
@ -423,8 +423,7 @@ def _install(app, commit=True, initial_data=True, pending_allowed=False,
|
||||
manager = model._default_manager
|
||||
if model in models_installed:
|
||||
for rel_class, f in pending[model]:
|
||||
for statement in manager.get_pending(rel_class, f):
|
||||
statement.execute()
|
||||
manager.get_pending(rel_class, f).execute()
|
||||
pending.pop(model)
|
||||
elif not pending_allowed:
|
||||
raise Exception("%s is not installed, but it has pending "
|
||||
|
@ -147,6 +147,9 @@ class Manager(object):
|
||||
return pending
|
||||
|
||||
def get_pending(self, rel_class, f):
|
||||
"""Get list pending statement relating my model to rel_class via
|
||||
field f
|
||||
"""
|
||||
builder = self.db.get_creation_module().builder
|
||||
return builder.get_ref_sql(self.model, rel_class, f)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user