Ticket #17687: pull-112.patch

new file django/contrib/gis/tests/layermap/routers.py

@@ +1 @@
+class OtherRouter(object):
+    def db_for_read(self, model, **hints):
+        return 'other'
+
+    def db_for_write(self, model, **hints):
+        return self.db_for_read(model, **hints)
+
+    def allow_relation(self, obj1, obj2, **hints):
+        return None
+
+    def allow_syncdb(self, db, model):
+        return True

django/contrib/gis/tests/layermap/tests.py

@@ -6 +6 @@
 
 from django.utils.unittest import TestCase
 
+from django.db.utils import ConnectionRouter
 from django.contrib.gis.gdal import DataSource
 from django.contrib.gis.tests.utils import mysql
 from django.contrib.gis.utils.layermapping import LayerMapping, LayerMapError, InvalidDecimal, MissingForeignKey
@@ -26 +27 @@
 NUMS   = [1, 2, 1, 19, 1] # Number of polygons for each.
 STATES = ['Texas', 'Texas', 'Texas', 'Hawaii', 'Colorado']
 
+OTHER_ROUTER = 'django.contrib.gis.tests.layermap.routers.OtherRouter'
+
 class LayerMapTest(TestCase):
 
     def test01_init(self):
@@ -278 +281 @@
         lm = LayerMapping(Invalid, invalid_shp, invalid_mapping,
                           source_srs=4326)
         lm.save(silent=True)
+
+
+class LayerMapRouterTest(TestCase):
+
+    def setUp(self):
+        from django.contrib.gis.utils import layermapping
+        self._original_router = layermapping.router
+        layermapping.router = ConnectionRouter([OTHER_ROUTER])
+
+    def tearDown(self):
+        from django.contrib.gis.utils import layermapping
+        layermapping.router = self._original_router
+
+    def test01_layermapping_default_db(self):
+        lm = LayerMapping(City, city_shp, city_mapping)
+        self.assertEqual(lm.using, 'other')

django/contrib/gis/utils/layermapping.py

@@ -9 +9 @@
 import sys
 from decimal import Decimal
 from django.core.exceptions import ObjectDoesNotExist
-from django.db import connections, DEFAULT_DB_ALIAS
+from django.db import connections, router
 from django.contrib.gis.db.models import GeometryField
 from django.contrib.gis.gdal import (CoordTransform, DataSource,
     OGRException, OGRGeometry, OGRGeomType, SpatialReference)
@@ -66 +66 @@
     def __init__(self, model, data, mapping, layer=0,
                  source_srs=None, encoding=None,
                  transaction_mode='commit_on_success',
-                 transform=True, unique=None, using=DEFAULT_DB_ALIAS):
+                 transform=True, unique=None, using=None):
         """
         A LayerMapping object is initialized using the given Model (not an instance),
         a DataSource (or string path to an OGR-supported data file), and a mapping
@@ -80 +80 @@
             self.ds = data
         self.layer = self.ds[layer]
 
-        self.using = using
-        self.spatial_backend = connections[using].ops
+        if using is not None:
+            self.using = using
+        else:
+            self.using = router.db_for_write(model)
+        self.spatial_backend = connections[self.using].ops
 
         # Setting the mapping & model attributes.
         self.mapping = mapping