Skip to content
This repository has been archived by the owner on Jun 7, 2023. It is now read-only.

Fix: Merge the two current heads in Alembic. #113

Merged
merged 2 commits into from
Nov 11, 2022

Conversation

bjones1
Copy link
Collaborator

@bjones1 bjones1 commented Nov 8, 2022

No description provided.

@@ -0,0 +1,27 @@
"""Merge heads
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you merging this by hand? As it stands this does nothing so there is no reason to even keep it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is generated from the CLI using alembic merge heads. Currently, we have two branches in Alembic. This just merges the two branches together from Alembic's perspective, but doesn't actually change the DB. It's clean-up of some Alembic mess (multiple heads), not deep changes. We need to keep it (and you need to run alembic update head) so that future migrations get built on this merge, instead of creating more branches.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After you run this, I'm curious to see what a alembic revision --autogenerate -m "Update to current db structure" produces for you. It does create some operations for me, but perhaps my db is missing something?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, is this ready to merge then?

@bjones1
Copy link
Collaborator Author

bjones1 commented Nov 10, 2022

Yes, I'll send more PRs after this is merged.

@bjones1 bjones1 marked this pull request as ready for review November 10, 2022 13:16
@bjones1
Copy link
Collaborator Author

bjones1 commented Nov 10, 2022

Given the failing tests, you'll have to merge this -- I don't have access to push.

@bnmnetp bnmnetp merged commit 5dee68b into RunestoneInteractive:main Nov 11, 2022
@bjones1 bjones1 deleted the alembic-fix branch November 11, 2022 19:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants