Skip to content

Commit 2220abd

Browse files
author
Andrew Theis
committed
More updates based on PR feedback
1 parent 0d58f22 commit 2220abd

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Sources/PostgreSQL/Database/PostgreSQLDatabaseConfig.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ public struct PostgreSQLDatabaseConfig {
2929
public let transportConfig: PostgreSQLTransportConfig
3030

3131
/// Creates a new `PostgreSQLDatabaseConfig`.
32-
public init(hostname: String, port: Int = 5432, username: String, database: String? = nil, password: String? = nil, transportConfig: PostgreSQLTransportConfig = .cleartext) {
32+
public init(hostname: String, port: Int = 5432, username: String, database: String? = nil, password: String? = nil, transport: PostgreSQLTransportConfig = .cleartext) {
3333
self.hostname = hostname
3434
self.port = port
3535
self.username = username
3636
self.database = database
3737
self.password = password
38-
self.transportConfig = transportConfig
38+
self.transportConfig = transport
3939
}
4040

4141
/// Creates a `PostgreSQLDatabaseConfig` frome a connection string.
42-
public init(url urlString: String, transportConfig: PostgreSQLTransportConfig = .cleartext) throws {
42+
public init(url urlString: String, transport: PostgreSQLTransportConfig = .cleartext) throws {
4343
guard let url = URL(string: urlString),
4444
let hostname = url.host,
4545
let port = url.port,
@@ -64,6 +64,6 @@ public struct PostgreSQLDatabaseConfig {
6464
self.database = database
6565
}
6666
self.password = url.password
67-
self.transportConfig = transportConfig
67+
self.transportConfig = transport
6868
}
6969
}

Sources/PostgreSQL/Message/PostgreSQLSSLSupportResponse.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Core
22

3-
/// Response given after sending a PostgreSQLSSLSupportRequest
4-
/// For more info, see https://www.postgresql.org/docs/10/static/protocol-flow.html#id-1.10.5.7.11
3+
/// Response given after sending a `PostgreSQLSSLSupportRequest`.
4+
/// See https://www.postgresql.org/docs/10/static/protocol-flow.html#id-1.10.5.7.11 for more info.
55
enum PostgreSQLSSLSupportResponse: UInt8, Decodable {
66
/// The server supports SSL (char S).
77
case supported = 0x53

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ extension PostgreSQLConnection {
467467
#endif
468468
}
469469

470-
/// Creates a test event loop and psql client over ssl
470+
/// Creates a test event loop and psql client over ssl.
471471
static func makeTest(transport: PostgreSQLTransportConfig) throws -> PostgreSQLConnection {
472472
#if Xcode
473473
return try _makeTest(hostname: self.dockerMachineHostname, port: 5433, transport: transport)
@@ -480,7 +480,7 @@ extension PostgreSQLConnection {
480480
let group = MultiThreadedEventLoopGroup(numThreads: 1)
481481
let client = try PostgreSQLConnection.connect(hostname: hostname, port: port, transport: transport, on: group) { error in
482482
XCTFail("\(error)")
483-
}.wait()
483+
}.wait()
484484
_ = try client.authenticate(username: "vapor_username", database: "vapor_database", password: password).wait()
485485
return client
486486
}

0 commit comments

Comments
 (0)