catch AttributeError instead of TypeError

miguelgrinberg · Sep 11, 2023 · 8980a34 · 8980a34
1 parent 821e37f
commit 8980a34
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/flask_migrate/templates/aioflask-multidb/env.py b/src/flask_migrate/templates/aioflask-multidb/env.py
@@ -23,7 +23,7 @@ def get_engine(bind_key=None):
     try:
         # this works with Flask-SQLAlchemy<3 and Alchemical
         return current_app.extensions['migrate'].db.get_engine(bind=bind_key)
-    except TypeError:
+    except (TypeError, AttributeError):
         # this works with Flask-SQLAlchemy>=3
         return current_app.extensions['migrate'].db.engines.get(bind_key)
 

diff --git a/src/flask_migrate/templates/aioflask/env.py b/src/flask_migrate/templates/aioflask/env.py
@@ -20,7 +20,7 @@ def get_engine():
     try:
         # this works with Flask-SQLAlchemy<3 and Alchemical
         return current_app.extensions['migrate'].db.get_engine()
-    except TypeError:
+    except (TypeError, AttributeError):
         # this works with Flask-SQLAlchemy>=3
         return current_app.extensions['migrate'].db.engine
 

diff --git a/src/flask_migrate/templates/flask-multidb/env.py b/src/flask_migrate/templates/flask-multidb/env.py
@@ -20,10 +20,10 @@
 
 def get_engine(bind_key=None):
     try:
-        # this works with Flask-SQLAlchemy<3 and Alchemical
+        # this works with Flask-SQLAlchemy<3.0 and Alchemical
         return current_app.extensions['migrate'].db.get_engine(bind=bind_key)
-    except TypeError:
-        # this works with Flask-SQLAlchemy>=3
+    except (TypeError, AttributeError):
+        # this works with Flask-SQLAlchemy>=3.0
         return current_app.extensions['migrate'].db.engines.get(bind_key)
 
 

diff --git a/src/flask_migrate/templates/flask/env.py b/src/flask_migrate/templates/flask/env.py
@@ -19,7 +19,7 @@ def get_engine():
     try:
         # this works with Flask-SQLAlchemy<3 and Alchemical
         return current_app.extensions['migrate'].db.get_engine()
-    except TypeError:
+    except (TypeError, AttributeError):
         # this works with Flask-SQLAlchemy>=3
         return current_app.extensions['migrate'].db.engine