diff options
| author | Simon Charette <charette.s@gmail.com> | 2023-11-07 05:32:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 13:32:34 +0300 |
| commit | 8a28e983df091d94eaba77cb82fbe3ef60a80799 (patch) | |
| tree | 9b5f19489847af88fafbc1af4348024ed2b00338 /django | |
| parent | 656192c2c96bb955a399d92f381e38fe2254fe17 (diff) | |
Fixed #34946 -- Preserved db_default on combined default field addition.
Regression in 7414704e88d73dafbcfbb85f9bc54cb6111439d3.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/backends/base/schema.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py index 191809441a..ef859907de 100644 --- a/django/db/backends/base/schema.py +++ b/django/db/backends/base/schema.py @@ -744,9 +744,9 @@ class BaseDatabaseSchemaEditor: } self.execute(sql, params) # Drop the default if we need to - # (Django usually does not use in-database defaults) if ( - not self.skip_default_on_alter(field) + field.db_default is NOT_PROVIDED + and not self.skip_default_on_alter(field) and self.effective_default(field) is not None ): changes_sql, params = self._alter_column_default_sql( |
