From 6b9695e848f69ed83584a1b622a2e830209bced5 Mon Sep 17 00:00:00 2001 From: CREDO23 Date: Mon, 19 Jan 2026 17:10:11 +0200 Subject: [PATCH] chore: resolve migration file conflicts --- ...at_comments_table.py => 68_add_chat_comments_table.py} | 8 ++++---- ...ons_table.py => 69_add_chat_comment_mentions_table.py} | 8 ++++---- ...o_roles.py => 70_add_comments_permissions_to_roles.py} | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) rename surfsense_backend/alembic/versions/{66_add_chat_comments_table.py => 68_add_chat_comments_table.py} (94%) rename surfsense_backend/alembic/versions/{67_add_chat_comment_mentions_table.py => 69_add_chat_comment_mentions_table.py} (92%) rename surfsense_backend/alembic/versions/{68_add_comments_permissions_to_roles.py => 70_add_comments_permissions_to_roles.py} (97%) diff --git a/surfsense_backend/alembic/versions/66_add_chat_comments_table.py b/surfsense_backend/alembic/versions/68_add_chat_comments_table.py similarity index 94% rename from surfsense_backend/alembic/versions/66_add_chat_comments_table.py rename to surfsense_backend/alembic/versions/68_add_chat_comments_table.py index 0f31bcfdc..01c11f3e1 100644 --- a/surfsense_backend/alembic/versions/66_add_chat_comments_table.py +++ b/surfsense_backend/alembic/versions/68_add_chat_comments_table.py @@ -1,15 +1,15 @@ """Add chat_comments table for comments on AI responses -Revision ID: 66 -Revises: 65 +Revision ID: 68 +Revises: 67 """ from collections.abc import Sequence from alembic import op -revision: str = "66" -down_revision: str | None = "65" +revision: str = "68" +down_revision: str | None = "67" branch_labels: str | Sequence[str] | None = None depends_on: str | Sequence[str] | None = None diff --git a/surfsense_backend/alembic/versions/67_add_chat_comment_mentions_table.py b/surfsense_backend/alembic/versions/69_add_chat_comment_mentions_table.py similarity index 92% rename from surfsense_backend/alembic/versions/67_add_chat_comment_mentions_table.py rename to surfsense_backend/alembic/versions/69_add_chat_comment_mentions_table.py index a718d4a0b..c8d5c9c9a 100644 --- a/surfsense_backend/alembic/versions/67_add_chat_comment_mentions_table.py +++ b/surfsense_backend/alembic/versions/69_add_chat_comment_mentions_table.py @@ -1,15 +1,15 @@ """Add chat_comment_mentions table for @mentions in comments -Revision ID: 67 -Revises: 66 +Revision ID: 69 +Revises: 68 """ from collections.abc import Sequence from alembic import op -revision: str = "67" -down_revision: str | None = "66" +revision: str = "69" +down_revision: str | None = "68" branch_labels: str | Sequence[str] | None = None depends_on: str | Sequence[str] | None = None diff --git a/surfsense_backend/alembic/versions/68_add_comments_permissions_to_roles.py b/surfsense_backend/alembic/versions/70_add_comments_permissions_to_roles.py similarity index 97% rename from surfsense_backend/alembic/versions/68_add_comments_permissions_to_roles.py rename to surfsense_backend/alembic/versions/70_add_comments_permissions_to_roles.py index a66ad3404..ec7df8b56 100644 --- a/surfsense_backend/alembic/versions/68_add_comments_permissions_to_roles.py +++ b/surfsense_backend/alembic/versions/70_add_comments_permissions_to_roles.py @@ -1,7 +1,7 @@ """Add comments permissions to existing roles -Revision ID: 68 -Revises: 67 +Revision ID: 70 +Revises: 69 Create Date: 2024-01-16 """ @@ -11,8 +11,8 @@ from sqlalchemy import text from alembic import op # revision identifiers, used by Alembic. -revision = "68" -down_revision = "67" +revision = "70" +down_revision = "69" branch_labels = None depends_on = None