summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2012-09-19 10:06:53 -0600
committerCarl Meyer <carl@oddbird.net>2012-09-19 10:06:53 -0600
commit901af865505310a70dd02ea5b3becbf45819b652 (patch)
tree81ac520a776fb9aaa12f831a23c202ce5b19baf6 /django
parent44767f2caf028d89e1a283d04bb552d0e18bb936 (diff)
Fixed #16865 -- Made get_or_create use read database for initial get query.
Thanks Rick van Hattem for the report and trbs for the patch.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 8bf08b7a93..441426a107 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -455,9 +455,9 @@ class QuerySet(object):
if f.attname in lookup:
lookup[f.name] = lookup.pop(f.attname)
try:
- self._for_write = True
return self.get(**lookup), False
except self.model.DoesNotExist:
+ self._for_write = True
try:
params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
params.update(defaults)