Fix up FluentKit tests after SQLKit update

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.7
 import PackageDescription
 
 let package = Package(
@@ -23,6 +23,7 @@ let package = Package(
     ],
     targets: [
         .target(name: "FluentKit", dependencies: [
+            .product(name: "NIO", package: "swift-nio"),
             .product(name: "NIOCore", package: "swift-nio"),
             .product(name: "Logging", package: "swift-log"),
             .product(name: "AsyncKit", package: "async-kit"),

Sources/FluentBenchmark/FluentBenchmarker.swift

@@ -54,15 +54,15 @@ public final class FluentBenchmarker {
 
     internal func runTest(
         _ name: String, 
-        _ migrations: [Migration], 
+        _ migrations: [any Migration], 
         _ test: () throws -> ()
     ) throws {
         try self.runTest(name, migrations, { _ in try test() })
     }
 
     internal func runTest(
         _ name: String,
-        _ migrations: [Migration],
+        _ migrations: [any Migration],
         _ test: (any Database) throws -> ()
     ) throws {
         // This re-initialization is required to make the middleware tests work thanks to ridiculous design flaws
@@ -75,7 +75,7 @@ public final class FluentBenchmarker {
 
     internal func runTest(
         _ name: String,
-        _ migrations: [Migration],
+        _ migrations: [any Migration],
         on database: any Database,
         _ test: (any Database) throws -> ()
     ) throws {

Sources/FluentBenchmark/SolarSystem/GalacticJurisdiction.swift

@@ -51,7 +51,7 @@ public final class GalacticJurisdiction: Model {
 public struct GalacticJurisdictionMigration: Migration {
     public init() {}
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(GalacticJurisdiction.schema)
             .field("galaxy_id", .uuid, .required, .references(Galaxy.schema, .id, onDelete: .cascade, onUpdate: .cascade))
             .field("jurisdiction_id", .uuid, .required, .references(Jurisdiction.schema, .id, onDelete: .cascade, onUpdate: .cascade))
@@ -60,7 +60,7 @@ public struct GalacticJurisdictionMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(GalacticJurisdiction.schema)
             .delete()
     }
@@ -69,7 +69,7 @@ public struct GalacticJurisdictionMigration: Migration {
 public struct GalacticJurisdictionSeed: Migration {
     public init() {}
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.eventLoop.flatSubmit {
             Galaxy.query(on: database).all().and(
             Jurisdiction.query(on: database).all())
@@ -94,7 +94,7 @@ public struct GalacticJurisdictionSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         GalacticJurisdiction.query(on: database).delete()
     }
 }

Sources/FluentBenchmark/SolarSystem/Galaxy.swift

@@ -29,22 +29,22 @@ public final class Galaxy: Model {
 public struct GalaxyMigration: Migration {
     public init() {}
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("galaxies")
             .field("id", .uuid, .identifier(auto: false))
             .field("name", .string, .required)
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("galaxies").delete()
     }
 }
 
 public struct GalaxySeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         .andAllSucceed([
             "Andromeda",
             "Milky Way",
@@ -56,7 +56,7 @@ public struct GalaxySeed: Migration {
         }, on: database.eventLoop)
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Galaxy.query(on: database).delete()
     }
 }

Sources/FluentBenchmark/SolarSystem/Governor.swift

@@ -30,7 +30,7 @@ public final class Governor: Model {
 }
 
 public struct GovernorMigration: Migration {
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(Governor.schema)
             .field(.id, .uuid, .identifier(auto: false), .required)
             .field("name", .string, .required)
@@ -39,15 +39,15 @@ public struct GovernorMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(Governor.schema).delete()
     }
 }
 
 public struct GovernorSeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         Planet.query(on: database).all().flatMap { planets in
             .andAllSucceed(planets.map { planet in
                 let governor: Governor?
@@ -64,7 +64,7 @@ public struct GovernorSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Governor.query(on: database).delete()
     }
 }

Sources/FluentBenchmark/SolarSystem/Jurisdiction.swift

@@ -26,15 +26,15 @@ public final class Jurisdiction: Model {
 public struct JurisdictionMigration: Migration {
     public init() {}
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(Jurisdiction.schema)
             .field(.id, .uuid, .identifier(auto: false), .required)
             .field("title", .string, .required)
             .unique(on: "title")
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(Jurisdiction.schema)
             .delete()
     }
@@ -43,7 +43,7 @@ public struct JurisdictionMigration: Migration {
 public struct JurisdictionSeed: Migration {
     public init() {}
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         [
             "Old",
             "Corporate",
@@ -55,7 +55,7 @@ public struct JurisdictionSeed: Migration {
         .create(on: database)
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Jurisdiction.query(on: database)
             .delete()
     }

Sources/FluentBenchmark/SolarSystem/Moon.swift

@@ -38,7 +38,7 @@ public final class Moon: Model {
 public struct MoonMigration: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("moons")
             .field("id", .uuid, .identifier(auto: false))
             .field("name", .string, .required)
@@ -48,15 +48,15 @@ public struct MoonMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("moons").delete()
     }
 }
 
 public final class MoonSeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         Planet.query(on: database).all().flatMap { planets in
             .andAllSucceed(planets.map { planet in
                 let moons: [Moon]
@@ -92,7 +92,7 @@ public final class MoonSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Moon.query(on: database).delete()
     }
 }

Sources/FluentBenchmark/SolarSystem/Planet.swift

@@ -45,7 +45,7 @@ public final class Planet: Model {
 }
 
 public struct PlanetMigration: Migration {
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("planets")
             .field("id", .uuid, .identifier(auto: false))
             .field("name", .string, .required)
@@ -55,15 +55,15 @@ public struct PlanetMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("planets").delete()
     }
 }
 
 public struct PlanetSeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         Star.query(on: database).all().flatMap { stars in
             .andAllSucceed(stars.map { star in
                 let planets: [Planet]
@@ -91,7 +91,7 @@ public struct PlanetSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Planet.query(on: database).delete(force: true)
     }
 }

Sources/FluentBenchmark/SolarSystem/PlanetTag.swift

@@ -31,7 +31,7 @@ public final class PlanetTag: Model {
 public struct PlanetTagMigration: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(PlanetTag.schema)
             .id()
             .field("planet_id", .uuid, .required)
@@ -42,15 +42,15 @@ public struct PlanetTagMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema(PlanetTag.schema).delete()
     }
 }
 
 public struct PlanetTagSeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         let planets = Planet.query(on: database).all()
         let tags = Tag.query(on: database).all()
         return planets.and(tags).flatMap { (planets, tags) in
@@ -75,7 +75,7 @@ public struct PlanetTagSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         PlanetTag.query(on: database).delete()
     }
 }

Sources/FluentBenchmark/SolarSystem/SolarSystem.swift

@@ -2,7 +2,7 @@ import AsyncKit
 import FluentKit
 import NIOCore
 
-private let migrations: [Migration] = [
+private let migrations: [any Migration] = [
     GalaxyMigration(),
     StarMigration(),
     PlanetMigration(),
@@ -12,7 +12,7 @@ private let migrations: [Migration] = [
     PlanetTagMigration(),
 ]
 
-private let seeds: [Migration] = [
+private let seeds: [any Migration] = [
     GalaxySeed(),
     StarSeed(),
     PlanetSeed(),
@@ -28,8 +28,8 @@ public struct SolarSystem: Migration {
         self.seed = seed
     }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
-        let all: [Migration]
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
+        let all: [any Migration]
         if self.seed {
             all = migrations + seeds
         } else {
@@ -39,8 +39,8 @@ public struct SolarSystem: Migration {
         return all.sequencedFlatMapEach(on: database.eventLoop) { $0.prepare(on: database) }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
-        let all: [Migration]
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
+        let all: [any Migration]
         if self.seed {
             all = migrations + seeds
         } else {

Sources/FluentBenchmark/SolarSystem/Star.swift

@@ -30,7 +30,7 @@ public final class Star: Model {
 }
 
 public struct StarMigration: Migration {
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("stars")
             .field("id", .uuid, .identifier(auto: false))
             .field("name", .string, .required)
@@ -39,15 +39,15 @@ public struct StarMigration: Migration {
             .create()
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         database.schema("stars").delete()
     }
 }
 
 public final class StarSeed: Migration {
     public init() { }
 
-    public func prepare(on database: Database) -> EventLoopFuture<Void> {
+    public func prepare(on database: any Database) -> EventLoopFuture<Void> {
         Galaxy.query(on: database).all().flatMap { galaxies in
             .andAllSucceed(galaxies.map { galaxy in
                 let stars: [Star]
@@ -64,7 +64,7 @@ public final class StarSeed: Migration {
         }
     }
 
-    public func revert(on database: Database) -> EventLoopFuture<Void> {
+    public func revert(on database: any Database) -> EventLoopFuture<Void> {
         Star.query(on: database).delete(force: true)
     }
 }