Skip to content

Commit d68c862

Browse files
authored
Merge pull request #18 from vapor/cc-fixes
conditional conformance fixes
2 parents 8e9bb22 + 35a8646 commit d68c862

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

Sources/FluentPostgreSQL/PostgreSQLType.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ extension Float: PostgreSQLType { }
3333
extension Double: PostgreSQLType { }
3434
extension String: PostgreSQLType { }
3535
extension Bool: PostgreSQLType { }
36-
extension Array: PostgreSQLArrayType where Element: Codable, Element: PostgreSQLType { }
37-
extension Dictionary: PostgreSQLJSONType where Key: Codable, Value: Codable { }
36+
extension Array: PostgreSQLArrayType { }

Tests/FluentPostgreSQLTests/FluentPostgreSQLTests.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,19 @@ class FluentPostgreSQLTests: XCTestCase {
5959
}
6060

6161
func testNestedStruct() throws {
62-
/// Swift runtime does not yet support dynamically querying conditional conformance ('Swift.Array<Swift.String>': 'CodableKit.AnyKeyStringDecodable')
63-
return;
6462
let conn = try database.makeConnection(on: eventLoop).await(on: eventLoop)
63+
try? User.revert(on: conn).await(on: eventLoop)
6564
try User.prepare(on: conn).await(on: eventLoop)
6665
let user = User(id: nil, name: "Tanner", pet: Pet(name: "Zizek"))
6766
user.favoriteColors = ["pink", "blue"]
68-
user.dict["hello"] = "world"
6967
_ = try user.save(on: conn).await(on: eventLoop)
7068
if let fetched = try User.query(on: conn).first().await(on: eventLoop) {
7169
XCTAssertEqual(user.id, fetched.id)
7270
XCTAssertNil(user.age)
7371
XCTAssertEqual(fetched.favoriteColors, ["pink", "blue"])
74-
XCTAssertEqual(fetched.dict["hello"], "world")
7572
} else {
7673
XCTFail()
7774
}
78-
7975
try User.revert(on: conn).await(on: eventLoop)
8076
conn.close()
8177
}
@@ -121,7 +117,7 @@ class FluentPostgreSQLTests: XCTestCase {
121117
]
122118
}
123119

124-
struct Pet: PostgreSQLJSONType {
120+
struct Pet: PostgreSQLJSONType, Codable {
125121
var name: String
126122
}
127123

@@ -132,11 +128,9 @@ final class User: PostgreSQLModel, Migration {
132128
var age: Int?
133129
var favoriteColors: [String]
134130
var pet: Pet
135-
var dict: [String: String]
136131

137132
init(id: Int? = nil, name: String, pet: Pet) {
138133
self.favoriteColors = []
139-
self.dict = [:]
140134
self.id = id
141135
self.name = name
142136
self.pet = pet

0 commit comments

Comments
 (0)