diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-04-29 10:44:48 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-04-29 10:44:48 -0400 |
| commit | 0faee1bbf20cb4a2599888b427b8015ec5f3c890 (patch) | |
| tree | 69b844a82911cd1d46a013c73b47618a3b18ea47 /lib | |
| parent | 5eb748f39942ff34286833cd3e9146fce7bf29af (diff) | |
| download | sqlalchemy-0faee1bbf20cb4a2599888b427b8015ec5f3c890.tar.gz | |
Restore a line break that is needed for a clean merge
Change-Id: Ib433920080ba159a1478c48d2f837bc71bf5bbbc
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 98e997078..ab49a4dcc 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -2762,6 +2762,7 @@ class Query(Generative): elif prop: # joining to selectable with a mapper property given # as the ON clause + if not right_selectable.is_derived_from( right_mapper.persist_selectable ): |