alpha (#138)

* alpha

* updates

* updates

Author: tanner0101

.gitignore

@@ -4,4 +4,5 @@
 /*.xcodeproj
 Package.resolved
 DerivedData
+.swiftpm
 

Package.swift

@@ -5,16 +5,14 @@ let package = Package(
     name: "postgres-kit",
     products: [
         .library(name: "PostgresKit", targets: ["PostgresKit"]),
-        .executable(name: "PostgresKitPerformance", targets: ["PostgresKitPerformance"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/nio-postgres.git", .branch("master")),
-        .package(url: "https://github.com/vapor/sql.git", .branch("master")),
-        .package(url: "https://github.com/vapor/nio-kit.git", .branch("master")),
+        .package(url: "https://github.com/vapor/postgres-nio.git", from: "1.0.0-alpha"),
+        .package(url: "https://github.com/vapor/sql-kit.git", from: "3.0.0-alpha"),
+        .package(url: "https://github.com/vapor/async-kit.git", from: "1.0.0-alpha"),
     ],
     targets: [
-        .target(name: "PostgresKit", dependencies: ["NIOKit", "NIOPostgres", "SQLKit"]),
+        .target(name: "PostgresKit", dependencies: ["AsyncKit", "PostgresNIO", "SQLKit"]),
         .testTarget(name: "PostgresKitTests", dependencies: ["PostgresKit", "SQLKitBenchmark"]),
-        .target(name: "PostgresKitPerformance", dependencies: ["PostgresKit"]),
     ]
 )

README.md

@@ -1,18 +1,18 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/43222823-387a185a-901f-11e8-9582-84ba7af7bf5f.png" height="64" alt="PostgreSQL">
+    <img src="https://user-images.githubusercontent.com/1342803/59063319-d190f500-8875-11e9-8fe6-16197dd56d0f.png" alt="PostgresKit">
     <br>
     <br>
-    <a href="http://docs.vapor.codes/3.0/">
-        <img src="http://img.shields.io/badge/read_the-docs-2196f3.svg" alt="Documentation">
+    <a href="https://api.vapor.codes/postgres-kit/master/PostgresKit/index.html">
+        <img src="http://img.shields.io/badge/api-docs-2196f3.svg" alt="Documentation">
     </a>
     <a href="https://discord.gg/vapor">
         <img src="https://img.shields.io/discord/431917998102675485.svg" alt="Team Chat">
     </a>
     <a href="LICENSE">
         <img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT License">
     </a>
-    <a href="https://circleci.com/gh/vapor/postgresql">
-        <img src="https://circleci.com/gh/vapor/postgresql.svg?style=shield" alt="Continuous Integration">
+    <a href="https://circleci.com/gh/vapor/postgres-kit">
+        <img src="https://circleci.com/gh/vapor/postgres-kit.svg?style=shield" alt="Continuous Integration">
     </a>
     <a href="https://swift.org">
         <img src="http://img.shields.io/badge/swift-5-brightgreen.svg" alt="Swift 5">

Sources/PostgresKit/Exports.swift

@@ -1,3 +1,3 @@
-@_exported import NIOPostgres
-@_exported import NIOKit
+@_exported import AsyncKit
+@_exported import PostgresNIO
 @_exported import SQLKit

Sources/PostgresKit/Extensions.swift

@@ -0,0 +1,33 @@
+extension PostgresConnection: SQLDatabase { }
+
+extension SQLDatabase where Self: PostgresClient {
+    public func execute(sql query: SQLExpression, _ onRow: @escaping (SQLRow) throws -> ()) -> EventLoopFuture<Void> {
+        var serializer = SQLSerializer(dialect: PostgresDialect())
+        query.serialize(to: &serializer)
+        do {
+            return try self.query(serializer.sql, serializer.binds.map { encodable in
+                return try PostgresDataEncoder().encode(encodable)
+            }) { row in
+                try onRow(row)
+            }
+        } catch {
+            return self.eventLoop.makeFailedFuture(error)
+        }
+    }
+}
+
+extension ConnectionPool: SQLDatabase where Source.Connection: SQLDatabase {
+    public func execute(sql query: SQLExpression, _ onRow: @escaping (SQLRow) throws -> ()) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.execute(sql: query, onRow) }
+    }
+}
+
+extension ConnectionPool: PostgresClient where Source.Connection: PostgresClient {
+    public var eventLoop: EventLoop {
+        return self.source.eventLoop
+    }
+
+    public func send(_ request: PostgresRequest) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.send(request) }
+    }
+}