From 39f41f22d4f01ad1ed1146b2dc3261a014a67872 Mon Sep 17 00:00:00 2001
From: Kenny Heinonen <kenny_heinonen@hotmail.com>
Date: Wed, 11 Jun 2025 22:50:59 +0300
Subject: [PATCH 1/4] `./run psql`: connect to specified database

---
 run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run b/run
index 386758c8..3be23f5c 100755
--- a/run
+++ b/run
@@ -122,7 +122,7 @@ psql() {
   # Connect to PostgreSQL
   # shellcheck disable=SC1091
   . .env
-  _dc postgres psql -U "${POSTGRES_USER}" "${@}"
+  _dc postgres psql -d "${POSTGRES_DB}" -U "${POSTGRES_USER}" "${@}"
 }
 
 redis-cli() {

From d0ec9197f38c0fad087e72de4f164dd865bfe2f1 Mon Sep 17 00:00:00 2001
From: Kenny Heinonen <kenny_heinonen@hotmail.com>
Date: Thu, 12 Jun 2025 09:27:36 +0300
Subject: [PATCH 2/4] Use -d flag only if POSTGRES_DB is set

---
 run | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/run b/run
index 3be23f5c..1359a143 100755
--- a/run
+++ b/run
@@ -122,7 +122,13 @@ psql() {
   # Connect to PostgreSQL
   # shellcheck disable=SC1091
   . .env
-  _dc postgres psql -d "${POSTGRES_DB}" -U "${POSTGRES_USER}" "${@}"
+
+  local cmd="psql -U ${POSTGRES_USER}"
+  if [[ -n "${POSTGRES_DB}" ]]; then
+    local cmd="${cmd} -d ${POSTGRES_DB}"
+  fi
+
+  _dc postgres ${cmd} "${@}"
 }
 
 redis-cli() {

From 3d9e5eeb7d54c532b4995b3c7365352924b8388d Mon Sep 17 00:00:00 2001
From: Kenny Heinonen <kenny_heinonen@hotmail.com>
Date: Thu, 12 Jun 2025 14:35:44 +0300
Subject: [PATCH 3/4] Simplify psql script by defaulting -d flag to
 POSTGRES_USER if POSTGRES_DB is not specified

---
 run | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/run b/run
index 1359a143..96a070ab 100755
--- a/run
+++ b/run
@@ -122,13 +122,7 @@ psql() {
   # Connect to PostgreSQL
   # shellcheck disable=SC1091
   . .env
-
-  local cmd="psql -U ${POSTGRES_USER}"
-  if [[ -n "${POSTGRES_DB}" ]]; then
-    local cmd="${cmd} -d ${POSTGRES_DB}"
-  fi
-
-  _dc postgres ${cmd} "${@}"
+  _dc postgres psql -d "${POSTGRES_DB:-"${POSTGRES_USER}"}" -U "${POSTGRES_USER}" "${@}"
 }
 
 redis-cli() {

From 5d716ad4ae42ac2b602ccc45eb5cc8773e0dbb1e Mon Sep 17 00:00:00 2001
From: Kenny Heinonen <kenny_heinonen@hotmail.com>
Date: Thu, 12 Jun 2025 15:03:34 +0300
Subject: [PATCH 4/4] Update compose.yaml

---
 compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose.yaml b/compose.yaml
index cc0666ad..99739330 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -49,7 +49,7 @@ services:
     environment:
       POSTGRES_USER: "${POSTGRES_USER}"
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
-      # POSTGRES_DB: "${POSTGRES_DB}"
+      POSTGRES_DB: "${POSTGRES_DB:-${POSTGRES_USER}}"
     image: "postgres:17.5-bookworm"
     profiles: ["postgres"]
     restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"