Refactor sqlalchemy queries to 2.0 style (Part 1) by ephraimbuddy · Pull Request #31569 · apache/airflow

ephraimbuddy · 2023-05-26T13:56:08Z

This commit updates the sqlalchemy queries to adopt the 2.0 query style,
which is compatible with version 1.4. The changes involve updating the engine
with the future=True flag to indicate the execution of queries using the 2.0 style.
As a result, textual SQL statements are wrapped with the text function.

In addition, queries that previously used delete and update operations have been
modified to utilize the new delete/update construct. Furthermore, all queries within the
jobs/ and api/ directories have been thoroughly updated to employ the new style queries.

Please note that this commit intentionally stops at this point to ensure ease of review for the pull request.
The only test change is the addition of the future flag to the create_engine function.

uranusjr · 2023-05-29T03:24:15Z

Note: This can be rewritten with scalars on TaskInstance.task_id instead. (Maybe in a later PR.)

uranusjr · 2023-05-29T09:43:59Z

Hmm, it’s weird these screenshots are being updated. The added colouring also is suspective.

I ran breeze setup regenerate-command-images --force when I couldn't find why the PR was failing on pre-commit generating ER diagram(not locally)

Yes, what I was trying to say is I don’t understand why pre-commit thinks they need to be updated at all.

uranusjr · 2023-05-30T05:39:50Z

Should be equivalent to

Suggested change

dag_run = session.execute(

select(DagRun).where(DagRun.dag_id == dag_id, DagRun.run_id == run_id)

).scalar_one()

dag_run = session.scalars(

select(DagRun).where(DagRun.dag_id == dag_id, DagRun.run_id == run_id)

).one()

but I don’t think this is better. So just for reference in case anyone wonders.

This commit updates the sqlalchemy queries to adopt the 2.0 query style, which is compatible with version 1.4. The changes involve updating the engine with the future=True flag to indicate the execution of queries using the 2.0 style. As a result, textual SQL statements are wrapped with the text function. In addition, queries that previously used delete and update operations have been modified to utilize the new delete/update construct. Furthermore, all queries within the jobs/ and api/ directories have been thoroughly updated to employ the new style queries. Please note that this commit intentionally stops at this point to ensure ease of review for the pull request. The only test change is the addition of the future flag to the create_engine function.

Co-authored-by: Tzu-ping Chung <[email protected]>

boring-cyborg Bot added area:API Airflow's REST/HTTP API area:CLI area:Scheduler including HA (high availability) scheduler area:webserver Webserver related Issues kind:documentation labels May 26, 2023

ephraimbuddy force-pushed the sqlalchemy-20-query-style branch 8 times, most recently from ec72e1e to 0994ff2 Compare May 28, 2023 11:55

ephraimbuddy changed the title ~~Update sqlalchemy queries to 2.0 style~~ Refactor sqlalchemy queries to 2.0 style (Part 1) May 28, 2023

ephraimbuddy marked this pull request as ready for review May 28, 2023 11:56

ephraimbuddy requested review from XD-DENG, ashb, bbovenzi, dstandish, jedcunningham, kaxil, pierrejeambrun, potiuk and ryanahamilton as code owners May 28, 2023 11:56

ephraimbuddy force-pushed the sqlalchemy-20-query-style branch 2 times, most recently from 872d853 to 334ebeb Compare May 28, 2023 13:55