summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/_orm_constructors.py8
-rw-r--r--lib/sqlalchemy/orm/base.py2
-rw-r--r--lib/sqlalchemy/sql/schema.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py
index 38d984438..e27a29729 100644
--- a/lib/sqlalchemy/orm/_orm_constructors.py
+++ b/lib/sqlalchemy/orm/_orm_constructors.py
@@ -403,7 +403,7 @@ def column_property(
@overload
def composite(
- _class_or_attr: Type[_CC],
+ _class_or_attr: _CompositeAttrType[Any],
*attrs: _CompositeAttrType[Any],
group: Optional[str] = None,
deferred: bool = False,
@@ -418,13 +418,13 @@ def composite(
info: Optional[_InfoType] = None,
doc: Optional[str] = None,
**__kw: Any,
-) -> Composite[_CC]:
+) -> Composite[Any]:
...
@overload
def composite(
- _class_or_attr: _CompositeAttrType[Any],
+ _class_or_attr: Type[_CC],
*attrs: _CompositeAttrType[Any],
group: Optional[str] = None,
deferred: bool = False,
@@ -439,7 +439,7 @@ def composite(
info: Optional[_InfoType] = None,
doc: Optional[str] = None,
**__kw: Any,
-) -> Composite[Any]:
+) -> Composite[_CC]:
...
diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py
index 20a683d8c..e4a69a352 100644
--- a/lib/sqlalchemy/orm/base.py
+++ b/lib/sqlalchemy/orm/base.py
@@ -77,7 +77,7 @@ class LoaderCallableStatus(Enum):
"""
ATTR_EMPTY = 3
- """Symbol used internally to indicate an attribute had no callable.""",
+ """Symbol used internally to indicate an attribute had no callable."""
NO_VALUE = 4
"""Symbol which may be placed as the 'previous' value of an attribute,
diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index bbf78e6a1..5bfbd37c7 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -105,7 +105,7 @@ if typing.TYPE_CHECKING:
_T = TypeVar("_T", bound="Any")
_SI = TypeVar("_SI", bound="SchemaItem")
-_ServerDefaultType = Union["FetchedValue", str, TextClause, ColumnElement]
+_ServerDefaultType = Union["FetchedValue", str, TextClause, ColumnElement[Any]]
_TAB = TypeVar("_TAB", bound="Table")