diff options
| author | Federico Caselli <cfederico87@gmail.com> | 2020-05-14 21:51:59 +0200 |
|---|---|---|
| committer | Federico Caselli <cfederico87@gmail.com> | 2020-05-15 18:42:41 +0200 |
| commit | 8c10e29dc7aa2356d0f3f5110b2c9dade9d87096 (patch) | |
| tree | 81ec2b2fa755f1d0a1ce95d90d7c2e6e3aa994eb /lib/sqlalchemy/orm/query.py | |
| parent | 79de84b25e87bbb7fa94f0dd513b4abc76e05a7e (diff) | |
| download | sqlalchemy-8c10e29dc7aa2356d0f3f5110b2c9dade9d87096.tar.gz | |
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
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 11 |
1 files changed, 10 insertions, 1 deletions
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) |