From 202b89c3811603b5a0f2c1576eeb94ed790e7ddb Mon Sep 17 00:00:00 2001 From: Yogesh Sharma Date: Mon, 17 Mar 2025 09:00:34 -0400 Subject: [PATCH] Now per folder configs are loaded after PG_CONFIG Call stopdb when deactivating env --- README.md | 2 +- pg-env | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2afe152..066ca84 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ pg${PGV}.conf pg${PGV}-.conf ``` -PostgreSQL local configs per are named similarly but starts with (.) dot and stored in worktree folder. These will superseed `${GIT_DIR}/pgconfigs/`: +PostgreSQL local configs per folder are named similarly but starts with (.) dot and stored in worktree folder. These will overlay on top of `${GIT_DIR}/pgconfigs/` settings. ``` .pg${PGV}.conf diff --git a/pg-env b/pg-env index fb4dd98..497bcd8 100755 --- a/pg-env +++ b/pg-env @@ -314,19 +314,17 @@ pexec(){ setupdb(){ if [ -z "$1" ]; then initdb --data-checksums --username=${USER} + echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}.conf'" >> ${PGDATA}/postgresql.conf if [ -f "$(pwd)/.pg${PGV}.conf" ]; then echo "include = '$(pwd)/.pg${PGV}.conf'" >> ${PGDATA}/postgresql.conf - else - echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}.conf'" >> ${PGDATA}/postgresql.conf fi else for NodeN in $@ do initdb --data-checksums --username=${USER} -D ${PGDATA}-${NodeN} + echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}-${NodeN}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf if [ -f "$(pwd)/.pg${PGV}-${NodeN}.conf" ]; then echo "include = '$(pwd)/.pg${PGV}-${NodeN}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf - else - echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}-${NodeN}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf fi done fi @@ -353,6 +351,8 @@ resetall() { } deactivate() { + stopdb + stopdb 1 2 3 export PATH=${SAVED_PATH} export PS1=${SAVED_PS1} if [ ! -z "$VIRTUAL_ENV" ]; then