From bbb5eae1eda2bcfa06d717871533d90b2a82b958 Mon Sep 17 00:00:00 2001 From: Alex Lavallee <73203142+lavalleeale@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:34:29 -0500 Subject: [PATCH 1/5] [Fix:SQL] Prevent empty string values in user preferred given name during auto feed --- student_auto_feed/ssaf_sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index 9ad5ea7..4590ed7 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -58,7 +58,7 @@ class sql { CASE WHEN users.user_updated=FALSE AND users.instructor_updated=FALSE AND COALESCE(users.user_preferred_givenname, '')='' - THEN EXCLUDED.user_preferred_givenname + THEN NULLIF(EXCLUDED.user_preferred_givenname, '') ELSE users.user_preferred_givenname END, user_email= From f3544662747a670b6b8b403711037808a3beccc9 Mon Sep 17 00:00:00 2001 From: Alex Lavallee <73203142+lavalleeale@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:32:58 -0500 Subject: [PATCH 2/5] [Fix:SQL] Correct handling of user preferred given name in auto feed --- student_auto_feed/ssaf_sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index 4590ed7..9ad5ea7 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -58,7 +58,7 @@ class sql { CASE WHEN users.user_updated=FALSE AND users.instructor_updated=FALSE AND COALESCE(users.user_preferred_givenname, '')='' - THEN NULLIF(EXCLUDED.user_preferred_givenname, '') + THEN EXCLUDED.user_preferred_givenname ELSE users.user_preferred_givenname END, user_email= From e4ebc277bf9932c6450ff63e7050547b3a8b5c11 Mon Sep 17 00:00:00 2001 From: Alex Lavallee <73203142+lavalleeale@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:34:36 -0500 Subject: [PATCH 3/5] Fix:SQL] Prevent insertion of empty preferred given name in auto feed --- student_auto_feed/ssaf_sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index 9ad5ea7..7b47a38 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -47,7 +47,7 @@ class sql { user_numeric_id, user_givenname, user_familyname, - user_preferred_givenname, + NULLIF(user_preferred_givenname, ''), user_email ) VALUES ($1, $2, $3, $4, $5, $6) ON CONFLICT (user_id) DO UPDATE From dadedcbc9f71b56803be9403e24dffc835e9e367 Mon Sep 17 00:00:00 2001 From: Alex Lavallee <73203142+lavalleeale@users.noreply.github.com> Date: Thu, 23 Jan 2025 13:04:38 -0500 Subject: [PATCH 4/5] Fix:SQL] Ensure proper handling of user preferred given name in auto feed --- student_auto_feed/ssaf_sql.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index 7b47a38..c5d9a0c 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -47,9 +47,9 @@ class sql { user_numeric_id, user_givenname, user_familyname, - NULLIF(user_preferred_givenname, ''), + user_preferred_givenname, user_email - ) VALUES ($1, $2, $3, $4, $5, $6) + ) VALUES ($1, $2, $3, $4, NULLIF($5,''), $6) ON CONFLICT (user_id) DO UPDATE SET user_numeric_id=EXCLUDED.user_numeric_id, user_givenname=EXCLUDED.user_givenname, From 32c10fd53d58c7a667fe4ab53a07de631ac9ae5b Mon Sep 17 00:00:00 2001 From: Alex Lavallee Date: Thu, 23 Jan 2025 16:10:53 -0500 Subject: [PATCH 5/5] Update ssaf_sql.php --- student_auto_feed/ssaf_sql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index c5d9a0c..a6f4486 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -57,7 +57,7 @@ class sql { user_preferred_givenname= CASE WHEN users.user_updated=FALSE AND users.instructor_updated=FALSE - AND COALESCE(users.user_preferred_givenname, '')='' + AND users.user_preferred_givenname IS NULL THEN EXCLUDED.user_preferred_givenname ELSE users.user_preferred_givenname END,