extract common code and follow a similar pattern

prisma · Feb 15, 2024 · a7840be · a7840be
1 parent 89b3f31
commit a7840be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/query-engine/core/src/query_ast/read.rs b/query-engine/core/src/query_ast/read.rs
@@ -65,11 +65,11 @@ impl ReadQuery {
         }
     }
 
-    pub(crate) fn requires_inmemory_processing_for_distinct_with_joins(&self) -> bool {
+    pub(crate) fn requires_inmemory_distinct_with_joins(&self) -> bool {
         match self {
             ReadQuery::RecordQuery(_) => false,
-            ReadQuery::ManyRecordsQuery(q) => q.requires_inmemory_processing_for_distinct_with_joins(),
-            ReadQuery::RelatedRecordsQuery(q) => q.requires_inmemory_processing_for_distinct_with_joins(),
+            ReadQuery::ManyRecordsQuery(q) => q.requires_inmemory_distinct_with_joins(),
+            ReadQuery::RelatedRecordsQuery(q) => q.requires_inmemory_distinct_with_joins(),
             ReadQuery::AggregateRecordsQuery(_) => false,
         }
     }
@@ -208,12 +208,9 @@ pub struct ManyRecordsQuery {
 }
 
 impl ManyRecordsQuery {
-    pub fn requires_inmemory_processing_for_distinct_with_joins(&self) -> bool {
-        self.args.distinct.is_some() && !self.args.can_distinct_in_db_with_joins()
-            || self
-                .nested
-                .iter()
-                .any(|q| q.requires_inmemory_processing_for_distinct_with_joins())
+    pub fn requires_inmemory_distinct_with_joins(&self) -> bool {
+        self.args.requires_inmemory_distinct_with_joins()
+            || self.nested.iter().any(|q| q.requires_inmemory_distinct_with_joins())
     }
 }
 
@@ -237,12 +234,9 @@ impl RelatedRecordsQuery {
         self.args.cursor.is_some() || self.nested.iter().any(|q| q.has_cursor())
     }
 
-    pub fn requires_inmemory_processing_for_distinct_with_joins(&self) -> bool {
-        self.args.distinct.is_some() && !self.args.can_distinct_in_db_with_joins()
-            || self
-                .nested
-                .iter()
-                .any(|q| q.requires_inmemory_processing_for_distinct_with_joins())
+    pub fn requires_inmemory_distinct_with_joins(&self) -> bool {
+        self.args.requires_inmemory_distinct_with_joins()
+            || self.nested.iter().any(|q| q.requires_inmemory_distinct_with_joins())
     }
 }
 

diff --git a/query-engine/core/src/query_graph_builder/read/utils.rs b/query-engine/core/src/query_graph_builder/read/utils.rs
@@ -270,7 +270,7 @@ pub(crate) fn get_relation_load_strategy(
         && (distinct.is_none() || can_distinct_in_db)
         && !nested_queries.iter().any(|q| match q {
             ReadQuery::RelatedRecordsQuery(q) => {
-                q.has_cursor() || q.requires_inmemory_processing_for_distinct_with_joins()
+                q.has_cursor() || q.requires_inmemory_distinct_with_joins()
             }
             _ => false,
         })

diff --git a/query-engine/query-structure/src/query_arguments.rs b/query-engine/query-structure/src/query_arguments.rs
@@ -93,6 +93,10 @@ impl QueryArguments {
         self.distinct.is_some() && !self.can_distinct_in_db()
     }
 
+    pub fn requires_inmemory_distinct_with_joins(&self) -> bool {
+        self.distinct.is_some() && !self.can_distinct_in_db_with_joins()
+    }
+
     fn can_distinct_in_db(&self) -> bool {
         let has_distinct_feature = self
             .model()