diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-02-17 00:20:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-02-17 00:20:00 +0000 |
| commit | fa1026cd7c24d4b6e1bc2dba6e0f3d83fb8cf064 (patch) | |
| tree | a8170adffc27609da7bf02bbea49196fc9d11eaf /lib/sqlalchemy/sql | |
| parent | d832676e90643ac2a8a30570e393f1de7a43900a (diff) | |
| parent | 81993801dd39dd4a5973f8500e849f35ac07f2f3 (diff) | |
| download | sqlalchemy-fa1026cd7c24d4b6e1bc2dba6e0f3d83fb8cf064.tar.gz | |
Merge "modernize hybrids and apply typing" into main
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/_typing.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/_typing.py b/lib/sqlalchemy/sql/_typing.py index e1190f7dd..ab124103f 100644 --- a/lib/sqlalchemy/sql/_typing.py +++ b/lib/sqlalchemy/sql/_typing.py @@ -40,7 +40,6 @@ if TYPE_CHECKING: from .dml import UpdateBase from .dml import ValuesBase from .elements import ClauseElement - from .elements import ColumnClause from .elements import ColumnElement from .elements import KeyedColumnElement from .elements import quoted_name @@ -224,7 +223,10 @@ _SelectStatementForCompoundArgument = Union[ """SELECT statement acceptable by ``union()`` and other SQL set operations""" _DMLColumnArgument = Union[ - str, "ColumnClause[Any]", _HasClauseElement, roles.DMLColumnRole + str, + _HasClauseElement, + roles.DMLColumnRole, + "SQLCoreOperations", ] """A DML column expression. This is a "key" inside of insert().values(), update().values(), and related. diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 21b83d556..75b5d09e3 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -3561,7 +3561,7 @@ class SelectBase( .. seealso:: - :meth:`_expression.SelectBase.as_scalar`. + :meth:`_expression.SelectBase.scalar_subquery`. """ return self.scalar_subquery().label(name) |