Ticket #15361: 15361.diff

django/db/models/query.py

@@ -340 +340 @@
         """
         clone = self.filter(*args, **kwargs)
         if self.query.can_filter():
-            clone = clone.order_by()
+            clone = clone.order_by()[:2]
         num = len(clone)
         if num == 1:
             return clone._result_cache[0]
         if not num:
             raise self.model.DoesNotExist("%s matching query does not exist."
                     % self.model._meta.object_name)
-        raise self.model.MultipleObjectsReturned("get() returned more than one %s -- it returned %s! Lookup parameters were %s"
-                % (self.model._meta.object_name, num, kwargs))
+        raise self.model.MultipleObjectsReturned("get() query returned more than one %s. Lookup parameters were %s"
+                % (self.model._meta.object_name, kwargs))
 
     def create(self, **kwargs):
         """

tests/modeltests/basic/tests.py

@@ -1 +1 @@
 from datetime import datetime
 
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.db import models, DEFAULT_DB_ALIAS, connection
 from django.db.models.fields import FieldDoesNotExist
 from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
@@ -115 +115 @@
         b = Article.objects.get(pk=a.id)
         self.assertEqual(a, b)
 
+        # Create a very similar object
+        a = Article(
+            id=None,
+            headline='Area man programs in Python',
+            pub_date=datetime(2005, 7, 28),
+        )
+        a.save()
+
+        self.assertEqual(Article.objects.count(), 2)
+
+        # Django raises an Article.MultipleObjectsReturned exception if the
+        # lookup matches more than one object
+        self.assertRaisesRegexp(
+            MultipleObjectsReturned,
+            "get\(\) query returned more than one Article\. Lookup parameters were {'headline__startswith': 'Area'}",
+            Article.objects.get,
+            headline__startswith='Area',
+        )
+
+        self.assertRaisesRegexp(
+            MultipleObjectsReturned,
+            "get\(\) query returned more than one Article\. Lookup parameters were {'pub_date__year': 2005}",
+            Article.objects.get,
+            pub_date__year=2005,
+        )
+
+        self.assertRaisesRegexp(
+            MultipleObjectsReturned,
+            "get\(\) query returned more than one Article\. Lookup parameters were {'pub_date__month': 7, 'pub_date__year': 2005}",
+            Article.objects.get,
+            pub_date__year=2005,
+            pub_date__month=7,
+        )
+
     def test_object_creation(self):
         # Create an Article.
         a = Article(