Merge pull request #662 from vapor/beta-5-updates

Fluent Beta 5

Author: gwynne

.github/workflows/test.yml

@@ -4,14 +4,14 @@ on:
 jobs:
   xenial:
     container: 
-      image: vapor/swift:5.1-xenial
+      image: vapor/swift:5.2-xenial
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     - run: swift test --enable-test-discovery --sanitize=thread
   bionic:
     container: 
-      image: vapor/swift:5.1-bionic
+      image: vapor/swift:5.2-bionic
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

Package.swift

@@ -4,14 +4,14 @@ import PackageDescription
 let package = Package(
     name: "fluent",
     platforms: [
-       .macOS(.v10_14)
+       .macOS(.v10_15)
     ],
     products: [
         .library(name: "Fluent", targets: ["Fluent"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-beta.2"),
-        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta.2"),
+        .package(url: "https://github.com/vapor/fluent-kit.git", from: "1.0.0-beta.5"),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0-beta.4"),
     ],
     targets: [
         .target(name: "Fluent", dependencies: ["FluentKit", "Vapor"]),

Tests/FluentTests/FluentOperatorTests.swift

@@ -32,7 +32,7 @@ final class FluentOperatorTests: XCTestCase {
 private final class Planet: Model {
     static let schema = "planets"
 
-    @ID(key: "id")
+    @ID(custom: .id)
     var id: Int?
 
     @Field(key: "name")
@@ -44,15 +44,23 @@ private struct DummyDatabase: Database {
         fatalError()
     }
 
-    func execute(query: DatabaseQuery, onRow: @escaping (DatabaseRow) -> ()) -> EventLoopFuture<Void> {
+    func execute(query: DatabaseQuery, onOutput: @escaping (DatabaseOutput) -> ()) -> EventLoopFuture<Void> {
         fatalError()
     }
 
     func execute(schema: DatabaseSchema) -> EventLoopFuture<Void> {
         fatalError()
     }
 
+    func execute(enum: DatabaseEnum) -> EventLoopFuture<Void> {
+        fatalError()
+    }
+    
     func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
         fatalError()
     }
+    
+    func transaction<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        fatalError()
+    }
 }

Tests/FluentTests/FluentPaginationTests.swift

@@ -11,25 +11,22 @@ final class FluentPaginationTests: XCTestCase {
         for i in 1...1_000 {
             rows.append(TestRow(data: ["id": i, "title": "Todo #\(i)"]))
         }
-
-        app.databases.use(TestDatabaseDriver { query in
+    
+        app.databases.use(TestDatabaseConfiguration { query in
             XCTAssertEqual(query.schema, "todos")
             let result: [TestRow]
             if let limit = query.limits.first?.value, let offset = query.offsets.first?.value {
                 result = [TestRow](rows[min(offset, rows.count - 1)..<min(offset + limit, rows.count)])
             } else {
                 result = rows
             }
-
-            if query.fields.count == 1 {
-                // aggregate
-                return [
-                    TestRow(data: ["fluentAggregate": rows.count])
-                ]
-            } else {
-                return result
+            
+            switch query.action {
+                case .aggregate(_):
+                    return [TestRow(data: [.aggregate: rows.count])]
+                default:
+                    return result
             }
-
         }, as: .test)
 
         app.get("todos") { req -> EventLoopFuture<Page<Todo>> in
@@ -90,7 +87,7 @@ private extension DatabaseQuery.Offset {
 private final class Todo: Model, Content {
     static let schema = "todos"
 
-    @ID(key: "id")
+    @ID(custom: .id)
     var id: Int?
 
     @Field(key: "title")

Tests/FluentTests/FluentRepositoryTests.swift

@@ -37,7 +37,7 @@ final class FluentRepositoryTests: XCTestCase {
         let app = Application(.testing)
         defer { app.shutdown() }
 
-        app.databases.use(TestDatabaseDriver { query in
+        app.databases.use(TestDatabaseConfiguration { query in
             XCTAssertEqual(query.schema, "posts")
             return [
                 TestRow(data: ["id": 1, "content": "a"]),
@@ -102,7 +102,7 @@ private final class Post: Model, Content, Equatable {
 
     static var schema: String { "posts" }
 
-    @ID(key: "id")
+    @ID(custom: .id)
     var id: Int?
 
     @Field(key: "content")

Tests/FluentTests/TestDatabase.swift

@@ -8,40 +8,52 @@ struct TestDatabase: Database {
     let driver: TestDatabaseDriver
     let context: DatabaseContext
 
-    func execute(query: DatabaseQuery, onRow: @escaping (DatabaseRow) -> ()) -> EventLoopFuture<Void> {
-        self.driver.handler(query).forEach(onRow)
+    func execute(query: DatabaseQuery, onOutput: @escaping (DatabaseOutput) -> ()) -> EventLoopFuture<Void> {
+        self.driver.handler(query).forEach(onOutput)
         return self.eventLoop.makeSucceededFuture(())
     }
 
     func execute(schema: DatabaseSchema) -> EventLoopFuture<Void> {
         fatalError()
     }
-
+    
+    func execute(enum: DatabaseEnum) -> EventLoopFuture<Void> {
+        fatalError()
+    }
+    
     func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
         closure(self)
     }
+
+    func transaction<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        closure(self)
+    }
 }
 
-struct TestRow: DatabaseRow {
-    var data: [String: Any]
+struct TestRow: DatabaseOutput {
+    var data: [FieldKey: Any]
 
     var description: String {
         self.data.description
     }
+    
+    func schema(_ schema: String) -> DatabaseOutput {
+        self
+    }
 
-    func contains(field: String) -> Bool {
+    func contains(_ field: FieldKey) -> Bool {
         self.data.keys.contains(field)
     }
 
-    func decode<T>(field: String, as type: T.Type, for database: Database) throws -> T where T : Decodable {
-        return self.data[field] as! T
+    func decode<T>(_ field: FieldKey, as type: T.Type) throws -> T where T : Decodable {
+        self.data[field]! as! T
     }
 }
 
 final class TestDatabaseDriver: DatabaseDriver {
-    let handler: (DatabaseQuery) -> [DatabaseRow]
+    let handler: (DatabaseQuery) -> [DatabaseOutput]
 
-    init(_ handler: @escaping (DatabaseQuery) -> [DatabaseRow]) {
+    init(_ handler: @escaping (DatabaseQuery) -> [DatabaseOutput]) {
         self.handler = handler
     }
 
@@ -53,3 +65,13 @@ final class TestDatabaseDriver: DatabaseDriver {
         // nothing
     }
 }
+
+struct TestDatabaseConfiguration: DatabaseConfiguration {
+    let handler: (DatabaseQuery) -> [DatabaseOutput]
+
+    var middleware: [AnyModelMiddleware] = []
+
+    func makeDriver(for databases: Databases) -> DatabaseDriver {
+        TestDatabaseDriver(handler)
+    }
+}