From a17afb4b13654edf15389cb39f1f8bde8e1f526a Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 29 Oct 2026 18:20:21 +0100 Subject: [PATCH] fix(media-diff): pass SQL via stdin to avoid newline escaping issues in query_db_media_refs --- scripts/shinkan/shinkan-media-diff | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/shinkan/shinkan-media-diff b/scripts/shinkan/shinkan-media-diff index 697f1a4..53dd5b0 100644 --- a/scripts/shinkan/shinkan-media-diff +++ b/scripts/shinkan/shinkan-media-diff @@ -82,12 +82,11 @@ def query_db_media_refs(tcfg): """ proc = subprocess.run( [ - 'docker', 'exec', tcfg['db_container'], + 'docker', 'exec', '-i', tcfg['db_container'], 'sh', '-ec', - 'export PGPASSWORD="${POSTGRES_PASSWORD:-}"; ' - f'psql -U "{tcfg["db_user"]}" -d "{tcfg["db_name"]}" -At -c ' + json.dumps(sql), + f'export PGPASSWORD="${{POSTGRES_PASSWORD:-}}"; exec psql -U "{tcfg["db_user"]}" -d "{tcfg["db_name"]}" -At', ], - capture_output=True, text=True, timeout=30, + input=sql, capture_output=True, text=True, timeout=30, ) if proc.returncode != 0: raise RuntimeError(f'Database media query failed: {proc.stderr.strip()}')