diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-11-11 21:00:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-11-11 21:00:21 +0000 |
| commit | 1dd0f23e8d74aa7edc8dd309093a95171e2e8f09 (patch) | |
| tree | dda63840955464c225ecf0b09481275bbbf73ac9 /lib/sqlalchemy/sql/selectable.py | |
| parent | 604611e7e522269ee11b314fb6fb75873a465494 (diff) | |
| parent | 8e91cfe529b9b0150c16e52e22e4590bfbbe79fd (diff) | |
| download | sqlalchemy-1dd0f23e8d74aa7edc8dd309093a95171e2e8f09.tar.gz | |
Merge "establish consistency for RETURNING column labels" into main
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 9de015774..488dfe721 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -2193,7 +2193,9 @@ class SelectsRows(ReturnsRows): _label_style: SelectLabelStyle = LABEL_STYLE_NONE def _generate_columns_plus_names( - self, anon_for_dupe_key: bool + self, + anon_for_dupe_key: bool, + cols: Optional[_SelectIterable] = None, ) -> List[_ColumnsPlusNames]: """Generate column names as rendered in a SELECT statement by the compiler. @@ -2204,7 +2206,9 @@ class SelectsRows(ReturnsRows): _column_naming_convention as well. """ - cols = self._all_selected_columns + + if cols is None: + cols = self._all_selected_columns key_naming_convention = SelectState._column_naming_convention( self._label_style |