nio 2 final (#18)

Author: tanner0101

Package.swift

@@ -8,8 +8,8 @@ let package = Package(
         .executable(name: "NIOPostgresBenchmark", targets: ["NIOPostgresBenchmark"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0-convergence"),
-        .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0-convergence"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.0.0"),
+        .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.0.0"),
     ],
     targets: [
         .target(name: "CMD5", dependencies: []),

…stgres/Connection/PostgresDatabase.swift …Postgres/Connection/PostgresClient.swiftSources/NIOPostgres/Connection/PostgresDatabase.swift renamed to Sources/NIOPostgres/Connection/PostgresClient.swift Sources/NIOPostgres/Connection/PostgresDatabase.swift renamed to Sources/NIOPostgres/Connection/PostgresClient.swift

@@ -1,7 +1,7 @@
 #warning("TODO: make this protocol more general, not depend on PostgresRequestHandler")
-public protocol PostgresDatabase {
+public protocol PostgresClient {
     var eventLoop: EventLoop { get }
     func send(_ request: PostgresRequestHandler) -> EventLoopFuture<Void>
 }
 
-extension PostgresConnection: PostgresDatabase { }
+extension PostgresConnection: PostgresClient { }

Sources/NIOPostgres/Connection/PostgresDatabase+Query.swift

@@ -1,6 +1,6 @@
 import NIO
 
-extension PostgresDatabase {
+extension PostgresClient {
     public func query(_ string: String, _ binds: [PostgresData] = []) -> EventLoopFuture<[PostgresRow]> {
         var rows: [PostgresRow] = []
         return query(string, binds) { rows.append($0) }.map { rows }

Sources/NIOPostgres/Connection/PostgresDatabase+SimpleQuery.swift

@@ -1,6 +1,6 @@
 import NIO
 
-extension PostgresDatabase {
+extension PostgresClient {
     public func simpleQuery(_ string: String) -> EventLoopFuture<[PostgresRow]> {
         var rows: [PostgresRow] = []
         return simpleQuery(string) { rows.append($0) }.map { rows }

Tests/NIOPostgresTests/NIOPostgresTests.swift

@@ -263,7 +263,6 @@ final class NIOPostgresTests: XCTestCase {
 
     func testSelectPerformance() throws {
         // std deviation too high
-        return;
         let conn = try PostgresConnection.test(on: eventLoop).wait()
         measure {
             do {
@@ -276,7 +275,6 @@ final class NIOPostgresTests: XCTestCase {
 
     func testRangeSelectPerformance() throws {
         // std deviation too high
-        return;
         let conn = try PostgresConnection.test(on: eventLoop).wait()
         measure {
             do {
@@ -289,7 +287,6 @@ final class NIOPostgresTests: XCTestCase {
 
     func testRangeSelectDecodePerformance() throws {
         // std deviation too high
-        return;
         struct Series: Decodable {
             var num: Int
         }

circle.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   11-linux:
     docker:
-      - image: codevapor/swift:5.0
+      - image: vapor/swift:5.0
       - image: circleci/postgres:11
         name: psql
         environment:
@@ -16,7 +16,7 @@ jobs:
       - run: swift test
   10-linux:
     docker:
-      - image: codevapor/swift:5.0
+      - image: vapor/swift:5.0
       - image: circleci/postgres:10
         name: psql
         environment:
@@ -29,7 +29,7 @@ jobs:
       - run: swift test
   9-linux:
     docker:
-      - image: codevapor/swift:5.0
+      - image: vapor/swift:5.0
       - image: circleci/postgres:9
         name: psql
         environment:
@@ -42,7 +42,7 @@ jobs:
       - run: swift test
   linux-release:
     docker:
-      - image: codevapor/swift:5.0
+      - image: vapor/swift:5.0
     steps:
       - checkout
       - run: swift build -c release
@@ -54,4 +54,3 @@ workflows:
       - 10-linux
       - 9-linux
       - linux-release
-