From 029c68e636b8c635ffd35b7a38947be2e3b6e0cf Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 28 Apr 2021 14:11:20 -0400 Subject: ensure SelectState.all_selected_columns not memoized as a generator This regression was found from #6261 before release of 1.4.12 Fixes: #6261 Fixes: #6394 Change-Id: I4c2c5da02dbcf5c2cea26c81d3521de892ef428e --- lib/sqlalchemy/sql/selectable.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/sqlalchemy/sql/selectable.py') diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index f3c500852..ff830dbf6 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -5706,7 +5706,7 @@ class Select( @HasMemoized.memoized_attribute def _all_selected_columns(self): meth = SelectState.get_plugin_class(self).all_selected_columns - return meth(self) + return list(meth(self)) def _exported_columns_iterator(self): meth = SelectState.get_plugin_class(self).exported_columns_iterator @@ -5727,7 +5727,6 @@ class Select( """ cols = self._all_selected_columns - # when use_labels is on: # in all cases == if we see the same label name, use _label_anon_label # for subsequent occurrences of that label -- cgit v1.2.1