From 8c10e29dc7aa2356d0f3f5110b2c9dade9d87096 Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Thu, 14 May 2020 21:51:59 +0200 Subject: Improve error message when using :meth:`_query.Query.filter_by` in a query where the first entity is not a mapped class. Fixes: #5260 Change-Id: I18cfccc0f3e587cb3df3e1f5f23b6885d5f2f466 --- lib/sqlalchemy/orm/query.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 6e22a6904..090e3a972 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1784,8 +1784,17 @@ class Query(Generative): """ + zero = self._joinpoint_zero() + if zero is None: + raise sa_exc.InvalidRequestError( + "Can't use filter_by when the first entity '%s' of a query " + "is not a mapped class. Please use the filter method instead, " + "or change the order of the entities in the query" + % self._query_entity_zero() + ) + clauses = [ - _entity_descriptor(self._joinpoint_zero(), key) == value + _entity_descriptor(zero, key) == value for key, value in kwargs.items() ] return self.filter(*clauses) -- cgit v1.2.1