From c8351f3f0f9db9983dc5d79b08d1ff535ee428d0 Mon Sep 17 00:00:00 2001
From: Jason Claxton <30830544+Jozzey@users.noreply.github.com>
Date: Wed, 9 Nov 2022 11:55:50 +0000
Subject: [PATCH 1/3] Tidy up environment variables

We noticed we are still refering to SROC in our local environment variables. Also noticed the DB in the ci.yaml is different to the one we use locally.

From d656a01e896ed18a7b672ad699b40633116529a3 Mon Sep 17 00:00:00 2001
From: Jason Claxton <30830544+Jozzey@users.noreply.github.com>
Date: Wed, 9 Nov 2022 12:06:41 +0000
Subject: [PATCH 2/3] tidied up

---
 .env.example             | 4 ++--
 .github/workflows/ci.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index 92664cf3bb..36896630bb 100644
--- a/.env.example
+++ b/.env.example
@@ -8,8 +8,8 @@ POSTGRES_USER=myuser
 POSTGRES_PASSWORD=password12345
 POSTGRES_HOST=db
 POSTGRES_PORT=5432
-POSTGRES_DB=sroc_charge
-POSTGRES_DB_TEST=sroc_charge_test
+POSTGRES_DB=wabs
+POSTGRES_DB_TEST=wabs_system_test
 
 # Server config
 PORT=3000
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a2a883191..eb874a7952 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,8 +29,8 @@ jobs:
       POSTGRES_PASSWORD: password
       POSTGRES_HOST: localhost
       POSTGRES_PORT: 5432
-      POSTGRES_DB: wabs_test
-      POSTGRES_DB_TEST: wabs_test
+      POSTGRES_DB: wabs_system_test
+      POSTGRES_DB_TEST: wabs_system_test
       ENVIRONMENT: dev
 
 

From 6f8a4a4c3bf8b84f10f75ddcf2086e0ad8c859dd Mon Sep 17 00:00:00 2001
From: Jason Claxton <30830544+Jozzey@users.noreply.github.com>
Date: Wed, 9 Nov 2022 12:10:02 +0000
Subject: [PATCH 3/3] added bit I missed

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb874a7952..9641c98f36 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
         env:
           POSTGRES_USER: water_user
           POSTGRES_PASSWORD: password
-          POSTGRES_DB: wabs_test
+          POSTGRES_DB: wabs_system_test
         # Maps tcp port 5432 on service container to the host
         ports:
           - 5432:5432