summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Charette <charettes@users.noreply.github.com>2016-04-27 16:17:22 -0400
committerSimon Charette <charettes@users.noreply.github.com>2016-04-27 16:17:22 -0400
commita877a2f83da384944ad6530eb951bcd55dcd8605 (patch)
tree90bc2de6ade04ff8d1422b28b43bb70fc6ab79dc /django
parentfed7004b8a0658d9f898c7139e127a17deff7bba (diff)
Refs #26521 -- Added the duplicated value to CreateModel validation messages.
Thanks Tim for the suggestion.
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/operations/models.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py
index 9526876da2..5fa9addb12 100644
--- a/django/db/migrations/operations/models.py
+++ b/django/db/migrations/operations/models.py
@@ -17,7 +17,7 @@ def _check_for_duplicates(arg_name, objs):
for val in objs:
if val in used_vals:
raise ValueError(
- 'Found duplicate %s in CreateModel operation.' % arg_name
+ "Found duplicate value %s in CreateModel %s argument." % (val, arg_name)
)
used_vals.add(val)
@@ -55,14 +55,14 @@ class CreateModel(ModelOperation):
super(CreateModel, self).__init__(name)
# Sanity-check that there are no duplicated field names, bases, or
# manager names
- _check_for_duplicates("field", (name for name, _ in self.fields))
+ _check_for_duplicates('fields', (name for name, _ in self.fields))
_check_for_duplicates(
- "base",
+ 'bases',
(base._meta.label_lower if isinstance(base, models.base.ModelBase) else base.lower()
for base in self.bases
if base is not models.Model)
)
- _check_for_duplicates("manager", (name for name, _ in self.managers))
+ _check_for_duplicates('managers', (name for name, _ in self.managers))
def deconstruct(self):
kwargs = {