diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-09-19 09:40:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-09-19 18:39:18 -0400 |
| commit | c9af2ebf5e5d288aea3a3a26bdf950e08ac4f927 (patch) | |
| tree | 5d16ad838a53613ca04b4984db14658e84f187f0 /lib/sqlalchemy/engine/default.py | |
| parent | f0bcd57f9ed76ba8d871448d821a85089f490b6c (diff) | |
| download | sqlalchemy-c9af2ebf5e5d288aea3a3a26bdf950e08ac4f927.tar.gz | |
break out text() from TextualSelect for col matching
Fixed issue where mixing "*" with additional explicitly-named column
expressions within the columns clause of a :func:`_sql.select` construct
would cause result-column targeting to sometimes consider the label name or
other non-repeated names to be an ambiguous target.
Fixes: #8536
Change-Id: I3c845eaf571033e54c9208762344f67f4351ac3a
Diffstat (limited to 'lib/sqlalchemy/engine/default.py')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index 9ad0ebbfc..3a53f8157 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -939,7 +939,7 @@ class DefaultExecutionContext(ExecutionContext): executemany = False compiled: Optional[Compiled] = None result_column_struct: Optional[ - Tuple[List[ResultColumnsEntry], bool, bool, bool] + Tuple[List[ResultColumnsEntry], bool, bool, bool, bool] ] = None returned_default_rows: Optional[Sequence[Row[Any]]] = None @@ -1057,6 +1057,7 @@ class DefaultExecutionContext(ExecutionContext): compiled._result_columns, compiled._ordered_columns, compiled._textual_ordered_columns, + compiled._ad_hoc_textual, compiled._loose_column_name_matching, ) |