Repository: incubator-airflow Updated Branches: refs/heads/master 38ba86c3b -> c2a0ab5e2
[AIRFLOW-709] Use same engine for migrations and reflection Use Same Engine for Migrations and Reflection Solves query blocking in MS-SQL server when running initdb. Closes #1953 from gritlogic/AIRFLOW-709 Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/c2a0ab5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/c2a0ab5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/c2a0ab5e Branch: refs/heads/master Commit: c2a0ab5e28dd970312eea57a4c9c9bdfef6a9e57 Parents: 38ba86c Author: Chad Henderson <[email protected]> Authored: Sun Dec 25 14:24:21 2016 +0100 Committer: Bolke de Bruin <[email protected]> Committed: Sun Dec 25 14:24:24 2016 +0100 ---------------------------------------------------------------------- .../migrations/versions/1507a7289a2f_create_is_encrypted.py | 5 ++--- airflow/migrations/versions/e3a246e0dc1_current_schema.py | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c2a0ab5e/airflow/migrations/versions/1507a7289a2f_create_is_encrypted.py ---------------------------------------------------------------------- diff --git a/airflow/migrations/versions/1507a7289a2f_create_is_encrypted.py b/airflow/migrations/versions/1507a7289a2f_create_is_encrypted.py index 4d567b4..213ceac 100644 --- a/airflow/migrations/versions/1507a7289a2f_create_is_encrypted.py +++ b/airflow/migrations/versions/1507a7289a2f_create_is_encrypted.py @@ -29,8 +29,6 @@ depends_on = None from alembic import op import sqlalchemy as sa from sqlalchemy.engine.reflection import Inspector -from airflow import settings - connectionhelper = sa.Table( 'connection', @@ -44,7 +42,8 @@ def upgrade(): # first check if the user already has this done. This should only be # true for users who are upgrading from a previous version of Airflow # that predates Alembic integration - inspector = Inspector.from_engine(settings.engine) + conn = op.get_bind() + inspector = Inspector.from_engine(conn) # this will only be true if 'connection' already exists in the db, # but not if alembic created it in a previous migration http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/c2a0ab5e/airflow/migrations/versions/e3a246e0dc1_current_schema.py ---------------------------------------------------------------------- diff --git a/airflow/migrations/versions/e3a246e0dc1_current_schema.py b/airflow/migrations/versions/e3a246e0dc1_current_schema.py index 57138c7..c1cb9c6 100644 --- a/airflow/migrations/versions/e3a246e0dc1_current_schema.py +++ b/airflow/migrations/versions/e3a246e0dc1_current_schema.py @@ -31,12 +31,11 @@ import sqlalchemy as sa from sqlalchemy import func from sqlalchemy.engine.reflection import Inspector -from airflow import settings - - def upgrade(): - inspector = Inspector.from_engine(settings.engine) + conn = op.get_bind() + inspector = Inspector.from_engine(conn) tables = inspector.get_table_names() + if 'connection' not in tables: op.create_table( 'connection',
