diff options
| author | Simon Charette <charette.s@gmail.com> | 2015-11-11 00:49:35 -0500 |
|---|---|---|
| committer | Simon Charette <charette.s@gmail.com> | 2015-11-11 12:42:53 -0500 |
| commit | fd1426570e7601128745d0e524704412c4431749 (patch) | |
| tree | de8ed18674df9072026d529f59dea6aaebb59274 /django | |
| parent | 3d037b9f689d287567d5961939817d96907a1459 (diff) | |
[1.7.x] Refs #25693 -- Added a regression test for `to_attr` validation on forward m2m.
Backport of cc8c02fa0fa2119704d1c39ca8509850aef84acc from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index ac68bec0dd..a81ee569f6 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -10,7 +10,7 @@ from django.conf import settings from django.core import exceptions from django.db import connections, router, transaction, IntegrityError from django.db.models.constants import LOOKUP_SEP -from django.db.models.fields import AutoField, Empty +from django.db.models.fields import AutoField, Empty, FieldDoesNotExist from django.db.models.query_utils import (Q, select_related_descend, deferred_class_factory, InvalidQuery) from django.db.models.deletion import Collector @@ -1912,10 +1912,20 @@ def prefetch_one_level(instances, prefetcher, lookup, level): # We assume that objects retrieved are homogeneous (which is the premise # of prefetch_related), so what applies to first object applies to all. model = instances[0].__class__ - for related_m2m in model._meta.get_all_related_many_to_many_objects(): - if related_m2m.get_accessor_name() == to_attr: - msg = 'to_attr={} conflicts with a field on the {} model.' - raise ValueError(msg.format(to_attr, model.__name__)) + opts = model._meta + conflicts = False + try: + opts.get_field(to_attr) + except FieldDoesNotExist: + for related_m2m in opts.get_all_related_many_to_many_objects(): + if related_m2m.get_accessor_name() == to_attr: + conflicts = True + break + else: + conflicts = True + if conflicts: + msg = 'to_attr={} conflicts with a field on the {} model.' + raise ValueError(msg.format(to_attr, model.__name__)) for obj in instances: instance_attr_val = instance_attr(obj) |
