Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.6.x] Fixed #19918 -- Modified select_for_update to run on the writ…

…e database.

Backport of 1c64a0f from master
  • Loading branch information...
commit 80b95a2b1fc8c8425a81a23706af971061dc238f 1 parent 363b81c
@kux kux authored timgraham committed
Showing with 14 additions and 1 deletion.
  1. +1 −0  django/db/models/query.py
  2. +13 −1 tests/select_for_update/tests.py
View
1  django/db/models/query.py
@@ -635,6 +635,7 @@ def select_for_update(self, **kwargs):
# Default to false for nowait
nowait = kwargs.pop('nowait', False)
obj = self._clone()
+ obj._for_write = True
obj.query.select_for_update = True
obj.query.select_for_update_nowait = nowait
return obj
View
14 tests/select_for_update/tests.py
@@ -4,12 +4,14 @@
import time
from django.conf import settings
-from django.db import transaction, connection
+from django.db import transaction, connection, router
from django.db.utils import ConnectionHandler, DEFAULT_DB_ALIAS, DatabaseError
from django.test import (TransactionTestCase, skipIfDBFeature,
skipUnlessDBFeature)
from django.utils import unittest
+from multiple_database.tests import TestRouter
+
from .models import Person
# Some tests require threading, which might not be available. So create a
@@ -268,3 +270,13 @@ def test_transaction_dirty_managed(self):
"""
people = list(Person.objects.select_for_update())
self.assertTrue(transaction.is_dirty())
+
+ @skipUnlessDBFeature('has_select_for_update')
+ def test_select_for_update_on_multidb(self):
+ old_routers = router.routers
+ try:
+ router.routers = [TestRouter()]
+ query = Person.objects.select_for_update()
+ self.assertEqual(router.db_for_write(Person), query.db)
+ finally:
+ router.routers = old_routers
Please sign in to comment.
Something went wrong with that request. Please try again.