diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-16 12:29:23 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-16 12:29:23 +0000 |
| commit | 2cd48bac7ee7a5c4dded039439f9b6aaf566696e (patch) | |
| tree | e3c27de17d7889da09c1bbbdbebfe8ac59c0ad49 /django/db/models/fields | |
| parent | 94a968cfc60e16d3fa8180ae76dce35bc931e374 (diff) | |
Fixed #13358 -- Ensured that db_manager() can be used to override database routing on M2M, reverse FK and generic key queries. Thanks to Craig Kimerer for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/fields')
| -rw-r--r-- | django/db/models/fields/related.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 0677f2cda0..1e016fa7e1 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -406,7 +406,7 @@ class ForeignRelatedObjectsDescriptor(object): class RelatedManager(superclass): def get_query_set(self): - db = router.db_for_read(rel_model, instance=instance) + db = self._db or router.db_for_read(rel_model, instance=instance) return superclass.get_query_set(self).using(db).filter(**(self.core_filters)) def add(self, *objs): @@ -480,7 +480,7 @@ def create_many_related_manager(superclass, rel=False): raise ValueError("%r instance needs to have a primary key value before a many-to-many relationship can be used." % instance.__class__.__name__) def get_query_set(self): - db = router.db_for_read(self.instance.__class__, instance=self.instance) + db = self._db or router.db_for_read(self.instance.__class__, instance=self.instance) return superclass.get_query_set(self).using(db)._next_is_sticky().filter(**(self.core_filters)) # If the ManyToMany relation has an intermediary model, |