From dca1bc0764688f48130de3313a700b4e6bd37665 Mon Sep 17 00:00:00 2001
From: guke <guke@autohome.com.cn>
Date: Thu, 9 Jul 2026 14:05:02 +0800
Subject: [PATCH] =?UTF-8?q?chore(alembic):=20=E5=90=88=E5=B9=B6=20pages=5F?=
 =?UTF-8?q?override=20=E4=B8=8E=E9=A2=86=E5=88=B8=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E7=8E=87=E4=B8=A4=E4=B8=AA=E8=BF=81=E7=A7=BB=20head,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20upgrade=20head(=E5=8D=95=E6=95=B0)=E5=A4=9A=20head?=
 =?UTF-8?q?=20=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pull main 带入 #126 的 admin_user_pages_override,与本分支领券成功率的
coupon_session_platform_success → coupon_claim_app_env 都从 admin_user_plain_password
分叉,形成两个 alembic head。多 head 会让部署/run.sh 用的 `alembic upgrade head`(单数)
报 "Multiple head revisions are present" 而中断。

本迁移为纯 merge:upgrade/downgrade 均空,不含任何表结构或数据改动,仅把两个 head
收敛为单 head(merge_pages_override_coupon_slot),使 `alembic upgrade head` 恢复正常。
---
 .../merge_pages_override_coupon_slot.py       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 alembic/versions/merge_pages_override_coupon_slot.py

diff --git a/alembic/versions/merge_pages_override_coupon_slot.py b/alembic/versions/merge_pages_override_coupon_slot.py
new file mode 100644
index 0000000..1fb6fc4
--- /dev/null
+++ b/alembic/versions/merge_pages_override_coupon_slot.py
@@ -0,0 +1,28 @@
+"""合并两个 alembic head:admin_user_pages_override(#126 权限)+ coupon_claim_app_env(领券成功率)。
+
+两条迁移都从 admin_user_plain_password 分叉——#126 经 pull main 进入本分支,领券成功率为本分支新增——
+于是出现两个 head。本迁移仅把二者收敛成单 head,让 `alembic upgrade head`(单数,部署/run.sh 用)
+恢复正常;**不含任何表结构 / 数据改动**(纯 merge)。
+
+Revision ID: merge_pages_override_coupon_slot
+Revises: admin_user_pages_override, coupon_claim_app_env
+Create Date: 2026-07-09 00:00:00.000000
+"""
+
+from collections.abc import Sequence
+
+revision: str = "merge_pages_override_coupon_slot"
+down_revision: str | Sequence[str] | None = (
+    "admin_user_pages_override",
+    "coupon_claim_app_env",
+)
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    """纯合并 head,无 schema 改动。"""
+
+
+def downgrade() -> None:
+    """拆回两个 head,无 schema 改动。"""