From e81fd0a176d92d96b167ea47cc3fd02f27aa2353 Mon Sep 17 00:00:00 2001
From: marco <marco@wonderable.ai>
Date: Tue, 23 Jun 2026 17:58:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(alembic):=20=E5=90=88=E5=B9=B6=E5=A4=9A=20h?=
 =?UTF-8?q?ead(#65=20device=20=E8=BF=81=E7=A7=BB=20+=20comparison=5Ftoken?=
 =?UTF-8?q?=5Fcols)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#65 的 device 迁移链与 comparison_token_cols 都从 ceb286289426 分叉成双 head,alembic upgrade head 报 Multiple head revisions;加 merge 迁移 4dc2af7ebe74 合并(空 DDL 仅接链)。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 ...4_merge_device_65_and_comparison_token_.py | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 alembic/versions/4dc2af7ebe74_merge_device_65_and_comparison_token_.py

diff --git a/alembic/versions/4dc2af7ebe74_merge_device_65_and_comparison_token_.py b/alembic/versions/4dc2af7ebe74_merge_device_65_and_comparison_token_.py
new file mode 100644
index 0000000..6670d72
--- /dev/null
+++ b/alembic/versions/4dc2af7ebe74_merge_device_65_and_comparison_token_.py
@@ -0,0 +1,26 @@
+"""merge device#65 and comparison_token_cols heads
+
+Revision ID: 4dc2af7ebe74
+Revises: comparison_token_cols, ad_feed_reward_trace_id
+Create Date: 2026-06-23 17:57:54.083531
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '4dc2af7ebe74'
+down_revision: Union[str, Sequence[str], None] = ('comparison_token_cols', 'ad_feed_reward_trace_id')
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    pass
+
+
+def downgrade() -> None:
+    pass