Commit 652f565

committed

add PostgreSQLUpsert support + test

1 parent 3972182 commit 652f565Copy full SHA for 652f565

File tree

+21

-0

lines changed

+21

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`24`	`24`	`public typealias SelectExpression = PostgreSQLSelectExpression`
`25`	`25`	`public typealias Join = PostgreSQLJoin`
`26`	`26`	`public typealias OrderBy = PostgreSQLOrderBy`
	`27`	`+ public typealias Upsert = PostgreSQLUpsert`
`27`	`28`
`28`	`29`	`public var statement: Statement`
`29`	`30`	`public var table: TableIdentifier`
`@@ -34,6 +35,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`34`	`35`	`public var orderBy: [OrderBy]`
`35`	`36`	`public var limit: Int?`
`36`	`37`	`public var offset: Int?`
	`38`	`+ public var upsert: PostgreSQLUpsert?`
`37`	`39`	`public var defaultBinaryOperator: GenericSQLBinaryOperator`
`38`	`40`
`39`	`41`	`public static func query(_ statement: Statement, _ table: TableIdentifier) -> FluentPostgreSQLQuery {`
`@@ -47,6 +49,7 @@ public struct FluentPostgreSQLQuery: FluentSQLQuery {`
`47`	`49`	`orderBy: [],`
`48`	`50`	`limit: nil,`
`49`	`51`	`offset: nil,`
	`52`	`+ upsert: nil,`
`50`	`53`	`defaultBinaryOperator: .and`
`51`	`54`	`)`
`52`	`55`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ extension PostgreSQLDatabase: QuerySupporting {`
`65`	`65`	`values.append(row.value)`
`66`	`66`	`}`
`67`	`67`	`insert.values.append(values)`
	`68`	`+ insert.upsert = fluent.upsert`
`68`	`69`	`insert.returning.append(.all)`
`69`	`70`	`query = .insert(insert)`
`70`	`71`	`case ._select:`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,23 @@ class FluentPostgreSQLTests: XCTestCase {`
`360`	`360`	`// let earth = try Planet.query(on: conn).filter(\.name, .ilike, "earth").first().wait()`
`361`	`361`	`// XCTAssertEqual(earth?.name, "Earth")`
`362`	`362`	`}`
	`363`	`+`
	`364`	`+ func testCreateOrUpdate() throws {`
	`365`	`+ let conn = try benchmarker.pool.requestConnection().wait()`
	`366`	`+ defer { benchmarker.pool.releaseConnection(conn) }`
	`367`	`+ defer { try? Planet.revert(on: conn).wait() }`
	`368`	`+ try Planet.prepare(on: conn).wait()`
`363`	`369`
	`370`	`+ let a = Planet(id: 1, name: "Mars")`
	`371`	`+ let b = Planet(id: 1, name: "Earth")`
	`372`	`+`
	`373`	`+ _ = try a.create(orUpdate: true, on: conn).wait()`
	`374`	`+ _ = try b.create(orUpdate: true, on: conn).wait()`
	`375`	`+`
	`376`	`+ let c = try Planet.find(1, on: conn).wait()`
	`377`	`+ XCTAssertEqual(c?.name, "Earth")`
	`378`	`+ }`
	`379`	`+`
`364`	`380`	`static let allTests = [`
`365`	`381`	`("testMinimumViableModelDeclaration", testMinimumViableModelDeclaration),`
`366`	`382`	`("testGH24", testGH24),`
`@@ -374,6 +390,7 @@ class FluentPostgreSQLTests: XCTestCase {`
`374`	`390`	`("testEmptySubset", testEmptySubset),`
`375`	`391`	`("testSort", testSort),`
`376`	`392`	`("testCustomFilter", testCustomFilter),`
	`393`	`+ ("testCreateOrUpdate", testCreateOrUpdate),`
`377`	`394`	`]`
`378`	`395`	`}`
`379`	`396`

Comments

(0)