From bc24815ae6c8181216b88daeb0e8825aa7b17f7b Mon Sep 17 00:00:00 2001
From: Duncan Tasker <72562945+D-Tasker207@users.noreply.github.com>
Date: Mon, 5 Jan 2026 03:58:40 -0500
Subject: [PATCH] lifecycle: fix migration conn_options for psycopg connection
 (#19134)

fix migrations to add conn_options to the psycopg connection
---
 lifecycle/migrate.py     | 2 ++
 lifecycle/wait_for_db.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lifecycle/migrate.py b/lifecycle/migrate.py
index 6239f8904b..858cfd73b5 100755
--- a/lifecycle/migrate.py
+++ b/lifecycle/migrate.py
@@ -73,6 +73,7 @@ def release_lock(conn: Connection, cursor: Cursor):
 
 
 def run_migrations():
+    conn_opts = CONFIG.get_dict_from_b64_json("postgresql.conn_options", default={})
     conn = connect(
         dbname=CONFIG.get("postgresql.name"),
         user=CONFIG.get("postgresql.user"),
@@ -83,6 +84,7 @@ def run_migrations():
         sslrootcert=CONFIG.get("postgresql.sslrootcert"),
         sslcert=CONFIG.get("postgresql.sslcert"),
         sslkey=CONFIG.get("postgresql.sslkey"),
+        **conn_opts,
     )
     curr = conn.cursor()
     try:
diff --git a/lifecycle/wait_for_db.py b/lifecycle/wait_for_db.py
index e0d8c1860e..09d6aa3c29 100755
--- a/lifecycle/wait_for_db.py
+++ b/lifecycle/wait_for_db.py
@@ -18,6 +18,7 @@ def check_postgres():
         if attempt >= CHECK_THRESHOLD:
             sysexit(1)
         try:
+            conn_opts = CONFIG.get_dict_from_b64_json("postgresql.conn_options", default={})
             conn = connect(
                 dbname=CONFIG.refresh("postgresql.name"),
                 user=CONFIG.refresh("postgresql.user"),
@@ -28,6 +29,7 @@ def check_postgres():
                 sslrootcert=CONFIG.get("postgresql.sslrootcert"),
                 sslcert=CONFIG.get("postgresql.sslcert"),
                 sslkey=CONFIG.get("postgresql.sslkey"),
+                **conn_opts,
             )
             conn.cursor()
             break