summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2019-01-15 23:39:49 -0600
committerTim Graham <timograham@gmail.com>2019-01-16 14:09:51 -0500
commit9e5e5a657b95ee49923fe3d2691c5d73813b4c53 (patch)
treee90cc99646c58a15b821ef3f656c9d2c656afa02 /django
parent4fc35a9c3efdc9154efce28cb23cb84f8834517e (diff)
Fixed #30044 -- Raised a FieldError on inherited field update attempts.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/query.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 7d991b6b84..675ff8c176 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1600,6 +1600,8 @@ class Query:
field_list = name.split(LOOKUP_SEP)
join_info = self.setup_joins(field_list, self.get_meta(), self.get_initial_alias(), can_reuse=reuse)
targets, final_alias, join_list = self.trim_joins(join_info.targets, join_info.joins, join_info.path)
+ if not allow_joins and len(join_list) > 1:
+ raise FieldError('Joined field references are not permitted in this query')
if len(targets) > 1:
raise FieldError("Referencing multicolumn fields with F() objects "
"isn't supported")