Ticket #16865: patch_16865_get_or_create_on_multidb_stuff.diff

django/db/models/query.py

@@ -438 +438 @@
             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:
             try:
-                params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
-                params.update(defaults)
-                obj = self.model(**params)
-                sid = transaction.savepoint(using=self.db)
-                obj.save(force_insert=True, using=self.db)
-                transaction.savepoint_commit(sid, using=self.db)
-                return obj, True
-            except IntegrityError, e:
-                transaction.savepoint_rollback(sid, using=self.db)
-                exc_info = sys.exc_info()
+                read_db = self.db
+                self._for_write = True
+                if read_db == self.db:
+                    raise self.model.DoesNotExist
+                return self.get(**lookup), False
+            except self.model.DoesNotExist:
                 try:
-                    return self.get(**lookup), False
-                except self.model.DoesNotExist:
-                    # Re-raise the IntegrityError with its original traceback.
-                    raise exc_info[1], None, exc_info[2]
+                    params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
+                    params.update(defaults)
+                    obj = self.model(**params)
+                    sid = transaction.savepoint(using=self.db)
+                    obj.save(force_insert=True, using=self.db)
+                    transaction.savepoint_commit(sid, using=self.db)
+                    return obj, True
+                except IntegrityError, e:
+                    transaction.savepoint_rollback(sid, using=self.db)
+                    exc_info = sys.exc_info()
+                    try:
+                        return self.get(**lookup), False
+                    except self.model.DoesNotExist:
+                        # Re-raise the IntegrityError with its original traceback.
+                        raise exc_info[1], None, exc_info[2]
 
     def latest(self, field_name=None):
         """