From b6b6dd874e2c487dee1d40e3227c39c8a84d0eed Mon Sep 17 00:00:00 2001
From: Subhash Bhushan <subhash.bhushan@gmail.com>
Date: Fri, 9 Aug 2024 17:02:54 -0700
Subject: [PATCH] Fix issue in ci.yml

---
 tests/create_db.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/create_db.sh b/tests/create_db.sh
index dbe8350..6196091 100755
--- a/tests/create_db.sh
+++ b/tests/create_db.sh
@@ -11,9 +11,14 @@ DB_NAME="test_postgres"
 DB_USER="test_postgres"
 DB_USER_PASSWORD="test_postgres"
 
-# SQL commands to create the user and database
-SQL_CREATE_DB=$(cat <<EOF
+# SQL commands to create the user
+SQL_CREATE_USER=$(cat <<EOF
 CREATE USER $DB_USER WITH PASSWORD '$DB_USER_PASSWORD';
+EOF
+)
+
+# SQL commands to create the database
+SQL_CREATE_DB=$(cat <<EOF
 CREATE DATABASE $DB_NAME;
 GRANT ALL PRIVILEGES ON DATABASE $DB_NAME TO $DB_USER;
 EOF
@@ -28,8 +33,11 @@ GRANT ALL PRIVILEGES ON ALL FUNCTIONS IN SCHEMA public TO $DB_USER;
 EOF
 )
 
-# Execute the SQL commands to create the user and database
+# Execute the SQL command to create the user
+PGPASSWORD="$DB_ADMIN_PASSWORD" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_ADMIN" -d postgres -c "$SQL_CREATE_USER"
+
+# Execute the SQL command to create the database (this must be done separately to avoid transaction block errors)
 PGPASSWORD="$DB_ADMIN_PASSWORD" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_ADMIN" -d postgres -c "$SQL_CREATE_DB"
 
 # Execute the SQL commands to grant schema-level privileges by connecting to the newly created database
-PGPASSWORD="$DB_ADMIN_PASSWORD" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_ADMIN" -d "$DB_NAME" -c "$SQL_GRANT_PRIVILEGES"
\ No newline at end of file
+PGPASSWORD="$DB_ADMIN_PASSWORD" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_ADMIN" -d "$DB_NAME" -c "$SQL_GRANT_PRIVILEGES"