beta.2 (#102)

* beta.2

* v1 fix

* use xct equal

* bump

* fix test ordering issue

Author: tanner0101

.github/workflows/test.yml

@@ -7,15 +7,15 @@ jobs:
       image: vapor/swift:5.1-xenial
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - run: swift test
+    - uses: actions/checkout@v1
+    - run: swift test --enable-test-discovery --sanitize=thread
   bionic:
     container: 
       image: vapor/swift:5.1-bionic
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - run: swift test
+    - uses: actions/checkout@v1
+    - run: swift test --enable-test-discovery --sanitize=thread
   sqlite:
     container: 
       image: vapor/swift:5.1
@@ -26,7 +26,7 @@ jobs:
       working-directory: ./
     - run: swift package edit fluent-kit --revision ${{ github.sha }}
       working-directory: ./fluent-sqlite-driver
-    - run: swift test
+    - run: swift test --enable-test-discovery --sanitize=thread
       working-directory: ./fluent-sqlite-driver
   postgres:
     container: 
@@ -46,7 +46,7 @@ jobs:
       working-directory: ./
     - run: swift package edit fluent-kit --revision ${{ github.sha }}
       working-directory: ./fluent-postgres-driver
-    - run: swift test
+    - run: swift test --enable-test-discovery --sanitize=thread
       working-directory: ./fluent-postgres-driver
       env:
         POSTGRES_HOSTNAME: psql
@@ -67,7 +67,7 @@ jobs:
       working-directory: ./
     - run: swift package edit fluent-kit --revision ${{ github.sha }}
       working-directory: ./fluent-mysql-driver
-    - run: swift test
+    - run: swift test --enable-test-discovery --sanitize=thread
       working-directory: ./fluent-mysql-driver
       env:
         MYSQL_HOSTNAME: mysql

Package.swift

@@ -3,6 +3,9 @@ import PackageDescription
 
 let package = Package(
     name: "fluent-kit",
+    platforms: [
+       .macOS(.v10_14)
+    ],
     products: [
         .library(name: "FluentKit", targets: ["FluentKit"]),
         .library(name: "FluentBenchmark", targets: ["FluentBenchmark"]),
@@ -11,7 +14,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
-        .package(url: "https://github.com/vapor/sql-kit.git", .branch("master")),
+        .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0-beta.2"),
     ],
     targets: [
         .target(name: "FluentKit", dependencies: ["NIO", "Logging"]),

README.md

@@ -18,3 +18,4 @@
         <img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">
     </a>
 </p>
+

Sources/FluentBenchmark/FluentBenchmarker.swift

@@ -219,24 +219,41 @@ public final class FluentBenchmarker {
                 var id: Int
                 var name: String
                 var galaxy: GalaxyJSON
+
+                init(name: String, galaxy: GalaxyJSON, on database: Database) throws {
+                    self.id = try Planet.query(on: database)
+                        .filter(\.$name == name)
+                        .first().wait()?
+                        .id ?? 0
+                    self.name = name
+                    self.galaxy = galaxy
+                }
             }
             struct GalaxyJSON: Codable, Equatable {
                 var id: Int
                 var name: String
+
+                init(name: String, on database: Database) throws {
+                    self.id = try Galaxy.query(on: database)
+                        .filter(\.$name == name)
+                        .first().wait()?
+                        .id ?? 0
+                    self.name = name
+                }
             }
 
-            let milkyWay = GalaxyJSON(id: 2, name: "Milky Way")
-            let andromeda = GalaxyJSON(id: 1, name: "Andromeda")
-            let expected: [PlanetJSON] = [
-                .init(id: 1, name: "Mercury", galaxy: milkyWay),
-                .init(id: 2, name: "Venus", galaxy: milkyWay),
-                .init(id: 3, name: "Earth", galaxy: milkyWay),
-                .init(id: 4, name: "Mars", galaxy: milkyWay),
-                .init(id: 5, name: "Jupiter", galaxy: milkyWay),
-                .init(id: 6, name: "Saturn", galaxy: milkyWay),
-                .init(id: 7, name: "Uranus", galaxy: milkyWay),
-                .init(id: 8, name: "Neptune", galaxy: milkyWay),
-                .init(id: 9, name: "PA-99-N2", galaxy: andromeda),
+            let milkyWay = try GalaxyJSON(name: "Milky Way", on: self.database)
+            let andromeda = try GalaxyJSON(name: "Andromeda", on: self.database)
+            let expected: [PlanetJSON] = try [
+                .init(name: "Mercury", galaxy: milkyWay, on: self.database),
+                .init(name: "Venus", galaxy: milkyWay, on: self.database),
+                .init(name: "Earth", galaxy: milkyWay, on: self.database),
+                .init(name: "Mars", galaxy: milkyWay, on: self.database),
+                .init(name: "Jupiter", galaxy: milkyWay, on: self.database),
+                .init(name: "Saturn", galaxy: milkyWay, on: self.database),
+                .init(name: "Uranus", galaxy: milkyWay, on: self.database),
+                .init(name: "Neptune", galaxy: milkyWay, on: self.database),
+                .init(name: "PA-99-N2", galaxy: andromeda, on: self.database),
             ]
 
             // subquery
@@ -246,9 +263,7 @@ public final class FluentBenchmarker {
                     .all().wait()
 
                 let decoded = try JSONDecoder().decode([PlanetJSON].self, from: JSONEncoder().encode(planets))
-                guard decoded == expected else {
-                    throw Failure("unexpected output")
-                }
+                XCTAssertEqual(decoded, expected)
             }
 
             // join
@@ -258,11 +273,8 @@ public final class FluentBenchmarker {
                     .all().wait()
 
                 let decoded = try JSONDecoder().decode([PlanetJSON].self, from: JSONEncoder().encode(planets))
-                guard decoded == expected else {
-                    throw Failure("unexpected output")
-                }
+                XCTAssertEqual(decoded, expected)
             }
-
         }
     }
 

Sources/FluentBenchmark/GalaxySeed.swift

@@ -4,8 +4,12 @@ final class GalaxySeed: Migration {
     init() { }
 
     func prepare(on database: Database) -> EventLoopFuture<Void> {
-        let saves = ["Andromeda", "Milky Way", "Messier 82"].map { name -> EventLoopFuture<Void> in
-            return Galaxy(name: name)
+        let saves = [
+            "Andromeda",
+            "Milky Way",
+            "Messier 82"
+        ].map {
+            Galaxy(name: $0)
                 .save(on: database)
         }
         return .andAllSucceed(saves, on: database.eventLoop)