From 2c32caef182738d3211e1953cfbef5fef18b7d18 Mon Sep 17 00:00:00 2001
From: Aaron Po <apo2@uwo.ca>
Date: Sun, 30 Aug 2026 05:46:12 -0400
Subject: [PATCH] Fix SQL Server port mapping

---
 web/docker-compose.db.yaml  | 2 +-
 web/docker-compose.dev.yaml | 2 +-
 web/generate-env.sh         | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/docker-compose.db.yaml b/web/docker-compose.db.yaml
index 7653b7bf..03d4ecf3 100644
--- a/web/docker-compose.db.yaml
+++ b/web/docker-compose.db.yaml
@@ -9,7 +9,7 @@ services:
       SA_PASSWORD: "${DB_PASSWORD}"
       MSSQL_PID: "Express"
     ports:
-      - "1434:1433"
+      - "1433:1433"
     volumes:
       - sqlserverdata-dev:/var/opt/mssql
     healthcheck:
diff --git a/web/docker-compose.dev.yaml b/web/docker-compose.dev.yaml
index aa8a56a9..84876995 100644
--- a/web/docker-compose.dev.yaml
+++ b/web/docker-compose.dev.yaml
@@ -10,7 +10,7 @@ services:
       SA_PASSWORD: "${DB_PASSWORD}"
       MSSQL_PID: "Express"
     ports:
-      - "1434:1433"
+      - "1433:1433"
     volumes:
       - sqlserverdata-dev:/var/opt/mssql
     healthcheck:
diff --git a/web/generate-env.sh b/web/generate-env.sh
index b0c8a7e5..15d1ced2 100755
--- a/web/generate-env.sh
+++ b/web/generate-env.sh
@@ -52,6 +52,12 @@ gen_username() {
 }
 
 DB_PASSWORD_VAL=$(gen_password)
+
+DB_SERVER_VAL=$(grep -m1 '^DB_SERVER=' "$TEMPLATE_FILE" | cut -d= -f2-)
+DB_NAME_VAL=$(grep -m1 '^DB_NAME=' "$TEMPLATE_FILE" | cut -d= -f2-)
+DB_USER_VAL=$(grep -m1 '^DB_USER=' "$TEMPLATE_FILE" | cut -d= -f2-)
+DB_CONNECTION_STRING_VAL="Server=${DB_SERVER_VAL};Database=${DB_NAME_VAL};User Id=${DB_USER_VAL};Password=${DB_PASSWORD_VAL};TrustServerCertificate=True;"
+
 ACCESS_TOKEN_SECRET_VAL=$(gen_jwt_secret)
 REFRESH_TOKEN_SECRET_VAL=$(gen_jwt_secret)
 CONFIRMATION_TOKEN_SECRET_VAL=$(gen_jwt_secret)
@@ -65,6 +71,7 @@ cp "$TEMPLATE_FILE" "$OUTPUT_FILE"
 TMP_FILE="$(mktemp)"
 sed \
     -e "s|^DB_PASSWORD=.*|DB_PASSWORD=${DB_PASSWORD_VAL}|" \
+    -e "s|^# DB_CONNECTION_STRING=.*|# DB_CONNECTION_STRING=${DB_CONNECTION_STRING_VAL}|" \
     -e "s|^ACCESS_TOKEN_SECRET=.*|ACCESS_TOKEN_SECRET=${ACCESS_TOKEN_SECRET_VAL}|" \
     -e "s|^REFRESH_TOKEN_SECRET=.*|REFRESH_TOKEN_SECRET=${REFRESH_TOKEN_SECRET_VAL}|" \
     -e "s|^CONFIRMATION_TOKEN_SECRET=.*|CONFIRMATION_TOKEN_SECRET=${CONFIRMATION_TOKEN_SECRET_VAL}|" \