From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
docker/postgres/migration/assemble-package.sh | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/docker/postgres/migration/assemble-package.sh b/docker/postgres/migration/assemble-package.sh
new file mode 100644
index 0000000..158ed05
--- /dev/null
+++ b/docker/postgres/migration/assemble-package.sh
@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+# 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+# 鏋勫缓鏈轰笓鐢細鎶� repo 閲岀殑 DDL/鍒濆鍖栬剼鏈粍瑁呰繘 delivery/sql/锛岃浜や粯鍖呰嚜鍖呭惈銆�
+# 鐜板満宸ョ▼甯堛�愪笉銆戣窇姝よ剼鏈�斺�斾粬浠敹鍒扮殑鏄凡缁勮濂界殑 delivery/ 鐩綍銆�
+#
+# 鐢ㄦ硶锛堝湪鏈満 repo 鍐呰窇涓�娆★級锛�
+# ./assemble-package.sh
+# 鍙�夌幆澧冨彉閲忥細
+# DB_REPO 瀹樻柟 PostgreSQL 鍒濆鍖栬剼鏈墍鍦ㄧ洰褰�
+# 榛樿 /Users/yangsui/Code/clients/qiansheng/jnpf-database-v6.1.x/PostgreSQL
+# 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)" # delivery 鈫� postgres 鈫� docker 鈫� repo 鏍�
+DDL_DIR="$REPO_ROOT/docs/pg-migration-ddl"
+DB_REPO="${DB_REPO:-/Users/yangsui/Code/clients/qiansheng/jnpf-database-v6.1.x/PostgreSQL}"
+SQL_OUT="$SCRIPT_DIR/sql"
+
+echo "==> repo 鏍� : $REPO_ROOT"
+echo "==> DDL 浜х墿鐩綍 : $DDL_DIR"
+echo "==> 瀹樻柟鑴氭湰鐩綍 : $DB_REPO"
+echo "==> 缁勮杈撳嚭 : $SQL_OUT"
+
+[ -d "$DDL_DIR" ] || { echo "!! 缂� $DDL_DIR"; exit 1; }
+[ -d "$DB_REPO" ] || { echo "!! 缂� ${DB_REPO}锛堜紶 DB_REPO=... 鎸囧畾瀹樻柟鑴氭湰鐩綍锛�"; exit 1; }
+
+mkdir -p "$SQL_OUT"
+
+# 1) 瀹樻柟涓夊簱鍒濆鍖栬剼鏈紙jnpf_init 鐢� dbnull + 1127 澧為噺锛沠low / xxljob 鍚勪竴浠斤級
+copy_official() {
+ local src="$1"
+ [ -f "$src" ] || { echo "!! 缂哄畼鏂硅剼鏈� $src"; exit 1; }
+ cp -f "$src" "$SQL_OUT/"
+ echo " + $(basename "$src") ($(du -h "$src" | cut -f1))"
+}
+echo "-- 瀹樻柟鍒濆鍖栬剼鏈� --"
+copy_official "$DB_REPO/jnpf_dbnull_init.sql"
+copy_official "$DB_REPO/Update/Update_PostgreSQL_1127.sql"
+copy_official "$DB_REPO/jnpf_flow_init.sql"
+copy_official "$DB_REPO/jnpf_xxljob_init.sql"
+
+# 2) 鑷缓琛� DDL + 鏁版嵁鎺ュ彛淇 + Nacos 瀛樺偍搴� schema + 琛屾暟鏍￠獙鑴氭湰
+echo "-- DDL 浜х墿 --"
+for f in self_built_tables_pg.sql update_lims_huanjing_20260717.sql update_lims_sxt_wendingxing_20260717.sql update_lims_sxt_wendingxing_20260720.sql update_lims_sxt_flow_biz_status_20260719.sql update_lims_sxt_quyang_zhongzhi_shenqing_biz_status_20260723.sql update_lims_sxt_quyang_zhongzhi_shenqing_qingyandan_link_20260723.sql update_lims_sxt_plan_status_20260720.sql update_lims_wendingxing_biangeng_20260720.sql create_lims_sxt_quyang_jihua_renwu_20260724.sql alter_lims_sxt_quyang_jihua_renwu_jianyan_xiang_kuaizhao_20260724.sql create_audit_events_ext_20260724.sql create_audit_events_20260724.sql update_audit_events_title_entry_20260810.sql update_audit_events_ingest_merge_20260818.sql repair_audit_events_integrity_20260824.sql create_dms_permission_v2_2_20260815.sql upgrade_dms_permission_v2_2_to_v2_3_20260817.sql create_dms_file_objects_20260817.sql upgrade_dms_file_properties_20260820.sql data_interface_pg_fixes.sql nacos_config_pg.sql update_audit_events_target_timeline_index_20260823.sql rowcount_check.sh; do
+ [ -f "$DDL_DIR/$f" ] || { echo "!! 缂� $DDL_DIR/$f"; exit 1; }
+ cp -f "$DDL_DIR/$f" "$SQL_OUT/"
+ echo " + $f ($(du -h "$DDL_DIR/$f" | cut -f1))"
+done
+
+# 3) pgloader 妯℃澘
+echo "-- pgloader 妯℃澘 --"
+for f in pgloader_jnpf_init.load.tpl pgloader_jnpf_init_bigtable.load.tpl pgloader_jnpf_flow.load.tpl; do
+ [ -f "$DDL_DIR/$f" ] || { echo "!! 缂� $DDL_DIR/$f"; exit 1; }
+ cp -f "$DDL_DIR/$f" "$SQL_OUT/"
+ echo " + $f"
+done
+
+chmod +x "$SQL_OUT/rowcount_check.sh"
+echo ""
+echo "==> 缁勮瀹屾垚銆俿ql/ 鍐呭锛�"
+ls -la "$SQL_OUT"
+echo ""
+echo "涓嬩竴姝ワ細鏈洰褰曚笉鍐嶅崟鐙墦 tar 浜や粯鈥斺�旀暣鏍堢绾夸氦浠樺寘浼氭妸 migration/锛堝惈鏈� sql/锛�"
+echo "涓�骞舵敹鍏ワ細make images-offline锛堣 docker/delivery/ 涓� docs/docker-compose-guide.md 搂14锛�"
--
Gitblit v1.8.0