added db migration that merges branching heads together

This commit is contained in:
jasquat 2023-08-21 13:24:50 -04:00
parent 68ac5868b7
commit dc2d163785
2 changed files with 27 additions and 0 deletions

View File

@ -28,6 +28,9 @@ if [[ -n "${SPIFFWORKFLOW_BACKEND_DATABASE_URI:-}" ]]; then
database_host=$(grep -oP "^[^:]+://.*@\K(.+?)[:/]" <<<"$SPIFFWORKFLOW_BACKEND_DATABASE_URI" | sed -E 's/[:\/]$//') database_host=$(grep -oP "^[^:]+://.*@\K(.+?)[:/]" <<<"$SPIFFWORKFLOW_BACKEND_DATABASE_URI" | sed -E 's/[:\/]$//')
fi fi
# this will fix branching conflicts
# poetry run flask db merge heads -m "merging two heads"
tasks="" tasks=""
if [[ "${1:-}" == "clean" ]]; then if [[ "${1:-}" == "clean" ]]; then
subcommand="${2:-}" subcommand="${2:-}"

View File

@ -0,0 +1,24 @@
"""merging two heads
Revision ID: 1073364bc015
Revises: 214e0c5fb418, 5c50ecf2c1cd, ebf5e733d109
Create Date: 2023-08-21 13:22:36.060366
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = '1073364bc015'
down_revision = ('214e0c5fb418', '5c50ecf2c1cd', 'ebf5e733d109')
branch_labels = None
depends_on = None
def upgrade():
pass
def downgrade():
pass