Version 1.3b8: Fixes some migrations

This commit is contained in:
Corey Oordt 2015-05-28 20:24:48 -05:00
parent 02780ba2a1
commit 7f8e303a95
2 changed files with 16 additions and 9 deletions

View file

@ -3,7 +3,7 @@ __version_info__ = {
'minor': 3,
'micro': 0,
'releaselevel': 'beta',
'serial': 7
'serial': 8
}

View file

@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, connection
from django.db import connection, transaction
from django.apps import apps
from django.db.utils import ProgrammingError
def table_exists(table_name):
@ -48,10 +49,16 @@ def migrate_app(sender, *args, **kwargs):
fields = [fld for fld in registry._field_registry.keys() if fld.startswith(app_name)]
with connection.schema_editor() as schema_editor:
for fld in fields:
model_name, field_name = fld.split('.')[1:]
if field_exists(app_name, model_name, field_name):
continue
model = app_config.get_model(model_name)
schema_editor.add_field(model, registry._field_registry[fld])
sid = transaction.savepoint()
for fld in fields:
model_name, field_name = fld.split('.')[1:]
if field_exists(app_name, model_name, field_name):
continue
model = app_config.get_model(model_name)
try:
with connection.schema_editor() as schema_editor:
schema_editor.add_field(model, registry._field_registry[fld])
transaction.savepoint_commit(sid)
except ProgrammingError:
transaction.savepoint_rollback(sid)
continue