Commit 2afac78

authored

fluentkit updates (vapor#109)

1 parent 598bc21 commit 2afac78Copy full SHA for 2afac78

File tree

+31

-12

lines changed

+31

-12

lines changed

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,12 @@ extension PostgresConnection: Database {`
`69`	`69`	`sql = PostgresReturning(sql)`
`70`	`70`	`default: break`
`71`	`71`	`}`
`72`		`- return self.sqlQuery(sql) { row in`
`73`		`- try onOutput(row.fluentOutput)`
	`72`	`+ var serializer = SQLSerializer(dialect: PostgresDialect())`
	`73`	`+ sql.serialize(to: &serializer)`
	`74`	`+ return try! self.query(serializer.sql, serializer.binds.map { encodable in`
	`75`	`+ return try PostgresDataEncoder().encode(encodable)`
	`76`	`+ }) { row in`
	`77`	`+ try onOutput(row)`
`74`	`78`	`}`
`75`	`79`	`}`
`76`	`80`
`@@ -81,6 +85,16 @@ extension PostgresConnection: Database {`
`81`	`85`	`}`
`82`	`86`	`}`
`83`	`87`
	`88`	`+extension PostgresRow: DatabaseOutput {`
	`89`	`+ public func contains(field: String) -> Bool {`
	`90`	`+ return self.column(field) != nil`
	`91`	`+ }`
	`92`	`+`
	`93`	`+ public func decode<T>(field: String, as type: T.Type) throws -> T where T : Decodable {`
	`94`	`+ return try self.decode(column: field, as: T.self)`
	`95`	`+ }`
	`96`	`+}`
	`97`	`+`
`84`	`98`	`private struct PostgresReturning: SQLExpression {`
`85`	`99`	`let base: SQLExpression`
`86`	`100`	`init(_ base: SQLExpression) {`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import Foundation`
	`2`	`+import NIOPostgres`
`2`	`3`
`3`	`4`	`#warning("TODO: move to codable kit")`
`4`	`5`	`struct DecoderUnwrapper: Decodable {`
`@@ -14,7 +15,11 @@ public struct PostgresDataDecoder {`
`14`	`15`	`public func decode<T>(_ type: T.Type, from data: PostgresData) throws -> T`
`15`	`16`	`where T: Decodable`
`16`	`17`	`{`
`17`		`- return try T.init(from: _Decoder(data: data))`
	`18`	`+ if let convertible = T.self as? PostgresDataCustomConvertible.Type {`
	`19`	`+ return convertible.init(postgresData: data)! as! T`
	`20`	`+ } else {`
	`21`	`+ return try T.init(from: _Decoder(data: data))`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`#warning("TODO: finish implementing")`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ extension PostgresConnection: ConnectionPoolItem {`
`111`	`111`	`extension PostgresRow: SQLRow {`
`112`	`112`	`public func decode<D>(column: String, as type: D.Type) throws -> D where D : Decodable {`
`113`	`113`	`guard let data = self.column(column) else {`
`114`		`- fatalError()`
	`114`	`+ fatalError("Column \(column) is missing")`
`115`	`115`	`}`
`116`	`116`	`return try PostgresDataDecoder().decode(D.self, from: data)`
`117`	`117`	`}`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,8 @@ final class FluentPostgresDriverTests: XCTestCase {`
`37`	`37`	`try self.benchmarker.testEagerLoadParentJoin()`
`38`	`38`	`}`
`39`	`39`
`40`		`- func testEagerLoadSubqueryJSONEncode() throws {`
`41`		`- try self.benchmarker.testEagerLoadSubqueryJSONEncode()`
`42`		`- }`
`43`		`-`
`44`		`- func testEagerLoadJoinJSONEncode() throws {`
`45`		`- try self.benchmarker.testEagerLoadJoinJSONEncode()`
	`40`	`+ func testEagerLoadJSON() throws {`
	`41`	`+ try self.benchmarker.testEagerLoadJSON()`
`46`	`42`	`}`
`47`	`43`
`48`	`44`	`func testMigrator() throws {`
`@@ -88,6 +84,10 @@ final class FluentPostgresDriverTests: XCTestCase {`
`88`	`84`	`func testUniqueFields() throws {`
`89`	`85`	`try self.benchmarker.testUniqueFields()`
`90`	`86`	`}`
	`87`	`+`
	`88`	`+ func testAsyncCreate() throws {`
	`89`	`+ try self.benchmarker.testAsyncCreate()`
	`90`	`+ }`
`91`	`91`
`92`	`92`	`override func setUp() {`
`93`	`93`	`let eventLoop = MultiThreadedEventLoopGroup(numberOfThreads: 1).next()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,16 @@ extension FluentPostgresDriverTests {`
`8`	`8`	`static let __allTests__FluentPostgresDriverTests = [`
`9`	`9`	`("testAggregates", testAggregates),`
`10`	`10`	`("testAll", testAll),`
	`11`	`+ ("testAsyncCreate", testAsyncCreate),`
`11`	`12`	`("testBatchCreate", testBatchCreate),`
`12`	`13`	`("testBatchUpdate", testBatchUpdate),`
`13`	`14`	`("testChunkedFetch", testChunkedFetch),`
`14`	`15`	`("testCreate", testCreate),`
`15`	`16`	`("testDelete", testDelete),`
`16`	`17`	`("testEagerLoadChildren", testEagerLoadChildren),`
`17`		`- ("testEagerLoadJoinJSONEncode", testEagerLoadJoinJSONEncode),`
	`18`	`+ ("testEagerLoadJSON", testEagerLoadJSON),`
`18`	`19`	`("testEagerLoadParent", testEagerLoadParent),`
`19`	`20`	`("testEagerLoadParentJoin", testEagerLoadParentJoin),`
`20`		`- ("testEagerLoadSubqueryJSONEncode", testEagerLoadSubqueryJSONEncode),`
`21`	`21`	`("testIdentifierGeneration", testIdentifierGeneration),`
`22`	`22`	`("testJoin", testJoin),`
`23`	`23`	`("testMigrator", testMigrator),`

Comments

(0)