Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed 14513 -- check fields with underscores for validity when orderi…

…ng. Bonus points to Klaas van Schelven.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 051bf1cf12b85b1d1df50bca10fb9cc246fb6804 1 parent 085e4c9
@SmileyChris SmileyChris authored
View
2  django/core/management/validation.py
@@ -257,7 +257,7 @@ def get_validation_errors(outfile, app=None):
continue
# Skip ordering in the format field1__field2 (FIXME: checking
# this format would be nice, but it's a little fiddly).
- if '_' in field_name:
+ if '__' in field_name:
continue
try:
opts.get_field(field_name, many_to_many=False)
View
4 tests/modeltests/invalid_models/models.py
@@ -206,6 +206,9 @@ class UniqueFKTarget2(models.Model):
""" Model to test for unique FK target in previously seen model: expect no error """
tgt = models.ForeignKey(FKTarget, to_field='good')
+class NonExistingOrderingWithSingleUnderscore(models.Model):
+ class Meta:
+ ordering = ("does_not_exist",)
model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute that is a positive integer.
invalid_models.fielderrors: "charfield2": CharFields require a "max_length" attribute that is a positive integer.
@@ -311,4 +314,5 @@ class UniqueFKTarget2(models.Model):
invalid_models.uniquem2m: ManyToManyFields cannot be unique. Remove the unique argument on 'unique_people'.
invalid_models.nonuniquefktarget1: Field 'bad' under model 'FKTarget' must have a unique=True constraint.
invalid_models.nonuniquefktarget2: Field 'bad' under model 'FKTarget' must have a unique=True constraint.
+invalid_models.nonexistingorderingwithsingleunderscore: "ordering" refers to "does_not_exist", a field that doesn't exist.
"""
Please sign in to comment.
Something went wrong with that request. Please try again.