Fixed #19918 -- Modified select_for_update to run on the write database.

2 files changed, 14 insertions, 1 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index a3e0a9540f..4069c04a14 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -742,6 +742,7 @@ class QuerySet(object):
         # 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
diff --git a/tests/select_for_update/tests.py b/tests/select_for_update/tests.py
index 3bd35448b1..f9e7e96ac1 100644
--- a/tests/select_for_update/tests.py
+++ b/tests/select_for_update/tests.py
@@ -5,11 +5,13 @@ import time
 import unittest
 
 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 multiple_database.tests import TestRouter
+
 from .models import Person
 
 # Some tests require threading, which might not be available. So create a
@@ -254,3 +256,13 @@ class SelectForUpdateTests(TransactionTestCase):
         """
         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