From 0faee1bbf20cb4a2599888b427b8015ec5f3c890 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 29 Apr 2020 10:44:48 -0400 Subject: [PATCH] Restore a line break that is needed for a clean merge Change-Id: Ib433920080ba159a1478c48d2f837bc71bf5bbbc --- lib/sqlalchemy/orm/query.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 98e9970786..ab49a4dccc 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 ): -- 2.47.3