adjusted assignment flow for filters down to the return value

vapor · Jan 2, 2025 · 9392e03 · 9392e03
1 parent cc66701
commit 9392e03
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Sources/FluentKit/Query/Builder/QueryBuilder+Join.swift b/Sources/FluentKit/Query/Builder/QueryBuilder+Join.swift
@@ -36,16 +36,16 @@ extension QueryBuilder {
     ) -> Self
         where Foreign: Schema
     {
+        let finalFilters: [DatabaseQuery.Filter]
 
-        // If deleted models aren't included, add filters
-        // to exclude them for each model being queried.
+        // If deleted models aren't included, add filters to exclude them for each model being queried.
         if !self.includeDeleted {
-            let filters = foreign.excludeDeleted(from: filters)
-            
-            return self.join(Foreign.self, on: .advancedJoin(schema: Foreign.schema, space: Foreign.space, alias: Foreign.alias, method, filters: filters))
+            finalFilters = foreign.excludeDeleted(from: filters)
+        } else {
+            finalFilters = filters
         }
 
-        return self.join(Foreign.self, on: .advancedJoin(schema: Foreign.schema, space: Foreign.space, alias: Foreign.alias, method, filters: filters))
+        return self.join(Foreign.self, on: .advancedJoin(schema: Foreign.schema, space: Foreign.space, alias: Foreign.alias, method, filters: finalFilters))
     }
 
     /// `.join(Foreign.self, on: databaseJoin)`