diff --git a/deploy/post-deploy.sh b/deploy/post-deploy.sh index 55dd3010..6a2e6f22 100755 --- a/deploy/post-deploy.sh +++ b/deploy/post-deploy.sh @@ -337,15 +337,15 @@ preflight() { detect_network local migrations - migrations="$(psql_scalar "SELECT (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^103_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^104_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^105_'))::int" | tr -d '[:space:]')" - if [[ "$migrations" != "3" ]]; then - fail "迁移 103–105 未全部应用(当前 ${migrations}/3):先确认 deploy/ubuntu-deploy.sh 成功、backend 日志无迁移错误" + migrations="$(psql_scalar "SELECT (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^103_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^104_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^105_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^106_'))::int" | tr -d '[:space:]')" + if [[ "$migrations" != "4" ]]; then + fail "迁移 103–106 未全部应用(当前 ${migrations}/4):先确认 deploy/ubuntu-deploy.sh 成功、backend 日志无迁移错误" fi PENDING_REVENUE="$(psql_scalar "SELECT count(*) FROM order_items WHERE revenue_basis = 'unknown'" | tr -d '[:space:]')" PENDING_FULFILLMENT="$(psql_scalar "SELECT count(*) FROM order_items WHERE fulfillment_mode IS NULL" | tr -d '[:space:]')" - log " postgres 运行中 / 迁移 103–105 已应用" + log " postgres 运行中 / 迁移 103–106 已应用" log " 待回填收入项:${PENDING_REVENUE} 行;待回填履约方式:${PENDING_FULFILLMENT} 行" log " 工具镜像:${TOOLS_IMAGE}(services=${HAS_TOOLS_SERVICE}, network=${NETWORK})" } diff --git a/scripts/verify-finance-launch.sql b/scripts/verify-finance-launch.sql index 0e820e6d..44cd88b5 100644 --- a/scripts/verify-finance-launch.sql +++ b/scripts/verify-finance-launch.sql @@ -14,7 +14,7 @@ -- < scripts/verify-finance-launch.sql -- -- 退出码:0 = 无 FAIL(WARN 不阻断);3 = 存在 FAIL(末尾 RAISE EXCEPTION)。 --- 前置条件:迁移 103–105 已应用;否则先跑 deploy/ubuntu-deploy.sh。 +-- 前置条件:迁移 103–106 已应用;否则先跑 deploy/ubuntu-deploy.sh。 \set ON_ERROR_STOP on @@ -46,15 +46,16 @@ CREATE TEMP TABLE _launch_checks ( -- 01 迁移基线 -------------------------------------------------------------- INSERT INTO _launch_checks -SELECT 1, '01', '迁移基线 103–105 已应用', - v::text, '3', - CASE WHEN v = 3 THEN 'PASS' ELSE 'FAIL' END, +SELECT 1, '01', '迁移基线 103–106 已应用', + v::text, '4', + CASE WHEN v = 4 THEN 'PASS' ELSE 'FAIL' END, '后端未完成迁移:docker compose logs backend | grep -i migration' FROM ( - -- 按版本前缀逐个判断,避免后续 105_xxx_hotfix 之类增量迁移把计数顶成 4。 + -- 按版本前缀逐个判断,避免后续 106_xxx_hotfix 之类增量迁移把计数顶成 5。 SELECT (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^103_'))::int + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^104_'))::int - + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^105_'))::int AS v + + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^105_'))::int + + (EXISTS (SELECT 1 FROM schema_migrations WHERE COALESCE(filename, name) ~ '^106_'))::int AS v ) s; -- 02 存量订单项收入回填 ----------------------------------------------------