From d644d390a79185aeb2525bac38e227488e9f4941 Mon Sep 17 00:00:00 2001 From: yukkop Date: Wed, 3 Jun 2026 08:36:42 +0000 Subject: [PATCH] fix --- package/db-tool/database.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/db-tool/database.sh b/package/db-tool/database.sh index c4249708..e280e1c3 100644 --- a/package/db-tool/database.sh +++ b/package/db-tool/database.sh @@ -1676,9 +1676,8 @@ subcommand_diff() { exit 9 ;; *) - # NOTE: yes, RESTORE, not DIFF prefix - if [ -z "$RESTORE_BACKUP_PATH" ]; then - RESTORE_BACKUP_PATH="$1" + if [ -z "$DIFF_BACKUP_PATH" ]; then + DIFF_BACKUP_PATH="$1" shift else log error "diff: unexpected argument $1" @@ -1688,6 +1687,10 @@ subcommand_diff() { esac done + if [ -z "$DIFF_BACKUP_PATH" ]; then + DIFF_BACKUP_PATH="$DEFAULT_BACKUP_PATH" + fi + DIFF_TMPDIR="${LOCAL_DIR}/focus/database-diff-operation" DIFF_PGDATA1="$DIFF_TMPDIR/pgdata1" DIFF_PGDATA2="$DIFF_TMPDIR/pgdata2" @@ -1717,7 +1720,7 @@ subcommand_diff() { log notice "provisioning ${WHITE}DB1$NC (backup + migrations)" - PG_WORKING_DIR="$DIFF_PGDATA1" PG_LOG_PATH="$DIFF_PGDATA1" subcommand_restore + PG_WORKING_DIR="$DIFF_PGDATA1" PG_LOG_PATH="$DIFF_PGDATA1" subcommand_restore "$DIFF_BACKUP_PATH" log info "applying migrations to ${WHITE}DB1$NC" subcommand_migrator migrate up all \