Skip to content

Fixed #25569 -- Improved error message for select_related #7622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed #25569 -- Improved error message for select_related #7622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,7 @@ answer newbie questions, and generally made Django that much better:
Ville Säävuori <http://www.unessa.net/>
Vinay Sajip <vinay_sajip@yahoo.co.uk>
Vincent Foley <vfoleybourgon@yahoo.ca>
Vincent Perez <perezv815@gmail.com>
Vitaly Babiy <vbabiy86@gmail.com>
Vladimir Kuzma <vladimirkuzma.ch@gmail.com>
Vlado <vlado@labath.org>
Expand Down
9 changes: 6 additions & 3 deletions django/db/models/sql/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,13 +736,16 @@ def get_related_klass_infos(klass_info, related_klass_infos):
fields_not_found = set(requested.keys()).difference(fields_found)
if fields_not_found:
invalid_fields = ("'%s'" % s for s in fields_not_found)
raise FieldError(
'Invalid field name(s) given in select_related: %s. '
error_msg = 'Invalid field name(s) given in select_related: %s. ' \
'Choices are: %s' % (
', '.join(invalid_fields),
', '.join(_get_field_choices()) or '(none)',
)
)
has_reverse_relations = any((field_name in opts.fields_map
for field_name in fields_not_found))
if has_reverse_relations:
error_msg += '. Reverse relations cannot be used in select_related'
raise FieldError(error_msg)
return related_klass_infos

def deferred_to_columns(self):
Expand Down
4 changes: 3 additions & 1 deletion tests/select_related/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ class SelectRelatedValidationTests(SimpleTestCase):
"""
non_relational_error = "Non-relational field given in select_related: '%s'. Choices are: %s"
invalid_error = "Invalid field name(s) given in select_related: '%s'. Choices are: %s"
invalid_error_with_reverse = "Invalid field name(s) given in select_related: '%s'. " \
"Choices are: %s. Reverse relations cannot be used in select_related"

def test_non_relational_field(self):
with self.assertRaisesMessage(FieldError, self.non_relational_error % ('name', 'genus')):
Expand All @@ -200,7 +202,7 @@ def test_many_to_many_field(self):
list(Pizza.objects.select_related('toppings'))

def test_reverse_relational_field(self):
with self.assertRaisesMessage(FieldError, self.invalid_error % ('child_1', 'genus')):
with self.assertRaisesMessage(FieldError, self.invalid_error_with_reverse % ('child_1', 'genus')):
list(Species.objects.select_related('child_1'))

def test_invalid_field(self):
Expand Down