From d2e7f1e08d21589d43f8ed778e208d2e6af6509d Mon Sep 17 00:00:00 2001
From: lizerk <lizerk-dev@gmail.com>
Date: Fri, 11 Sep 2026 00:35:08 +0300
Subject: [PATCH] Make PostgreSQL quality cleanup reliable

---
 tools/quality/quality.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/quality/quality.sh b/tools/quality/quality.sh
index 41781e3a..e84fa0d5 100755
--- a/tools/quality/quality.sh
+++ b/tools/quality/quality.sh
@@ -208,7 +208,7 @@ run_test_suite() {
   )
 }
 
-run_postgresql_migration_check() {
+run_postgresql_migration_check() (
   local python container port
   python="$(python_command)"
   require_command docker
@@ -225,7 +225,10 @@ run_postgresql_migration_check() {
     --env POSTGRES_USER=postgres \
     --env POSTGRES_PASSWORD=quality \
     --publish 127.0.0.1::5432 postgres:17-alpine >/dev/null
-  port="$(docker port "${container}" 5432/tcp | sed 's/.*://')"
+  port="$(docker port "${container}" 5432/tcp)"
+  port="${port%%$'\n'*}"
+  port="${port##*:}"
+  [[ ${port} =~ ^[0-9]+$ ]]
 
   for _attempt in {1..30}; do
     if docker exec "${container}" pg_isready \
@@ -251,7 +254,7 @@ run_postgresql_migration_check() {
   )
   cleanup_postgres
   trap - EXIT HUP INT TERM
-}
+)
 
 run_release_lint() {
   local python