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.

Closes: #1642
Pull-request: https://github.com/sqlalchemy/alembic/pull/1642
Pull-request-sha: f47c77942042a0cb3432e916f5b307aed5225533

Change-Id: Ida7ada422339caeeb368fa51463a173642dd67a7

diff --git a/alembic/ddl/impl.py b/alembic/ddl/impl.py
index 96b03f6f7c00956706c58cc843f002dd2d8d5854..9331f363a15c924926a85b8607f51e27ede123e6 100644 (file)
--- 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 c7b3905cba35d99777a42432ae2ae555bb54e95d..37afe4577686da383bb3bd874510c684f7a245fe 100644 (file)
--- 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 7cd8d35b0896194dad51e4affa9fd9e094035082..4be04c56ceae17bb02d8c36fa6f001e69b69edc2 100644 (file)
--- 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,