Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Fix merge conflict in DB migrations (#12336)

Tim O'Farrell0e4f0c25d73f
diff --git a/enterprise/migrations/versions/086_bump_condenser_defaults.py b/enterprise/migrations/versions/087_bump_condenser_defaults.py
similarity index 94%
rename from enterprise/migrations/versions/086_bump_condenser_defaults.py
rename to enterprise/migrations/versions/087_bump_condenser_defaults.py
index 7d8327130c..24c88eee48 100644
--- a/enterprise/migrations/versions/086_bump_condenser_defaults.py
+++ b/enterprise/migrations/versions/087_bump_condenser_defaults.py
@@ -1,7 +1,7 @@
"""bump condenser defaults: max_size 120->240
-Revision ID: 086
-Revises: 085
+Revision ID: 087
+Revises: 086
Create Date: 2026-01-05
"""
@@ -13,8 +13,8 @@ from alembic import op
from sqlalchemy.sql import column, table
# revision identifiers, used by Alembic.
-revision: str = '086'
-down_revision: Union[str, None] = '085'
+revision: str = '087'
+down_revision: Union[str, None] = '086'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None
diff --git a/enterprise/migrations/versions/087_create_blocked_email_domains_table.py b/enterprise/migrations/versions/088_create_blocked_email_domains_table.py
similarity index 93%
rename from enterprise/migrations/versions/087_create_blocked_email_domains_table.py
rename to enterprise/migrations/versions/088_create_blocked_email_domains_table.py
index 9c024e1e10..1fb532bd37 100644
--- a/enterprise/migrations/versions/087_create_blocked_email_domains_table.py
+++ b/enterprise/migrations/versions/088_create_blocked_email_domains_table.py
@@ -1,7 +1,7 @@
"""create blocked_email_domains table
-Revision ID: 087
-Revises: 086
+Revision ID: 088
+Revises: 087
Create Date: 2025-01-27 00:00:00.000000
"""
@@ -12,8 +12,8 @@ import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
-revision: str = '087'
-down_revision: Union[str, None] = '086'
+revision: str = '088'
+down_revision: Union[str, None] = '087'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None