Remove ELF-based JoinedQueryBuilder.all

Author: finestructure

Sources/App/Core/Query+Support/JoinedQueryBuilder.swift

@@ -134,11 +134,6 @@ struct JoinedQueryBuilder<J: ModelInitializable> {
             .map(J.init(model:))
     }
 
-    func all() -> EventLoopFuture<[J]> {
-        queryBuilder.all()
-            .mapEach(J.init(model:))
-    }
-
     func first() async throws -> J? {
         try await queryBuilder.first()
             .map(J.init(model:))

Tests/AppTests/Joined3Tests.swift

@@ -19,84 +19,81 @@ import XCTest
 
 class Joined3Tests: AppTestCase {
 
-    func test_query_no_version() throws {
+    func test_query_no_version() async throws {
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p).save(on: app.db).wait()
+        try await Repository(package: p).save(on: app.db)
 
         // MUT
-        let res = try Joined3<Package, Repository, Version>.query(on: app.db)
-            .all()
-            .wait()
+        let res = try await Joined3<Package, Repository, Version>.query(on: app.db).all()
 
         // validate
         XCTAssertEqual(res.map(\.model.id), [])
     }
 
-    func test_query_multiple_versions() throws {
+    func test_query_multiple_versions() async throws {
         // Ensure multiple versions don't multiply the package selection
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p).save(on: app.db).wait()
-        try Version(package: p, latest: .defaultBranch).save(on: app.db).wait()
-        try Version(package: p, latest: .release).save(on: app.db).wait()
+        try await Repository(package: p).save(on: app.db)
+        try await Version(package: p, latest: .defaultBranch).save(on: app.db)
+        try await Version(package: p, latest: .release).save(on: app.db)
 
         // MUT
-        let res = try Joined3<Package, Repository, Version>
+        let res = try await Joined3<Package, Repository, Version>
             .query(on: app.db, version: .defaultBranch)
             .all()
-            .wait()
 
         // validate
         XCTAssertEqual(res.map(\.model.id), [p.id])
     }
 
 
-    func test_query_relationship_properties() throws {
+    func test_query_relationship_properties() async throws {
         // Ensure relationship properties are populated by query
         // setup
         let p = try savePackage(on: app.db, "1")
-        try Repository(package: p, owner: "owner").save(on: app.db).wait()
-        try Version(package: p,
+        try await Repository(package: p, owner: "owner").save(on: app.db)
+        try await Version(package: p,
                     latest: .defaultBranch,
-                    packageName: "package name").save(on: app.db).wait()
+                    packageName: "package name").save(on: app.db)
 
         // MUT
-        let res = try Joined3<Package, Repository, Version>
+        let res = try await Joined3<Package, Repository, Version>
             .query(on: app.db, version: .defaultBranch)
-            .all().wait()
+            .all()
 
         // validate
         XCTAssertEqual(res.map { $0.repository.owner }, ["owner"])
         XCTAssertEqual(res.map { $0.version.packageName }, ["package name"])
     }
 
-    func test_query_missing_relations() throws {
+    func test_query_missing_relations() async throws {
         // Neither should be possible in practice, this is just ensuring we cannot
         // force unwrap the `repository` or `version` properties in the pathological
         // event, because there are no results to access the properties on.
         do {  // no repository
             let p = try savePackage(on: app.db, "1")
-            try Version(package: p,
+            try await Version(package: p,
                         latest: .defaultBranch,
-                        packageName: "package name").save(on: app.db).wait()
+                        packageName: "package name").save(on: app.db)
 
             // MUT
-            let res = try Joined3<Package, Repository, Version>
+            let res = try await Joined3<Package, Repository, Version>
                 .query(on: app.db, version: .defaultBranch)
-                .all().wait()
+                .all()
 
             // validate - result is empty, `res[0].repository` cannot be called
             XCTAssertTrue(res.isEmpty)
         }
         do {  // no version
             let p = try savePackage(on: app.db, "2")
-            try Repository(package: p, owner: "owner").save(on: app.db).wait()
+            try await Repository(package: p, owner: "owner").save(on: app.db)
 
             // MUT
-            let res = try Joined3<Package, Repository, Version>
+            let res = try await Joined3<Package, Repository, Version>
                 .query(on: app.db, version: .defaultBranch)
-                .all().wait()
+                .all()
 
             // validate - result is empty, `res[0].repository` cannot be called
             XCTAssertTrue(res.isEmpty)

Tests/AppTests/JoinedQueryBuilderTests.swift

@@ -24,7 +24,7 @@ import XCTest
 /// and essentially compiler checked.
 class JoinedQueryBuilderTests: AppTestCase {
 
-    func test_sort() throws {
+    func test_sort() async throws {
         // setup
         try (0..<3).shuffled().forEach { idx in
             try Package(url: "\(idx)".url).save(on: app.db).wait()
@@ -38,29 +38,29 @@ class JoinedQueryBuilderTests: AppTestCase {
 
         do {  // test sort(_ sort: DatabaseQuery.Sort)
             // MUT
-            let res = try query()
+            let res = try await query()
                 .sort(DatabaseQuery.Sort.sort(.sql(unsafeRaw: "url"), .descending))
-                .all().wait()
+                .all()
 
             // validate
             XCTAssertEqual(res.map(\.url), ["2", "1", "0"])
         }
 
         do {  // test sort<Field>(_ field: KeyPath<...>, _ direction:)
             // MUT
-            let res = try query()
+            let res = try await query()
                 .sort(\.$url, .descending)
-                .all().wait()
+                .all()
 
             // validate
             XCTAssertEqual(res.map(\.url), ["2", "1", "0"])
         }
 
         do {  // test sort(_ field: DatabaseQuery.Field, _ direction:)
             // MUT
-            let res = try query()
+            let res = try await query()
                 .sort(DatabaseQuery.Field.sql(unsafeRaw: "url"), .descending)
-                .all().wait()
+                .all()
 
             // validate
             XCTAssertEqual(res.map(\.url), ["2", "1", "0"])