django
diff --git a/‎.gitignore
Lines changed: 1 addition & 1 deletion b/‎.gitignore
Lines changed: 1 addition & 1 deletion
diff --git a/‎django/contrib/admin/static/admin/css/base.css
Lines changed: 0 additions & 4 deletions b/‎django/contrib/admin/static/admin/css/base.css
Lines changed: 0 additions & 4 deletions
diff --git a/‎django/db/models/query.py
Lines changed: 16 additions & 2 deletions b/‎django/db/models/query.py
Lines changed: 16 additions & 2 deletions
diff --git a/‎tests/get_or_create/tests.py
Lines changed: 38 additions & 0 deletions b/‎tests/get_or_create/tests.py
Lines changed: 38 additions & 0 deletions
diff --git a/‎tests/get_or_create_race/__init__.py b/‎tests/get_or_create_race/__init__.py
diff --git a/‎tests/get_or_create_race/models.py
Lines changed: 0 additions & 12 deletions b/‎tests/get_or_create_race/models.py
Lines changed: 0 additions & 12 deletions
diff --git a/‎tests/get_or_create_race/tests.py
Lines changed: 0 additions & 31 deletions b/‎tests/get_or_create_race/tests.py
Lines changed: 0 additions & 31 deletions
diff --git a/‎tests/test_postgres.py
Lines changed: 0 additions & 26 deletions b/‎tests/test_postgres.py
Lines changed: 0 additions & 26 deletions
@@ -16,4 +16,4 @@ tests/coverage_html/
 tests/.coverage*
 build/
 tests/report/
-tests/screenshots/
+tests/screenshots/
@@ -109,10 +109,6 @@ body {
     background: var(--body-bg);
 }
 
-label {
-    font-size: 1rem;
-}
-
 /* LINKS */
 
 a:link, a:visited {
 
@@ -18,6 +18,7 @@
     IntegrityError,
     NotSupportedError,
     connections,
+    models,
     router,
     transaction,
 )
@@ -979,17 +980,30 @@ def get_or_create(self, defaults=None, **kwargs):
             return self.get(**kwargs), False
         except self.model.DoesNotExist:
             params = self._extract_model_params(defaults, **kwargs)
+            # Try to create an object using passed params.
             try:
                 with transaction.atomic(using=self.db):
                     params = dict(resolve_callables(params))
                     return self.create(**params), True
             except IntegrityError as e:
                 try:
-                    return self.get(**kwargs), False
+                    obj = self.get(**kwargs)
                 except self.model.DoesNotExist:
                     # Re-raise if the object still doesn't exist.
-                    # this wasn't a race condition but an integrity error.
+                    # This wasn't a race condition but an integrity error.
                     raise e
+                else:
+                    # Clear stale reverse OneToOne cache on related object
+                    for field in self.model._meta.fields:
+                        if isinstance(field, models.OneToOneField):
+                            related_obj = kwargs.get(field.name)
+                            if related_obj is not None:
+                                related_cache_attr = field.remote_field.cache_name
+                                related_obj._state.fields_cache.pop(
+                                    related_cache_attr, None
+                                )
+
+                    return obj, False
 
     get_or_create.alters_data = True
 
 
@@ -2,10 +2,12 @@
 import traceback
 from datetime import date, datetime, timedelta
 from threading import Event, Thread, Timer
+from unittest import mock
 from unittest.mock import patch
 
 from django.core.exceptions import FieldError
 from django.db import DatabaseError, IntegrityError, connection
+from django.db.models import QuerySet
 from django.test import TestCase, TransactionTestCase, skipUnlessDBFeature
 from django.test.utils import CaptureQueriesContext
 from django.utils.functional import lazy
@@ -812,3 +814,39 @@ def test_property_attribute_without_setter_kwargs(self):
             Thing.objects.update_or_create(
                 name_in_all_caps="FRANK", defaults={"name": "Frank"}
             )
+
+
+class GetOrCreateOneToOneRaceConditionTest(TestCase):
+    def test_race_condition_does_not_leave_stale_cache(self):
+        person = Person.objects.create(
+            first_name="Brian",
+            last_name="Atkinson",
+            birthday="1980-01-01",
+            defaults="foo",
+            create_defaults="bar",
+        )
+
+        triggered = False
+
+        def effect(*args, **kwargs):
+            nonlocal triggered
+            if not triggered and kwargs.get("person") == person:
+                triggered = True
+                Profile.objects.update_or_create(
+                    person=Person.objects.get(pk=person.pk),
+                    defaults={},
+                )
+            return mock.DEFAULT
+
+        with mock.patch.object(
+            QuerySet,
+            "_extract_model_params",
+            autospec=True,
+            wraps=QuerySet._extract_model_params,
+            side_effect=effect,
+        ):
+            profile, created = Profile.objects.get_or_create(person=person, defaults={})
+            self.assertFalse(created)
+
+        self.assertIsNotNone(profile.person_id)
+        self.assertTrue(Profile.objects.filter(person=person).exists())
Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ body {`
`109`	`109`	`background: var(--body-bg);`
`110`	`110`	`}`
`111`	`111`
`112`		`-label {`
`113`		`- font-size: 1rem;`
`114`		`-}`
`115`		`-`
`116`	`112`	`/* LINKS */`
`117`	`113`
`118`	`114`	`a:link, a:visited {`