Fix reqs and Flask Migrate Order

migrations/env.py

@@ -1,13 +1,8 @@
 from __future__ import with_statement
-
-import logging
-from logging.config import fileConfig
-
-from sqlalchemy import engine_from_config
-from sqlalchemy import pool
-from flask import current_app
-
 from alembic import context
+from sqlalchemy import engine_from_config, pool
+from logging.config import fileConfig
+import logging
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -22,9 +17,9 @@ logger = logging.getLogger('alembic.env')
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-config.set_main_option(
-    'sqlalchemy.url',
-    str(current_app.extensions['migrate'].db.engine.url).replace('%', '%%'))
+from flask import current_app
+config.set_main_option('sqlalchemy.url',
+                       current_app.config.get('SQLALCHEMY_DATABASE_URI').replace("%","%%"))
 target_metadata = current_app.extensions['migrate'].db.metadata
 
 # other values from the config, defined by the needs of env.py,
@@ -46,9 +41,7 @@ def run_migrations_offline():
 
     """
     url = config.get_main_option("sqlalchemy.url")
-    context.configure(
-        url=url, target_metadata=target_metadata, literal_binds=True
-    )
+    context.configure(url=url)
 
     with context.begin_transaction():
         context.run_migrations()
@@ -72,23 +65,22 @@ def run_migrations_online():
                 directives[:] = []
                 logger.info('No changes in schema detected.')
 
-    connectable = engine_from_config(
-        config.get_section(config.config_ini_section),
-        prefix='sqlalchemy.',
-        poolclass=pool.NullPool,
-    )
+    engine = engine_from_config(config.get_section(config.config_ini_section),
+                                prefix='sqlalchemy.',
+                                poolclass=pool.NullPool)
 
-    with connectable.connect() as connection:
-        context.configure(
-            connection=connection,
-            target_metadata=target_metadata,
-            process_revision_directives=process_revision_directives,
-            **current_app.extensions['migrate'].configure_args
-        )
+    connection = engine.connect()
+    context.configure(connection=connection,
+                      target_metadata=target_metadata,
+                      process_revision_directives=process_revision_directives,
+                      render_as_batch=config.get_main_option('sqlalchemy.url').startswith('sqlite:'),
+                      **current_app.extensions['migrate'].configure_args)
 
+    try:
         with context.begin_transaction():
             context.run_migrations()
-
+    finally:
+        connection.close()
 
 if context.is_offline_mode():
     run_migrations_offline()

migrations/versions/b24bf17725d2_add_unique_index_to_settings_table_keys.py

@@ -1,8 +1,8 @@
 """Add unique index to settings table keys
 
 Revision ID: b24bf17725d2
-Revises: 0967658d9c0d
-Create Date: 2021-12-12 20:29:17.103441
+Revises: f41520e41cee
+Create Date: 2023-02-18 00:00:00.000000
 
 """
 from alembic import op
@@ -11,7 +11,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = 'b24bf17725d2'
-down_revision = '0967658d9c0d'
+down_revision = 'f41520e41cee'
 branch_labels = None
 depends_on = None