[AIRFLOW-6046] Fix Alembic migrations & sync it to 1.10.*

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 2.0.0
• Fix Version/s: 2.0.0
• Component/s: database
• Assignee: Kaxil Naik
• Reporter: Kaxil Naik
• Created: 22/Nov/19 18:21
• Updated: 22/Nov/19 22:26
• Resolved: 22/Nov/19 22:25

Description

From https://github.com/apache/airflow/pull/6442#issuecomment-557574440

just tried doing an upgrade to 1.10.6 followed by an upgrade to master:

git checkout 1.10.6

alembic upgrade heads
git checkout master
alembic upgrade heads

Result is

ERROR [alembic.util.messaging] Requested revision 74effc47d867 overlaps with other requested 
revisions 004c1210f153
  FAILED: Requested revision 74effc47d867 overlaps with other requested revisions 004c1210f153

I think this demonstrates the issue.

Issue Links

• links to: GitHub Pull Request #6642