diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-04-22 22:59:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-04-22 22:59:53 +0000 |
| commit | 8971e27a9b5d1923d36f35c2ba1aaaf46f596308 (patch) | |
| tree | 39a0bb6f0058335d99ae6271e7baea2f300f79a6 /lib/sqlalchemy/sql/compiler.py | |
| parent | fb9e12a689f6f5c1266b7cab2eb3d6c2c4ee872e (diff) | |
| parent | 17072f8b04c6a3a989673e85ace163620f9130cd (diff) | |
| download | sqlalchemy-8971e27a9b5d1923d36f35c2ba1aaaf46f596308.tar.gz | |
Merge "omit text from selected_columns; clear memoizations"
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 4c591a87f..6168248ff 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -3156,7 +3156,7 @@ class SQLCompiler(Compiled): entry["select_0"] = select elif compound_index: select_0 = entry["select_0"] - numcols = len(select_0.selected_columns) + numcols = len(select_0._all_selected_columns) if len(compile_state.columns_plus_names) != numcols: raise exc.CompileError( @@ -3168,7 +3168,7 @@ class SQLCompiler(Compiled): 1, numcols, compound_index + 1, - len(select.selected_columns), + len(select._all_selected_columns), ) ) |