Merge pull request #19 from JBKahn/django-1.9-hints

Support DJango 1.9 passing in the model instead of the model name.

Author: JBKahn

django_sharding_library/router.py

@@ -73,20 +73,23 @@ def allow_migrate(self, db, app_label, model_name=None, **hints):
         if settings.DATABASES[db].get('PRIMARY', None):
             return False
         model_name = model_name or hints.get('model_name')
+        model = hints.get('model')
+        if model:
+            model_name = model.__name__
         if not model_name:
             raise InvalidMigrationException(
-                'Model name not provided in migration, please pass a `model_name` with the hints passed into the migration.'
+                'Model name not provided in migration, please pass a `model_name` or `model` with the hints passed into the migration.'
             )
 
         # Sometimes, when extending models from another app i.e. the User Model, the app label
         # is the app label of the app where the change is defined but to app with the model is
         # passed in with the model name.
         try:
-            app = apps.get_app_config(app_label)
+	    app = apps.get_app_config(app_label)
             model = app.get_model(model_name)
         except LookupError:
-            app_label = model_name.split('.')[0]
-            app = apps.get_app_config(app_label)
+	    app_label = model_name.split('.')[0]
+	    app = apps.get_app_config(app_label)
             model = app.get_model(model_name[len(app_label) + 1:])
 
         single_database = self.get_specific_database_or_none(model)

tests/test_router.py

@@ -168,6 +168,14 @@ def test_requires_model_name_to_be_passed_in(self):
         hints = {'model_name': 'User'}
         self.sut.allow_migrate(db='default', app_label='tests', **hints)
 
+    def test_requires_model_to_be_passed_in(self):
+        from django.contrib.auth import get_user_model
+        with self.assertRaises(InvalidMigrationException):
+            self.sut.allow_migrate(db='default', app_label='tests')
+
+        hints = {'model': get_user_model()}
+        self.sut.allow_migrate(db='default', app_label='tests', model_name=None, **hints)
+
     def test_migrate_replica_will_not_work(self):
         self.assertFalse(self.sut.allow_migrate(db='app_shard_001_replica_001', app_label='tests', model_name='TestModel'))
         self.assertTrue(self.sut.allow_migrate(db='app_shard_001', app_label='tests', model_name='TestModel'))