Fixed #27188 -- Allowed using unique=True with FileField.

Thanks Tim Graham for the initial patch.

3 files changed, 11 insertions, 16 deletions

diff --git a/tests/invalid_models_tests/test_ordinary_fields.py b/tests/invalid_models_tests/test_ordinary_fields.py
index 2f16e83d18..aff6a74659 100644
--- a/tests/invalid_models_tests/test_ordinary_fields.py
+++ b/tests/invalid_models_tests/test_ordinary_fields.py
@@ -440,21 +440,6 @@ class FileFieldTests(SimpleTestCase):
         expected = []
         self.assertEqual(errors, expected)
 
-    def test_unique(self):
-        class Model(models.Model):
-            field = models.FileField(unique=False, upload_to='somewhere')
-
-        field = Model._meta.get_field('field')
-        errors = field.check()
-        expected = [
-            Error(
-                "'unique' is not a valid argument for a FileField.",
-                obj=field,
-                id='fields.E200',
-            )
-        ]
-        self.assertEqual(errors, expected)
-
     def test_primary_key(self):
         class Model(models.Model):
             field = models.FileField(primary_key=False, upload_to='somewhere')
diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py
index aeeb6e88da..faa7d08189 100644
--- a/tests/model_fields/models.py
+++ b/tests/model_fields/models.py
@@ -216,7 +216,7 @@ class DataModel(models.Model):
 
 
 class Document(models.Model):
-    myfile = models.FileField(upload_to='unused')
+    myfile = models.FileField(upload_to='unused', unique=True)
 
 ###############################################################################
 # ImageField
diff --git a/tests/model_fields/test_filefield.py b/tests/model_fields/test_filefield.py
index e67b6dd515..3fefcd1fb6 100644
--- a/tests/model_fields/test_filefield.py
+++ b/tests/model_fields/test_filefield.py
@@ -4,6 +4,7 @@ import unittest
 
 from django.core.files import temp
 from django.core.files.uploadedfile import TemporaryUploadedFile
+from django.db.utils import IntegrityError
 from django.test import TestCase, override_settings
 
 from .models import Document
@@ -61,6 +62,15 @@ class FileFieldTests(TestCase):
         Document.objects.create(myfile='something.txt')
         self.assertEqual(Document.objects.defer('myfile')[0].myfile, 'something.txt')
 
+    def test_unique_when_same_filename(self):
+        """
+        A FileField with unique=True shouldn't allow two instances with the
+        same name to be saved.
+        """
+        Document.objects.create(myfile='something.txt')
+        with self.assertRaises(IntegrityError):
+            Document.objects.create(myfile='something.txt')
+
     @unittest.skipIf(sys.platform.startswith('win'), "Windows doesn't support moving open files.")
     # The file's source and destination must be on the same filesystem.
     @override_settings(MEDIA_ROOT=temp.gettempdir())