Skip to content

Commit a1113ae

Browse files
tonyfreemantonyfreeman
committed
Fix code style
1 parent 3f0449e commit a1113ae

File tree

5 files changed

+42
-38
lines changed

5 files changed

+42
-38
lines changed

‎Sources/PostgreSQL/Message/Backend.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,27 @@ enum BackendMessage {
4343
}
4444
return try await stream.withSubStreamReader(
4545
sizedBy: Int32.self,
46-
includingHeader: true)
47-
{ stream in
46+
includingHeader: true
47+
) { sub in
4848
switch messageType {
4949
case .authentication:
50-
return .authentication(try await .decode(from: stream))
50+
return .authentication(try await .decode(from: sub))
5151
case .parameterStatus:
52-
return .parameterStatus(try await .decode(from: stream))
52+
return .parameterStatus(try await .decode(from: sub))
5353
case .backendKeyData:
54-
return .backendKeyData(try await .decode(from: stream))
54+
return .backendKeyData(try await .decode(from: sub))
5555
case .readyForQuery:
56-
return .readyForQuery(try await .decode(from: stream))
56+
return .readyForQuery(try await .decode(from: sub))
5757
case .rowDescription:
58-
return .rowDescription(try await .decode(from: stream))
58+
return .rowDescription(try await .decode(from: sub))
5959
case .dataRow:
60-
return .dataRow(try await .decode(from: stream))
60+
return .dataRow(try await .decode(from: sub))
6161
case .commandComplete:
62-
return .commandComplete(try await .decode(from: stream))
62+
return .commandComplete(try await .decode(from: sub))
6363
case .errorResponse:
64-
return .error(try await .decode(from: stream))
64+
return .error(try await .decode(from: sub))
6565
default:
66-
print("type: \(rawType) size: \(stream.limit)")
66+
print("type: \(rawType) size: \(sub.limit)")
6767
print(try await stream.readUntilEnd())
6868
fatalError()
6969
}

‎Sources/PostgreSQL/Message/Frontend.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ enum FrontendMessage: StreamEncodable {
4747
init(
4848
user: String,
4949
database: String? = nil,
50-
replication: Replication? = nil)
51-
{
50+
replication: Replication? = nil
51+
) {
5252
self.user = user
5353
self.database = database
5454
self.replication = replication
@@ -57,12 +57,12 @@ enum FrontendMessage: StreamEncodable {
5757
func encode(to stream: StreamWriter) async throws {
5858
try await stream.withSubStreamWriter(
5959
sizedBy: Int32.self,
60-
includingHeader: true)
61-
{ stream in
62-
try await stream.write(PostgreSQL.protocolVersion)
63-
try await stream.write(cString: "user")
64-
try await stream.write(cString: user)
65-
try await stream.write(cString: database ?? "")
60+
includingHeader: true
61+
) { sub in
62+
try await sub.write(PostgreSQL.protocolVersion)
63+
try await sub.write(cString: "user")
64+
try await sub.write(cString: user)
65+
try await sub.write(cString: database ?? "")
6666
}
6767
try await stream.flush()
6868
}
@@ -72,8 +72,8 @@ enum FrontendMessage: StreamEncodable {
7272
extension FrontendMessage: RawRepresentable {
7373
var rawValue: UInt8 {
7474
switch self {
75-
case .startup: fatalError("startup message doesn't have a type")
76-
case .query: return RawType.query.rawValue
75+
case .startup: fatalError("startup message doesn't have a type")
76+
case .query: return RawType.query.rawValue
7777
}
7878
}
7979

‎Sources/PostgreSQL/Message/Frontend/RowDescription.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ struct RowDescription {
44
let columns: [ColumnDescription]
55

66
var columnNames: [String] {
7-
return columns.map{ $0.name }
7+
return columns.map { $0.name }
88
}
99

1010
static func decode(from stream: SubStreamReader) async throws -> Self {

‎Sources/PostgreSQL/PostgreSQL.swift‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public enum PostgreSQL {
88
let client: TCP.Client
99
var stream: BufferedStream<TCP.Stream>! = nil
1010

11-
var config: [String : String] = [:]
12-
var keyData: BackendMessage.BackendKeyData? = nil
13-
var lastTransactionStatus: BackendMessage.TransactionStatus? = nil
11+
var config: [String: String] = [:]
12+
var keyData: BackendMessage.BackendKeyData?
13+
var lastTransactionStatus: BackendMessage.TransactionStatus?
1414

1515
public init(host: String, port: Int) {
1616
self.client = TCP.Client(host: host, port: port)
@@ -33,7 +33,7 @@ public enum PostgreSQL {
3333

3434
public func query(_ string: String) async throws -> DataRowIterator {
3535
let response = try await request(.query(.init(string)))
36-
return try await DataRowIterator.asyncInit(response)
36+
return try await DataRowIterator(response)
3737
}
3838

3939
private func start(user: String, database: String?) async throws {
@@ -49,9 +49,9 @@ public enum PostgreSQL {
4949
}
5050
}
5151

52-
private func request(_ message: FrontendMessage) async throws
53-
-> BackendMessageIterator
54-
{
52+
private func request(
53+
_ message: FrontendMessage
54+
) async throws -> BackendMessageIterator {
5555
guard let stream = stream else {
5656
fatalError("undefined is not an object")
5757
}
@@ -121,19 +121,21 @@ extension PostgreSQL {
121121
self.header = header
122122
}
123123

124-
static func asyncInit(
125-
_ response: BackendMessageIterator
126-
) async throws -> DataRowIterator {
127-
guard case .some(.rowDescription(let header)) = await response.next()
128-
else { fatalError("DataRowIterator: invalid RowDescription") }
129-
return .init(response: response, header: header)
124+
convenience
125+
init(_ response: BackendMessageIterator) async throws {
126+
guard
127+
case .some(.rowDescription(let header)) = await response.next()
128+
else {
129+
fatalError("DataRowIterator: invalid RowDescription")
130+
}
131+
self.init(response: response, header: header)
130132
}
131133

132134
public func next() async -> DataRow? {
133135
switch await response.next() {
134136
case .some(.dataRow(let row)):
135137
return row
136-
case .some(.commandComplete(_)):
138+
case .some(.commandComplete):
137139
guard case .some(.readyForQuery) = await response.next() else {
138140
fatalError("DataRowIterator: invalid end")
139141
}
@@ -152,7 +154,7 @@ extension PostgreSQL {
152154
extension PostgreSQL.DataRowIterator {
153155
public var description: String {
154156
get async {
155-
var result = header.columns.map{ $0.name }.joined(separator: " | ")
157+
var result = header.columns.map { $0.name }.joined(separator: " | ")
156158
for await row in self {
157159
result.append("\n")
158160
result.append(row.values.joined(separator: " | " ))

‎Sources/PostgreSQL/Utils.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ import Stream
22

33
extension StreamReader {
44
func readCString() async throws -> String {
5-
let value = try await read(until: 0) { String(decoding: $0, as: UTF8.self) }
5+
let value = try await read(until: 0) {
6+
String(decoding: $0, as: UTF8.self)
7+
}
68
try await consume(count: 1)
79
return value
810
}

0 commit comments

Comments
 (0)