Use same database URLs as Flask-SQLAlchemy (Fixes #276)

miguelgrinberg · Aug 3, 2019 · 4a180b7 · 4a180b7
1 parent d501d8b
commit 4a180b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/flask_migrate/templates/flask-multidb/env.py b/flask_migrate/templates/flask-multidb/env.py
@@ -27,13 +27,15 @@
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
 config.set_main_option(
-    'sqlalchemy.url', current_app.config.get(
-        'SQLALCHEMY_DATABASE_URI').replace('%', '%%'))
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
 bind_names = []
-for name, url in current_app.config.get("SQLALCHEMY_BINDS").items():
-    context.config.set_section_option(name, "sqlalchemy.url", url.replace(
-        '%', '%%'))
-    bind_names.append(name)
+for bind in current_app.config.get("SQLALCHEMY_BINDS"):
+    context.config.set_section_option(
+        bind, "sqlalchemy.url",
+        str(current_app.extensions['migrate'].db.get_engine(
+            current_app, bind).url).replace('%', '%%'))
+    bind_names.append(bind)
 target_metadata = current_app.extensions['migrate'].db.metadata
 
 

diff --git a/flask_migrate/templates/flask/env.py b/flask_migrate/templates/flask/env.py
@@ -23,8 +23,8 @@
 # target_metadata = mymodel.Base.metadata
 from flask import current_app
 config.set_main_option(
-    'sqlalchemy.url', current_app.config.get(
-        'SQLALCHEMY_DATABASE_URI').replace('%', '%%'))
+    'sqlalchemy.url',
+    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
 target_metadata = current_app.extensions['migrate'].db.metadata
 
 # other values from the config, defined by the needs of env.py,