Added support for bind parameter to session.

This fixes pallets-eco#113
plaes · Jul 31, 2013 · 0df8cae · 0df8cae
1 parent 575fa65
commit 0df8cae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -15,6 +15,8 @@ Version 2.0
 - Added a way to control how signals for model modifications are tracked.
 - Made the ``SignallingSession`` a public interface and added a hook
   for customizing session creation.
+- If the ``bind`` parameter is given to the signalling session it will no
+  longer cause an error that a parameter is given twice.
 
 Version 1.0
 -----------

diff --git a/flask_sqlalchemy/__init__.py b/flask_sqlalchemy/__init__.py
@@ -154,8 +154,9 @@ def __init__(self, db, autocommit=False, autoflush=False, **options):
         #: key.
         self.emit_modification_signals = \
             self.app.config['SQLALCHEMY_TRACK_MODIFICATIONS']
+        bind = options.pop('bind', None) or db.engine
         SessionBase.__init__(self, autocommit=autocommit, autoflush=autoflush,
-                             bind=db.engine,
+                             bind=bind,
                              binds=db.get_binds(self.app), **options)
 
     def get_bind(self, mapper, clause=None):