From c0af53155c9b0dd99e5b392b82e9080a37690515 Mon Sep 17 00:00:00 2001
From: xbgmsharp <xbgmsharp@gmail.com>
Date: Sun, 22 Oct 2023 19:43:06 +0200
Subject: [PATCH] Update tests to match new public_id colunm for auth.accounts

---
 tests/sql/grafana.sql        |  4 ++--
 tests/sql/grafana.sql.output | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/sql/grafana.sql b/tests/sql/grafana.sql
index 457c6e2..d8eae43 100644
--- a/tests/sql/grafana.sql
+++ b/tests/sql/grafana.sql
@@ -23,7 +23,7 @@ SELECT current_user, current_setting('user.email', true), current_setting('vesse
 SELECT v.name,m.client_id FROM auth.accounts a JOIN auth.vessels v ON a.role = 'user_role' AND v.owner_email = a.email JOIN api.metadata m ON m.vessel_id = v.vessel_id;
 
 \echo 'auth.accounts details'
-SELECT a.userid IS NOT NULL AS userid, a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT NULL AS pass, a.role, a.preferences->'telegram'->'chat' AS telegram, a.preferences->'pushover_user_key' AS pushover_user_key FROM auth.accounts AS a;
+SELECT a.public_id IS NOT NULL AS public_id, a.user_id IS NOT NULL AS user_id, a.email, a.first, a.last, a.pass IS NOT NULL AS pass, a.role, a.preferences->'telegram'->'chat' AS telegram, a.preferences->'pushover_user_key' AS pushover_user_key FROM auth.accounts AS a;
 \echo 'auth.vessels details'
 --SELECT 'SELECT ' || STRING_AGG('v.' || column_name, ', ') || ' FROM auth.vessels AS v' FROM information_schema.columns WHERE table_name = 'vessels' AND table_schema = 'auth' AND column_name NOT IN ('created_at', 'updated_at');
 SELECT v.vessel_id IS NOT NULL AS vessel_id, v.owner_email, v.mmsi, v.name, v.role FROM auth.vessels AS v;
@@ -60,7 +60,7 @@ SELECT m.id, m.name, m.mmsi, m.client_id, m.length, m.beam, m.height, m.ship_typ
 \echo 'api.logs_view'
 --SELECT * FROM api.logbook l;
 --SELECT * FROM api.logs_view l;
-SELECT l.id, "Name", "From", "To", "Distance", "Duration" FROM api.logs_view AS l;
+SELECT l.id, l.name, l.from, l.to, l.distance, l.duration FROM api.logs_view AS l;
 --SELECT * FROM api.log_view l;
 
 \echo 'api.stays'
diff --git a/tests/sql/grafana.sql.output b/tests/sql/grafana.sql.output
index 645da29..c8ae848 100644
--- a/tests/sql/grafana.sql.output
+++ b/tests/sql/grafana.sql.output
@@ -23,7 +23,7 @@ client_id | vessels.urn:mrn:imo:mmsi:787654321
 
 auth.accounts details
 -[ RECORD 1 ]-----+-----------------------------
-userid            | t
+public_id         | t
 user_id           | t
 email             | demo+kapla@openplotter.cloud
 first             | First_kapla
@@ -33,7 +33,7 @@ role              | user_role
 telegram          | 
 pushover_user_key | 
 -[ RECORD 2 ]-----+-----------------------------
-userid            | t
+public_id         | t
 user_id           | t
 email             | demo+aava@openplotter.cloud
 first             | first_aava
@@ -127,18 +127,18 @@ active          | t
 api.logs_view
 -[ RECORD 1 ]--------------
 id       | 2
-Name     | Knipan to Ekenäs
-From     | Knipan
-To       | Ekenäs
-Distance | 8.6862
-Duration | PT18M
+name     | Knipan to Ekenäs
+from     | Knipan
+to       | Ekenäs
+distance | 8.6862
+duration | PT18M
 -[ RECORD 2 ]--------------
 id       | 1
-Name     | patch log name 3
-From     | Bollsta
-To       | Slottsbacken
-Distance | 7.17
-Duration | PT25M
+name     | patch log name 3
+from     | Bollsta
+to       | Slottsbacken
+distance | 7.17
+duration | PT25M
 
 api.stays
 -[ RECORD 1 ]-------------------------------------------------