Merge pull request #403 from atlas-bi/alpha

.version

@@ -1 +1 @@
-2.10.0
+2.10.1-alpha.1

migrations/alembic.ini

@@ -10,7 +10,7 @@
 
 # Logging configuration
 [loggers]
-keys = root,sqlalchemy,alembic
+keys = root,sqlalchemy,alembic,flask_migrate
 
 [handlers]
 keys = console
@@ -33,6 +33,11 @@ level = INFO
 handlers =
 qualname = alembic
 
+[logger_flask_migrate]
+ level = INFO
+ handlers =
+ qualname = flask_migrate
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)

migrations/env.py

@@ -4,7 +4,6 @@
 from logging.config import fileConfig
 
 from alembic import context
-from sqlalchemy import engine_from_config, pool
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -21,17 +20,35 @@
 # target_metadata = mymodel.Base.metadata
 from flask import current_app
 
-config.set_main_option(
-    "sqlalchemy.url",
-    str(current_app.extensions["migrate"].db.engine.url).replace("%", "%%"),
-)
-target_metadata = current_app.extensions["migrate"].db.metadata
+
+def get_engine():
+     try:
+         # this works with Flask-SQLAlchemy<3 and Alchemical
+         return current_app.extensions['migrate'].db.get_engine()
+     except TypeError:
+         # this works with Flask-SQLAlchemy>=3
+         return current_app.extensions['migrate'].db.engine
+
+
+ def get_engine_url():
+     try:
+         return get_engine().url.render_as_string(hide_password=False).replace(
+             '%', '%%')
+     except AttributeError:
+         return str(get_engine().url).replace('%', '%%')
+
+config.set_main_option('sqlalchemy.url', get_engine_url())
+target_db = current_app.extensions['migrate'].db
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
 # my_important_option = config.get_main_option("my_important_option")
 # ... etc.
 
+def get_metadata():
+    if hasattr(target_db, 'metadatas'):
+        return target_db.metadatas[None]
+    return target_db.metadata
 
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
@@ -46,7 +63,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, target_metadata=get_metadata(), literal_binds=True)
 
     with context.begin_transaction():
         context.run_migrations()
@@ -70,16 +87,12 @@ def process_revision_directives(context, revision, directives):
                 directives[:] = []
                 logger.info("No changes in schema detected.")
 
-    connectable = engine_from_config(
-        config.get_section(config.config_ini_section),
-        prefix="sqlalchemy.",
-        poolclass=pool.NullPool,
-    )
+    connectable = get_engine()
 
     with connectable.connect() as connection:
         context.configure(
             connection=connection,
-            target_metadata=target_metadata,
+            target_metadata=get_metadata(),
             process_revision_directives=process_revision_directives,
             **current_app.extensions["migrate"].configure_args
         )

migrations/versions/0fe33867bdbf_.py

@@ -18,9 +18,6 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('connection_database', schema=None) as batch_op:
-        batch_op.create_index(batch_op.f('ix_connection_database_connection_id'), ['connection_id'], unique=False)
-
     with op.batch_alter_table('login', schema=None) as batch_op:
         batch_op.alter_column('login_date',
                existing_type=postgresql.TIMESTAMP(timezone=True),
@@ -92,7 +89,4 @@ def downgrade():
                existing_nullable=True,
                existing_server_default=sa.text('now()'))
 
-    with op.batch_alter_table('connection_database', schema=None) as batch_op:
-        batch_op.drop_index(batch_op.f('ix_connection_database_connection_id'))
-
     # ### end Alembic commands ###

package.json

@@ -80,5 +80,5 @@
     "test:lint": "poetry run tox -e lint",
     "test:prettier": "prettier --check --config .prettierrc \"web/**/*.{ts,css,less,scss,js,json,md,yaml,html}\""
   },
-  "version": "2.10.0"
+  "version": "2.10.1-alpha.1"
 }

pyproject.toml

@@ -97,7 +97,7 @@ packages = [
 ]
 readme = "readme.md"
 repository = "https://github.com/atlas-bi/Hub"
-version = "2.10.0"
+version = "2.10.1-alpha.1"
 
 [tool.poetry.dependencies]
 Flask = "^2.0.1"