p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replaced Operation._get_model_tuple() by ModelTuple.from_model(). 

This method predated the introduction of ModelTuple and had a single use.
This commit is contained in:
Simon Charette 2020-04-04 00:37:18 -04:00 committed by Mariusz Felisiak
parent 8069526ce3
commit 5ca5178a78
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/db/migrations/operations/base.py
View File

@ -1,5 +1,4 @@
from django.db import router from django.db import router
from django.db.models.fields.related import RECURSIVE_RELATIONSHIP_CONSTANT
class Operation: class Operation:
@ -125,14 +124,6 @@ class Operation:
return [self] return [self]
return False return False
def _get_model_tuple(self, remote_model, app_label, model_name):
if remote_model == RECURSIVE_RELATIONSHIP_CONSTANT:
return app_label, model_name.lower()
elif '.' in remote_model:
return tuple(remote_model.lower().split('.'))
else:
return app_label, remote_model.lower()
def __repr__(self): def __repr__(self):
return "<%s %s%s>" % ( return "<%s %s%s>" % (
self.__class__.__name__, self.__class__.__name__,

2
django/db/migrations/operations/fields.py
View File

@ -339,7 +339,7 @@ class RenameField(FieldOperation):
for index, (name, field) in enumerate(model_state.fields): for index, (name, field) in enumerate(model_state.fields):
remote_field = field.remote_field remote_field = field.remote_field
if remote_field: if remote_field:
remote_model_tuple = self._get_model_tuple( remote_model_tuple = ModelTuple.from_model(
remote_field.model, model_app_label, model_name remote_field.model, model_app_label, model_name
) )
if remote_model_tuple == model_tuple: if remote_model_tuple == model_tuple: