From 2a82b27e3e7d9cd19f12f8f95963c9fbf7597240 Mon Sep 17 00:00:00 2001
From: Peter Bailie <pbailie@users.noreply.github.com>
Date: Mon, 13 Feb 2023 15:00:05 -0500
Subject: [PATCH] Update ssaf_sql.php (#29)

DB schema change
firstname -> givenname
lastname -> familyname
per https://github.com/Submitty/Submitty/pull/8779
---
 student_auto_feed/ssaf_sql.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php
index 298e512..978048e 100644
--- a/student_auto_feed/ssaf_sql.php
+++ b/student_auto_feed/ssaf_sql.php
@@ -45,21 +45,21 @@ class sql {
 INSERT INTO users (
     user_id,
     user_numeric_id,
-    user_firstname,
-    user_lastname,
-    user_preferred_firstname,
+    user_givenname,
+    user_familyname,
+    user_preferred_givenname,
     user_email
 ) VALUES ($1, $2, $3, $4, $5, $6)
 ON CONFLICT (user_id) DO UPDATE
 SET user_numeric_id=EXCLUDED.user_numeric_id,
-    user_firstname=EXCLUDED.user_firstname,
-    user_lastname=EXCLUDED.user_lastname,
-    user_preferred_firstname=
+    user_givenname=EXCLUDED.user_givenname,
+    user_familyname=EXCLUDED.user_familyname,
+    user_preferred_givenname=
         CASE WHEN users.user_updated=FALSE
             AND users.instructor_updated=FALSE
-            AND COALESCE(users.user_preferred_firstname, '')=''
-        THEN EXCLUDED.user_preferred_firstname
-        ELSE users.user_preferred_firstname
+            AND COALESCE(users.user_preferred_givenname, '')=''
+        THEN EXCLUDED.user_preferred_givenname
+        ELSE users.user_preferred_givenname
         END,
     user_email=
         CASE WHEN COALESCE(EXCLUDED.user_email, '')<>''