From f47c77942042a0cb3432e916f5b307aed5225533 Mon Sep 17 00:00:00 2001 From: Denis Laxalde Date: Wed, 2 Apr 2025 13:42:28 +0200 Subject: [PATCH] Fix more type hint of server_default Follow-up commit db12e1918556dd463847db9ffb3e761231df9b1d (which is probably sufficient for type checking) by making all annotations of server_default consistent. --- alembic/ddl/impl.py | 4 +++- alembic/ddl/mysql.py | 8 +++++--- alembic/ddl/postgresql.py | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/alembic/ddl/impl.py b/alembic/ddl/impl.py index 96b03f6f..9331f363 100644 --- a/alembic/ddl/impl.py +++ b/alembic/ddl/impl.py @@ -257,7 +257,9 @@ class DefaultImpl(metaclass=ImplMeta): table_name: str, column_name: str, nullable: Optional[bool] = None, - server_default: Union[_ServerDefault, Literal[False]] = False, + server_default: Optional[ + Union[_ServerDefault, Literal[False]] + ] = False, name: Optional[str] = None, type_: Optional[TypeEngine] = None, schema: Optional[str] = None, diff --git a/alembic/ddl/mysql.py b/alembic/ddl/mysql.py index c7b3905c..37afe457 100644 --- a/alembic/ddl/mysql.py +++ b/alembic/ddl/mysql.py @@ -52,7 +52,9 @@ class MySQLImpl(DefaultImpl): table_name: str, column_name: str, nullable: Optional[bool] = None, - server_default: Union[_ServerDefault, Literal[False]] = False, + server_default: Optional[ + Union[_ServerDefault, Literal[False]] + ] = False, name: Optional[str] = None, type_: Optional[TypeEngine] = None, schema: Optional[str] = None, @@ -174,7 +176,7 @@ class MySQLImpl(DefaultImpl): def _is_mysql_allowed_functional_default( self, type_: Optional[TypeEngine], - server_default: Union[_ServerDefault, Literal[False]], + server_default: Optional[Union[_ServerDefault, Literal[False]]], ) -> bool: return ( type_ is not None @@ -325,7 +327,7 @@ class MySQLAlterDefault(AlterColumn): self, name: str, column_name: str, - default: _ServerDefault, + default: Optional[_ServerDefault], schema: Optional[str] = None, ) -> None: super(AlterColumn, self).__init__(name, schema=schema) diff --git a/alembic/ddl/postgresql.py b/alembic/ddl/postgresql.py index 7cd8d35b..4be04c56 100644 --- a/alembic/ddl/postgresql.py +++ b/alembic/ddl/postgresql.py @@ -153,7 +153,9 @@ class PostgresqlImpl(DefaultImpl): table_name: str, column_name: str, nullable: Optional[bool] = None, - server_default: Union[_ServerDefault, Literal[False]] = False, + server_default: Optional[ + Union[_ServerDefault, Literal[False]] + ] = False, name: Optional[str] = None, type_: Optional[TypeEngine] = None, schema: Optional[str] = None, -- 2.47.2