server_onupdate cannot be a function. improve tests (#160)

Author: CaselIT

sqlalchemy-stubs/sql/schema.pyi

@@ -56,7 +56,6 @@ _CP = TypeVar("_CP", bound=Computed)
 _ID = TypeVar("_ID", bound=Identity)
 
 _ServerDefaultType = Union[FetchedValue, str, TextClause, ColumnElement[_T]]
-_ServerOnUpdateType = Union[FetchedValue, FunctionElement]
 
 class SchemaItem(SchemaEventTarget, visitors.Visitable):
     __visit_name__: str = ...
@@ -145,7 +144,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_TE]):
     nullable: bool = ...
     default: Optional[Any] = ...
     server_default: Optional[_ServerDefaultType[_TE]] = ...
-    server_onupdate: Optional[_ServerOnUpdateType] = ...
+    server_onupdate: Optional[FetchedValue] = ...
     index: Optional[bool] = ...
     unique: Optional[bool] = ...
     system: bool = ...
@@ -172,7 +171,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_TE]):
         onupdate: Optional[Any] = ...,
         primary_key: bool = ...,
         server_default: Optional[_ServerDefaultType[Any]] = ...,
-        server_onupdate: Optional[_ServerOnUpdateType] = ...,
+        server_onupdate: Optional[FetchedValue] = ...,
         quote: Optional[bool] = ...,
         unique: Optional[bool] = ...,
         system: bool = ...,
@@ -193,7 +192,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_TE]):
         onupdate: Optional[Any] = ...,
         primary_key: bool = ...,
         server_default: Optional[_ServerDefaultType[Any]] = ...,
-        server_onupdate: Optional[_ServerOnUpdateType] = ...,
+        server_onupdate: Optional[FetchedValue] = ...,
         quote: Optional[bool] = ...,
         unique: Optional[bool] = ...,
         system: bool = ...,
@@ -216,7 +215,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_TE]):
         onupdate: Optional[Any] = ...,
         primary_key: bool = ...,
         server_default: Optional[_ServerDefaultType[_TE]] = ...,
-        server_onupdate: Optional[_ServerOnUpdateType] = ...,
+        server_onupdate: Optional[FetchedValue] = ...,
         quote: Optional[bool] = ...,
         unique: Optional[bool] = ...,
         system: bool = ...,
@@ -238,7 +237,7 @@ class Column(DialectKWArgs, SchemaItem, ColumnClause[_TE]):
         onupdate: Optional[Any] = ...,
         primary_key: bool = ...,
         server_default: Optional[_ServerDefaultType[_TE]] = ...,
-        server_onupdate: Optional[_ServerOnUpdateType] = ...,
+        server_onupdate: Optional[FetchedValue] = ...,
         quote: Optional[bool] = ...,
         unique: Optional[bool] = ...,
         system: bool = ...,

test/files/column_server_default.py

@@ -0,0 +1,43 @@
+from sqlalchemy import Boolean
+from sqlalchemy import Column
+from sqlalchemy import DateTime
+from sqlalchemy import FetchedValue
+from sqlalchemy import Integer
+from sqlalchemy import literal_column
+from sqlalchemy import text
+from sqlalchemy import true
+from sqlalchemy.orm import registry
+from sqlalchemy.sql import functions as func
+
+reg: registry = registry()
+
+
+@reg.mapped
+class A:
+    __tablename__ = "a"
+
+    b = Column(Boolean, nullable=False, server_default=true())
+    c = Column(DateTime, server_default=func.now(), nullable=False)
+
+    # EXPECTED_MYPY: Cannot infer type argument 1 of "Column"
+    d = Column(Boolean, server_default=func.now(), nullable=False)
+
+    e = Column(DateTime, server_default="now()")
+    f = Column(DateTime, server_default=text("now()"))
+    g = Column(DateTime, server_default=FetchedValue())
+    h = Column(Boolean, server_default=literal_column("false", Boolean))
+
+    # overload 1: (__name: str, *args, ...)
+    overload1: int = Column(
+        "name", server_default=FetchedValue(), nullable=False
+    )
+    # overload 2: (*args, ...)
+    Column(server_default="now()", nullable=False)
+    # overload 3: (__name: str, __type: _TE, *args, ...)
+    overload3 = Column(
+        "name", Integer, server_default=text("now()"), nullable=False
+    )
+    # overload 4: (__type: _TE, *args, ...)
+    overload4 = Column(
+        Integer, server_default=literal_column("42", Integer), nullable=False
+    )

test/files/column_server_default_ticket_81.py

@@ -1,6 +1,6 @@
 from sqlalchemy import Column
+from sqlalchemy import FetchedValue
 from sqlalchemy.orm import registry
-from sqlalchemy.sql import functions as func
 from sqlalchemy.types import Integer
 
 reg: registry = registry()
@@ -11,10 +11,10 @@ class ColumnServerOnUpdateArgument:
     __tablename__ = "onupdate"
 
     # overload 1: (__name: str, *args, ...)
-    overload1: int = Column("name", server_onupdate=func.now(), nullable=False)
+    overload1: int = Column("name", server_onupdate=FetchedValue(), nullable=False)
     # overload 2: (*args, ...)
-    Column(server_onupdate=func.now(), nullable=False)
+    Column(server_onupdate=FetchedValue(), nullable=False)
     # overload 3: (__name: str, __type: _TE, *args, ...)
-    overload3 = Column("name", Integer, server_onupdate=func.now(), nullable=False)
+    overload3 = Column("name", Integer, server_onupdate=FetchedValue(), nullable=False)
     # overload 4: (__type: _TE, *args, ...)
-    overload4 = Column(Integer, server_onupdate=func.now(), nullable=False)
+    overload4 = Column(Integer, server_onupdate=FetchedValue(), nullable=False)