diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-07-18 14:58:26 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-07-18 15:02:39 -0400 |
| commit | 3d41ea09a899b06feedd02864a69b8dc833f5a6b (patch) | |
| tree | 1a1008d7ee2435de90b14abae32e7ade9cd8c845 /lib/sqlalchemy/orm | |
| parent | 32f67637cd705840751bd1d8d37db87df5823a4b (diff) | |
| download | sqlalchemy-3d41ea09a899b06feedd02864a69b8dc833f5a6b.tar.gz | |
Check for non-entity when inspecting for subqueryload
Fixed issue where adding additional non-entity columns to
a query that includes an entity with subqueryload relationships
would fail, due to an inspection added in 1.1.11 as a result of
:ticket:`4011`.
Change-Id: I8ef082be649125bdc07b428cb9b0a77a65d73671
Fixes: #4033
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/strategies.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/strategies.py b/lib/sqlalchemy/orm/strategies.py index 4b9eb3b0f..11ebcee50 100644 --- a/lib/sqlalchemy/orm/strategies.py +++ b/lib/sqlalchemy/orm/strategies.py @@ -985,6 +985,7 @@ class SubqueryLoader(AbstractRelationshipLoader): q._set_select_from( list(set([ ent['entity'] for ent in orig_query.column_descriptions + if ent['entity'] is not None ])), False ) |