Fix compatibility with older marshmallow-sqlalchemy versions (#190)

close #189

CHANGELOG.rst

@@ -1,8 +1,15 @@
 Changelog
 =========
 
-(unreleased)
-************
+0.13.0 (unreleased)
+*******************
+
+Bug fixes:
+
+* Fix compatibility with marshmallow-sqlalchemy<0.22.0 (:issue:`189`).
+  Thanks :user:`PatrickRic` for reporting.
+
+Other changes:
 
 * Remove unused ``flask_marshmallow.sqla.SchemaOpts``.
 

azure-pipelines.yml

@@ -38,6 +38,7 @@ jobs:
       - py38-marshmallow2
       - py38-marshmallow3
 
+      - py38-lowest
       - py38-marshmallowdev
 
       - docs

src/flask_marshmallow/__init__.py

@@ -110,9 +110,11 @@ def init_app(self, app):
         """
         app.extensions = getattr(app, "extensions", {})
 
-        # If using Flask-SQLAlchemy, attach db.session to ModelSchema
+        # If using Flask-SQLAlchemy, attach db.session to SQLAlchemySchema
         if has_sqla and "sqlalchemy" in app.extensions:
             db = app.extensions["sqlalchemy"].db
-            self.SQLAlchemySchema.OPTIONS_CLASS.session = db.session
-            self.SQLAlchemyAutoSchema.OPTIONS_CLASS.session = db.session
+            if self.SQLAlchemySchema:
+                self.SQLAlchemySchema.OPTIONS_CLASS.session = db.session
+            if self.SQLAlchemyAutoSchema:
+                self.SQLAlchemyAutoSchema.OPTIONS_CLASS.session = db.session
         app.extensions[EXTENSION_NAME] = self

tests/test_sqla.py

@@ -89,6 +89,10 @@ def absolute_url(self):
         yield Bunch(Author=AuthorModel, Book=BookModel)
         db.drop_all()
 
+    def test_can_initialize_extensions(self, extapp):
+        assert "flask-marshmallow" in extapp.extensions
+        assert "sqlalchemy" in extapp.extensions
+
     @requires_sqlalchemyschema
     def test_can_declare_sqla_schemas(self, extma, models, db):
         class AuthorSchema(extma.SQLAlchemySchema):

tox.ini

@@ -3,7 +3,8 @@ envlist=
     lint
     py{27,35,36,37,38}-marshmallow2
     py{35,36,37,38}-marshmallow3
-    py37-marshmallowdev
+    py38-lowest
+    py38-marshmallowdev
     docs
 
 [testenv]
@@ -12,6 +13,8 @@ deps =
     marshmallow2: marshmallow>=2.0.0,<3.0.0
     marshmallow3: marshmallow>=3.0.0a1,<4.0.0
     marshmallowdev: https://github.com/marshmallow-code/marshmallow/archive/dev.tar.gz
+    lowest: marshmallow>=2.0.0,<3.0.0
+    lowest: marshmallow-sqlalchemy==0.13.0
 commands = pytest {posargs}
 
 [testenv:lint]