added distinct when outer joining for user filters (#3641)

* added distinct when outer joining for user filters * Added distinct when outer joining for user filters for all
onyx-dot-app · Jan 9, 2025 · c55de28 · c55de28
1 parent 2ae91f0
commit c55de28
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/backend/ee/onyx/db/token_limit.py b/backend/ee/onyx/db/token_limit.py
@@ -24,6 +24,7 @@ def _add_user_filters(
     if user is None or user.role == UserRole.ADMIN:
         return stmt
 
+    stmt = stmt.distinct()
     TRLimit_UG = aliased(TokenRateLimit__UserGroup)
     User__UG = aliased(User__UserGroup)
 

diff --git a/backend/onyx/db/connector_credential_pair.py b/backend/onyx/db/connector_credential_pair.py
@@ -39,6 +39,7 @@ def _add_user_filters(
     if user is None or user.role == UserRole.ADMIN:
         return stmt
 
+    stmt = stmt.distinct()
     UG__CCpair = aliased(UserGroup__ConnectorCredentialPair)
     User__UG = aliased(User__UserGroup)
 

diff --git a/backend/onyx/db/credentials.py b/backend/onyx/db/credentials.py
@@ -74,6 +74,7 @@ def _add_user_filters(
         # Basic users can only access credentials that are owned by them
         return stmt.where(Credential.user_id == user.id)
 
+    stmt = stmt.distinct()
     """
     THIS PART IS FOR CURATORS AND GLOBAL CURATORS
     Here we select cc_pairs by relation:

diff --git a/backend/onyx/db/document_set.py b/backend/onyx/db/document_set.py
@@ -40,6 +40,7 @@ def _add_user_filters(
     if user is None or user.role == UserRole.ADMIN:
         return stmt
 
+    stmt = stmt.distinct()
     DocumentSet__UG = aliased(DocumentSet__UserGroup)
     User__UG = aliased(User__UserGroup)
     """

diff --git a/backend/onyx/db/feedback.py b/backend/onyx/db/feedback.py
@@ -50,6 +50,7 @@ def _add_user_filters(
     if user is None or user.role == UserRole.ADMIN:
         return stmt
 
+    stmt = stmt.distinct()
     DocByCC = aliased(DocumentByConnectorCredentialPair)
     CCPair = aliased(ConnectorCredentialPair)
     UG__CCpair = aliased(UserGroup__ConnectorCredentialPair)

diff --git a/backend/onyx/db/persona.py b/backend/onyx/db/persona.py
@@ -49,6 +49,7 @@ def _add_user_filters(
     if user is None or user.role == UserRole.ADMIN:
         return stmt
 
+    stmt = stmt.distinct()
     Persona__UG = aliased(Persona__UserGroup)
     User__UG = aliased(User__UserGroup)
     """