Browse files

Fixed #19150 -- Added validation for USERNAME_FIELD being included in…


Thanks to Chris Pagnutti for the suggestion.
  • Loading branch information...
1 parent 04b53eb commit 7a908747a52f7cc12d7006058daad6a6c973c462 @freakboy3742 freakboy3742 committed Oct 20, 2012
Showing with 7 additions and 0 deletions.
  1. +7 −0 django/core/management/
@@ -1,5 +1,6 @@
import sys
+from django.conf import settings
from import color_style
from django.utils.encoding import force_str
from django.utils.itercompat import is_iterable
@@ -48,6 +49,12 @@ def get_validation_errors(outfile, app=None):
# No need to perform any other validation checks on a swapped model.
+ # This is the current User model. Check known validation problems with User models
+ if settings.AUTH_USER_MODEL == '%s.%s' % (opts.app_label, opts.object_name):
+ # Check that the USERNAME FIELD isn't included in REQUIRED_FIELDS.
+ e.add(opts, 'The field named as the USERNAME_FIELD should not be included in REQUIRED_FIELDS on a swappable User model.')
# Model isn't swapped; do field-specific validation.
for f in opts.local_fields:
if == 'id' and not f.primary_key and == 'id':

0 comments on commit 7a90874

Please sign in to comment.