From 7750967c6e07b3fadf27947e1f5ba9790ae4381b Mon Sep 17 00:00:00 2001 From: Sophia Massie Date: Mon, 22 Apr 2024 18:49:54 -0500 Subject: [PATCH] Fixes the error with the user listing query. --- apcd-cms/src/apps/utils/apcd_database.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py index 9d07c6f0..a7de7268 100644 --- a/apcd-cms/src/apps/utils/apcd_database.py +++ b/apcd-cms/src/apps/utils/apcd_database.py @@ -21,7 +21,7 @@ def get_users(): port=APCD_DB['port'], sslmode='require' ) - query = """SELECT + query = """SELECT users.role_id, users.user_id, users.user_email, @@ -33,11 +33,11 @@ def get_users(): users.active, users.user_number, roles.role_name - FROM users - NATURAL JOIN roles - LEFT JOIN submitter_users ON users.user_id = submitter_users.user_id - AND users.user_number = submitter_users.user_number - LEFT JOIN submitters on submitter_users.submitter_id = submitters.submitter_id + FROM users + LEFT JOIN roles on roles.role_id = users.role_id + LEFT JOIN submitter_users ON users.user_id = submitter_users.user_id + AND users.user_number = submitter_users.user_number + LEFT JOIN submitters on submitter_users.submitter_id = submitters.submitter_id ORDER BY submitters.entity_name ASC; """ cur = conn.cursor()