Skip to content

Use the engine provided in the session #29804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uranusjr merged 2 commits into from
Apr 10, 2023
Merged

Use the engine provided in the session #29804

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecea809
Use the engine provided in the session
dinigo Feb 28, 2023
372dab2
Apply suggestions from code review
ashb Apr 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions airflow/utils/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,18 +684,19 @@ def _create_db_from_orm(session):
from airflow.www.fab_security.sqla.models import Model
from airflow.www.session import AirflowDatabaseSessionInterface

def _create_flask_session_tbl():
def _create_flask_session_tbl(sql_database_uri):
flask_app = Flask(__name__)
flask_app.config["SQLALCHEMY_DATABASE_URI"] = conf.get("database", "SQL_ALCHEMY_CONN")
flask_app.config["SQLALCHEMY_DATABASE_URI"] = sql_database_uri
flask_app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
db = SQLAlchemy(flask_app)
AirflowDatabaseSessionInterface(app=flask_app, db=db, table="session", key_prefix="")
db.create_all()

with create_global_lock(session=session, lock=DBLocks.MIGRATIONS):
Base.metadata.create_all(settings.engine)
Model.metadata.create_all(settings.engine)
_create_flask_session_tbl()
engine = session.get_bind().engine
Base.metadata.create_all(engine)
Model.metadata.create_all(engine)
_create_flask_session_tbl(engine.url)
# stamp the migration head
config = _get_alembic_config()
command.stamp(config, "head")
Expand Down