Merge pull request #2326 from cjmayo/init_app

Use SQLAlchemy.init_app() in tests and document

doc/advanced.rst

@@ -199,7 +199,8 @@ from the GeoAlchemy backend, rather than the usual SQLAlchemy backend::
     from flask_admin.contrib.geoa import ModelView
 
     # .. flask initialization
-    db = SQLAlchemy(app)
+    db = SQLAlchemy()
+    db.init_app(app)
 
     class Location(db.Model):
         id = db.Column(db.Integer, primary_key=True)

flask_admin/tests/geoa/__init__.py

@@ -11,7 +11,10 @@ def setup():
     app.config['SQLALCHEMY_ECHO'] = True
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
-    db = SQLAlchemy(app)
+    db = SQLAlchemy()
+    db.init_app(app)
     admin = Admin(app)
 
+    app.app_context().push()
+
     return app, db, admin

flask_admin/tests/geoa/test_basic.py

@@ -23,15 +23,14 @@ class GeoModel(db.Model):
         def __unicode__(self):
             return self.name
 
-    db.create_all()
-
     return GeoModel
 
 
 def test_model():
     app, db, admin = setup()
     GeoModel = create_models(db)
-    db.create_all()
+    with app.app_context():
+        db.create_all()
     GeoModel.query.delete()
     db.session.commit()
 
@@ -130,7 +129,8 @@ def test_model():
 def test_none():
     app, db, admin = setup()
     GeoModel = create_models(db)
-    db.create_all()
+    with app.app_context():
+        db.create_all()
     GeoModel.query.delete()
     db.session.commit()
 

flask_admin/tests/sqla/__init__.py

@@ -11,7 +11,8 @@ def setup():
     app.config['SQLALCHEMY_ECHO'] = True
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
-    db = SQLAlchemy(app)
+    db = SQLAlchemy()
+    db.init_app(app)
     admin = Admin(app)
 
     return app, db, admin
@@ -25,7 +26,8 @@ def setup_postgres():
     app.config['SQLALCHEMY_ECHO'] = True
     app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
-    db = SQLAlchemy(app)
+    db = SQLAlchemy()
+    db.init_app(app)
     admin = Admin(app)
 
     return app, db, admin