diff options
| author | Nick Pope <nick.pope@flightdataservices.com> | 2019-08-02 17:19:55 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-08-02 18:19:55 +0200 |
| commit | 4cf1f2f13ee0927d63b48d0c7d8a8f532e0c0a1e (patch) | |
| tree | 16ca931bcac2179f2ca705e49cacd56486b097ca | |
| parent | 75f8264083c2c938da757fcef3678faee66b1d45 (diff) | |
Simplified AlterModelTable by making it subclass ModelOptionOperation.
| -rw-r--r-- | django/db/migrations/operations/models.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index 3241f53d3c..66ecd606ee 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -428,7 +428,14 @@ class RenameModel(ModelOperation): ) -class AlterModelTable(ModelOperation): +class ModelOptionOperation(ModelOperation): + def reduce(self, operation, app_label=None): + if isinstance(operation, (self.__class__, DeleteModel)) and self.name_lower == operation.name_lower: + return [operation] + return super().reduce(operation, app_label=app_label) + + +class AlterModelTable(ModelOptionOperation): """Rename a model's table.""" def __init__(self, name, table): @@ -477,18 +484,6 @@ class AlterModelTable(ModelOperation): self.table if self.table is not None else "(default)" ) - def reduce(self, operation, app_label=None): - if isinstance(operation, (AlterModelTable, DeleteModel)) and self.name_lower == operation.name_lower: - return [operation] - return super().reduce(operation, app_label=app_label) - - -class ModelOptionOperation(ModelOperation): - def reduce(self, operation, app_label=None): - if isinstance(operation, (self.__class__, DeleteModel)) and self.name_lower == operation.name_lower: - return [operation] - return super().reduce(operation, app_label=app_label) - class AlterTogetherOptionOperation(ModelOptionOperation): option_name = None |
