Merge pull request #1648 from tandreas/fix_different_bind_joins

Fix scaffold_auto_joins for differnet binds.

flask_admin/contrib/sqla/view.py

@@ -765,6 +765,12 @@ class ModelView(BaseModelView):
                 if p.mapper.class_ == self.model:
                     continue
 
+                # Check if it is pointing to a differnet bind
+                source_bind = getattr(self.model, '__bind_key__', None)
+                target_bind = getattr(p.mapper.class_, '__bind_key__', None)
+                if source_bind != target_bind:
+                    continue
+
                 if p.direction.name in ['MANYTOONE', 'MANYTOMANY']:
                     relations.add(p.key)
 

flask_admin/tests/sqla/test_basic.py

@@ -2218,6 +2218,34 @@ def test_multipath_joins():
     eq_(rv.status_code, 200)
 
 
+def test_different_bind_joins():
+    app, db, admin = setup()
+    app.config['SQLALCHEMY_BINDS'] = {
+        'other': 'sqlite:///'
+    }
+
+    class Model1(db.Model):
+        id = db.Column(db.Integer, primary_key=True)
+        val1 = db.Column(db.String(20))
+
+    class Model2(db.Model):
+        __bind_key__ = 'other'
+        id = db.Column(db.Integer, primary_key=True)
+        val1 = db.Column(db.String(20))
+        first_id = db.Column(db.Integer, db.ForeignKey(Model1.id))
+        first = db.relationship(Model1)
+
+    db.create_all()
+
+    view = CustomModelView(Model2, db.session)
+    admin.add_view(view)
+
+    client = app.test_client()
+
+    rv = client.get('/admin/model2/')
+    eq_(rv.status_code, 200)
+
+
 def test_model_default():
     app, db, admin = setup()
     _, Model2 = create_models(db)