alpha (#116)

* alpha

* update to 5.1 image

* update

Author: tanner0101

.gitignore

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

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
@@ -7,23 +7,18 @@ let package = Package(
         .library(name: "FluentPostgresDriver", targets: ["FluentPostgresDriver"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/vapor/fluent-kit.git", .branch("master")),
-        .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/fluent-kit.git", from: "1.0.0-alpha"),
+        .package(url: "https://github.com/vapor/postgres-kit.git", from: "2.0.0-alpha"),
     ],
     targets: [
         .target(name: "FluentPostgresDriver", dependencies: [
             "FluentKit",
             "FluentSQL",
-            "NIOKit",
-            "NIOPostgres",
-            "SQLKit"
+            "PostgresKit",
         ]),
         .testTarget(name: "FluentPostgresDriverTests", dependencies: [
             "FluentBenchmark",
             "FluentPostgresDriver",
-            "SQLKitBenchmark"
         ]),
     ]
 )

README.md

@@ -1,20 +1,20 @@
 <p align="center">
-    <img src="https://user-images.githubusercontent.com/1342803/36623958-dc6f07f0-18d7-11e8-8c6c-01737f496de9.png" height="64" alt="Fluent PostgreSQL">
+    <img src="https://user-images.githubusercontent.com/1342803/59063319-d190f500-8875-11e9-8fe6-16197dd56d0f.png" alt="FluentPostgresDriver">
     <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/fluent-postgres-driver/master/FluentPostgresDriver/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/fluent-postgresql">
-        <img src="https://circleci.com/gh/vapor/fluent-postgresql.svg?style=shield" alt="Continuous Integration">
+    <a href="https://circleci.com/gh/vapor/fluent-postgres-driver">
+        <img src="https://circleci.com/gh/vapor/fluent-postgres-driver.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">
+        <img src="http://img.shields.io/badge/swift-5.1-brightgreen.svg" alt="Swift 5.1">
     </a>
 </p>

Sources/FluentPostgresDriver/ConnectionPool+Database.swift

@@ -0,0 +1,19 @@
+extension ConnectionPool: Database where Source.Connection: Database {
+    public var eventLoop: EventLoop {
+        return self.source.eventLoop
+    }
+
+    public func execute(_ schema: DatabaseSchema) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.execute(schema) }
+    }
+
+    public func execute(_ query: DatabaseQuery, _ onOutput: @escaping (DatabaseOutput) throws -> ()) -> EventLoopFuture<Void> {
+        return self.withConnection { $0.execute(query, onOutput) }
+    }
+
+    public func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        return self.withConnection { (conn: Source.Connection) in
+            return closure(conn)
+        }
+    }
+}

Sources/FluentPostgresDriver/Databases+Postgres.swift

@@ -0,0 +1,21 @@
+extension Databases {
+    public mutating func postgres(
+        config: PostgresConfiguration,
+        poolConfig: ConnectionPoolConfig = .init(),
+        as id: DatabaseID = .psql,
+        isDefault: Bool = true
+    ) {
+        let db = PostgresConnectionSource(
+            configuration: config,
+            on: self.eventLoop
+        )
+        let pool = ConnectionPool(config: poolConfig, source: db)
+        self.add(pool, as: id, isDefault: isDefault)
+    }
+}
+
+extension DatabaseID {
+    public static var psql: DatabaseID {
+        return .init(string: "psql")
+    }
+}

Sources/FluentPostgresDriver/Exports.swift

@@ -1,4 +1,2 @@
 @_exported import FluentKit
-@_exported import SQLKit
-@_exported import NIOKit
-@_exported import NIOPostgres
+@_exported import PostgresKit

Sources/FluentPostgresDriver/Postgres+Fluent.swift

@@ -0,0 +1,40 @@
+import FluentSQL
+
+extension PostgresConnection: Database {
+    public func withConnection<T>(_ closure: @escaping (Database) -> EventLoopFuture<T>) -> EventLoopFuture<T> {
+        return closure(self)
+    }
+
+    public func execute(_ query: DatabaseQuery, _ onOutput: @escaping (DatabaseOutput) throws -> ()) -> EventLoopFuture<Void> {
+        var sql = SQLQueryConverter(delegate: PostgresConverterDelegate())
+            .convert(query)
+        switch query.action {
+        case .create:
+            sql = PostgresReturning(sql)
+        default: break
+        }
+        return self.execute(sql: sql) { row in
+            try onOutput(row as! PostgresRow)
+        }
+    }
+
+    public func execute(_ schema: DatabaseSchema) -> EventLoopFuture<Void> {
+        let sql = SQLSchemaConverter(delegate: PostgresConverterDelegate())
+            .convert(schema)
+        return self.execute(sql: sql) { row in
+            fatalError("unexpected output")
+        }
+    }
+}
+
+private struct PostgresReturning: SQLExpression {
+    let base: SQLExpression
+    init(_ base: SQLExpression) {
+        self.base = base
+    }
+
+    func serialize(to serializer: inout SQLSerializer) {
+        self.base.serialize(to: &serializer)
+        serializer.write(#" RETURNING id as "fluentID""#)
+    }
+}

Sources/FluentPostgresDriver/PostgresConnection+Database.swift

@@ -0,0 +1,16 @@
+import FluentSQL
+
+struct PostgresConverterDelegate: SQLConverterDelegate {
+    func customDataType(_ dataType: DatabaseSchema.DataType) -> SQLExpression? {
+        switch dataType {
+        case .uuid:
+            return SQLRaw("UUID")
+        default:
+            return nil
+        }
+    }
+
+    func nestedFieldExpression(_ column: String, _ path: [String]) -> SQLExpression {
+        return SQLRaw("\(column)->>'\(path[0])'")
+    }
+}