From cf590076add2e98e9a3d17decbf576834cd7ca94 Mon Sep 17 00:00:00 2001
From: Sarah <sarahbot@google.com>
Date: Wed, 20 Mar 2024 16:04:59 -0400
Subject: [PATCH] Add transactional lock flag to actual flyway commands in
 script

---
 release/schema-deployer/deploy_sql_schema.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/release/schema-deployer/deploy_sql_schema.sh b/release/schema-deployer/deploy_sql_schema.sh
index 4fa0a5bdb..8655c3bc5 100755
--- a/release/schema-deployer/deploy_sql_schema.sh
+++ b/release/schema-deployer/deploy_sql_schema.sh
@@ -78,10 +78,8 @@ if ! pgrep cloud_sql_proxy; then
   exit 1
 fi
 
-# Set the transactional lock to false, session-level lock will be used instead
-#/flyway/flyway -postgresql.transactional.lock=false info
-
-/flyway/flyway -community -user=${db_user} -password=${db_password} \
+/flyway/flyway -postgresql.transactional.lock=false -community \
+  -user=${db_user} -password=${db_password} \
   -url=jdbc:postgresql://localhost:5432/postgres \
   -locations=classpath:sql/flyway \
   ${flyway_action}
@@ -89,7 +87,8 @@ migration_result=$?
 
 if [ ${flyway_action} == "migrate" ]; then
   # After deployment, log the current schema.
-  /flyway/flyway -community -user=${db_user} -password=${db_password} \
+  /flyway/flyway -postgresql.transactional.lock=false -community \
+    -user=${db_user} -password=${db_password} \
     -url=jdbc:postgresql://localhost:5432/postgres \
     -locations=classpath:sql/flyway \
     info