From 8a28e983df091d94eaba77cb82fbe3ef60a80799 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Tue, 7 Nov 2023 05:32:34 -0500 Subject: Fixed #34946 -- Preserved db_default on combined default field addition. Regression in 7414704e88d73dafbcfbb85f9bc54cb6111439d3. --- django/db/backends/base/schema.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django') 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( -- cgit v1.3