fix: Support pipe characters in DB passwords (#987)

bcgov · Dec 28, 2023 · 435dc9b · 435dc9b
1 parent 06f83f3
commit 435dc9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/database/mssql/scripts/utility/refresh-sample-data.sh b/database/mssql/scripts/utility/refresh-sample-data.sh
@@ -24,6 +24,4 @@ sqlcmd -C -U ${ORBC_USER} -P "${ORBC_PASS}" -S ${ORBC_SERVER} -d ${ORBC_DATABASE
 sqlcmd -C -U ${ORBC_USER} -P "${ORBC_PASS}" -S ${ORBC_SERVER} -d ${ORBC_DATABASE} -i ${SCRIPT_DIR}/sampledata/dbo.ORBC_POWER_UNIT.Table.sql
 sqlcmd -C -U ${ORBC_USER} -P "${ORBC_PASS}" -S ${ORBC_SERVER} -d ${ORBC_DATABASE} -i ${SCRIPT_DIR}/sampledata/dbo.ORBC_TRAILER.Table.sql
 
-${SCRIPT_DIR}/utility/refresh-sample-idir-users.sh -u ${ORBC_USER} -p "${ORBC_PASS}" -s ${ORBC_SERVER} -d ${ORBC_DATABASE}
-
 echo "Finished loading sample data"
diff --git a/database/mssql/scripts/utility/reset-moti-db.sh b/database/mssql/scripts/utility/reset-moti-db.sh
@@ -58,7 +58,8 @@ if [[ "${REPLY}" == "yes" ]] || [[ $1 == "force" ]]; then
   fi
 
   if [[ ${MSSQL_LOAD_SAMPLE_DATA} -eq 1 ]]; then
-    ${SCRIPT_DIR}/utility/refresh-sample-data.sh -u ${TEST_MOTI_USER:-$MSSQL_MOTI_USER} -p "${TEST_MOTI_PASSWORD:-$MSSQL_MOTI_PASSWORD}" -s ${TEST_MOTI_HOST:-$MSSQL_MOTI_HOST} -d ${TEST_MOTI_DB:-$MSSQL_MOTI_DB}
+    ${SCRIPT_DIR}/utility/refresh-sample-data.sh -u ${TEST_MOTI_USER:-$MSSQL_MOTI_USER} -p '"${TEST_MOTI_PASSWORD:-$MSSQL_MOTI_PASSWORD}"' -s ${TEST_MOTI_HOST:-$MSSQL_MOTI_HOST} -d ${TEST_MOTI_DB:-$MSSQL_MOTI_DB}
+    ${SCRIPT_DIR}/utility/refresh-sample-idir-users.sh -u ${TEST_MOTI_USER:-$MSSQL_MOTI_USER} -p '"${TEST_MOTI_PASSWORD:-$MSSQL_MOTI_PASSWORD}"' -s ${TEST_MOTI_HOST:-$MSSQL_MOTI_HOST} -d ${TEST_MOTI_DB:-$MSSQL_MOTI_DB}
   fi
 
   echo "Finished reset of ORBC database."