Skip to content

Commit 43742ef

Browse files
fabianfettfabianfett
authored
Rename PSQLBackendMessage to PostgresBackendMessage (#238)
1 parent 13f362f commit 43742ef

38 files changed

+190
-190
lines changed

‎Sources/PostgresNIO/Connection/PostgresConnection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ extension PostgresConnection {
263263
}
264264

265265
extension PostgresConnection: PSQLChannelHandlerNotificationDelegate {
266-
func notificationReceived(_ notification: PSQLBackendMessage.NotificationResponse) {
266+
func notificationReceived(_ notification: PostgresBackendMessage.NotificationResponse) {
267267
self.underlying.eventLoop.assertInEventLoop()
268268

269269
guard let listeners = self.notificationListeners[notification.channel] else {

‎Sources/PostgresNIO/New/Connection State Machine/AuthenticationStateMachine.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct AuthenticationStateMachine {
4242
return .sendStartupMessage(self.authContext)
4343
}
4444

45-
mutating func authenticationMessageReceived(_ message: PSQLBackendMessage.Authentication) -> Action {
45+
mutating func authenticationMessageReceived(_ message: PostgresBackendMessage.Authentication) -> Action {
4646
switch self.state {
4747
case .startupMessageSent:
4848
switch message {
@@ -156,7 +156,7 @@ struct AuthenticationStateMachine {
156156
}
157157
}
158158

159-
mutating func errorReceived(_ message: PSQLBackendMessage.ErrorResponse) -> Action {
159+
mutating func errorReceived(_ message: PostgresBackendMessage.ErrorResponse) -> Action {
160160
return self.setAndFireError(.server(message))
161161
}
162162

‎Sources/PostgresNIO/New/Connection State Machine/CloseStateMachine.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ struct CloseStateMachine {
4343
return .succeedClose(closeContext)
4444
}
4545

46-
mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action {
46+
mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action {
4747
let error = PSQLError.server(errorMessage)
4848
switch self.state {
4949
case .initialized:

‎Sources/PostgresNIO/New/Connection State Machine/ConnectionStateMachine.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import NIOCore
22

33
struct ConnectionStateMachine {
44

5-
typealias TransactionState = PSQLBackendMessage.TransactionState
5+
typealias TransactionState = PostgresBackendMessage.TransactionState
66

77
struct ConnectionContext {
88
let processID: Int32
@@ -71,7 +71,7 @@ struct ConnectionStateMachine {
7171
case sendSSLRequest
7272
case establishSSLConnection
7373
case provideAuthenticationContext
74-
case forwardNotificationToListeners(PSQLBackendMessage.NotificationResponse)
74+
case forwardNotificationToListeners(PostgresBackendMessage.NotificationResponse)
7575
case fireEventReadyForQuery
7676
case fireChannelInactive
7777
/// Close the connection by sending a `Terminate` message and then closing the connection. This is for clean shutdowns.
@@ -319,7 +319,7 @@ struct ConnectionStateMachine {
319319
}
320320
}
321321

322-
mutating func authenticationMessageReceived(_ message: PSQLBackendMessage.Authentication) -> ConnectionAction {
322+
mutating func authenticationMessageReceived(_ message: PostgresBackendMessage.Authentication) -> ConnectionAction {
323323
guard case .authenticating(var authState) = self.state else {
324324
return self.closeConnectionAndCleanup(.unexpectedBackendMessage(.authentication(message)))
325325
}
@@ -331,7 +331,7 @@ struct ConnectionStateMachine {
331331
}
332332
}
333333

334-
mutating func backendKeyDataReceived(_ keyData: PSQLBackendMessage.BackendKeyData) -> ConnectionAction {
334+
mutating func backendKeyDataReceived(_ keyData: PostgresBackendMessage.BackendKeyData) -> ConnectionAction {
335335
guard case .authenticated(_, let parameters) = self.state else {
336336
return self.closeConnectionAndCleanup(.unexpectedBackendMessage(.backendKeyData(keyData)))
337337
}
@@ -344,7 +344,7 @@ struct ConnectionStateMachine {
344344
return .wait
345345
}
346346

347-
mutating func parameterStatusReceived(_ status: PSQLBackendMessage.ParameterStatus) -> ConnectionAction {
347+
mutating func parameterStatusReceived(_ status: PostgresBackendMessage.ParameterStatus) -> ConnectionAction {
348348
switch self.state {
349349
case .sslRequestSent,
350350
.sslNegotiated,
@@ -394,7 +394,7 @@ struct ConnectionStateMachine {
394394
}
395395
}
396396

397-
mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> ConnectionAction {
397+
mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> ConnectionAction {
398398
switch self.state {
399399
case .sslRequestSent,
400400
.sslNegotiated,
@@ -508,7 +508,7 @@ struct ConnectionStateMachine {
508508
}
509509
}
510510

511-
mutating func noticeReceived(_ notice: PSQLBackendMessage.NoticeResponse) -> ConnectionAction {
511+
mutating func noticeReceived(_ notice: PostgresBackendMessage.NoticeResponse) -> ConnectionAction {
512512
switch self.state {
513513
case .extendedQuery(var extendedQuery, let connectionContext):
514514
return self.avoidingStateMachineCoW { machine -> ConnectionAction in
@@ -521,11 +521,11 @@ struct ConnectionStateMachine {
521521
}
522522
}
523523

524-
mutating func notificationReceived(_ notification: PSQLBackendMessage.NotificationResponse) -> ConnectionAction {
524+
mutating func notificationReceived(_ notification: PostgresBackendMessage.NotificationResponse) -> ConnectionAction {
525525
return .forwardNotificationToListeners(notification)
526526
}
527527

528-
mutating func readyForQueryReceived(_ transactionState: PSQLBackendMessage.TransactionState) -> ConnectionAction {
528+
mutating func readyForQueryReceived(_ transactionState: PostgresBackendMessage.TransactionState) -> ConnectionAction {
529529
switch self.state {
530530
case .authenticated(let backendKeyData, let parameters):
531531
guard let keyData = backendKeyData else {
@@ -715,7 +715,7 @@ struct ConnectionStateMachine {
715715
}
716716
}
717717

718-
mutating func parameterDescriptionReceived(_ description: PSQLBackendMessage.ParameterDescription) -> ConnectionAction {
718+
mutating func parameterDescriptionReceived(_ description: PostgresBackendMessage.ParameterDescription) -> ConnectionAction {
719719
switch self.state {
720720
case .extendedQuery(var queryState, let connectionContext) where !queryState.isComplete:
721721
return self.avoidingStateMachineCoW { machine -> ConnectionAction in

‎Sources/PostgresNIO/New/Connection State Machine/ExtendedQueryStateMachine.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct ExtendedQueryStateMachine {
8383
}
8484
}
8585

86-
mutating func parameterDescriptionReceived(_ parameterDescription: PSQLBackendMessage.ParameterDescription) -> Action {
86+
mutating func parameterDescriptionReceived(_ parameterDescription: PostgresBackendMessage.ParameterDescription) -> Action {
8787
guard case .parseCompleteReceived(let queryContext) = self.state else {
8888
return self.setAndFireError(.unexpectedBackendMessage(.parameterDescription(parameterDescription)))
8989
}
@@ -217,7 +217,7 @@ struct ExtendedQueryStateMachine {
217217
preconditionFailure("Unimplemented")
218218
}
219219

220-
mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action {
220+
mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action {
221221
let error = PSQLError.server(errorMessage)
222222
switch self.state {
223223
case .initialized:
@@ -244,7 +244,7 @@ struct ExtendedQueryStateMachine {
244244
}
245245
}
246246

247-
mutating func noticeReceived(_ notice: PSQLBackendMessage.NoticeResponse) -> Action {
247+
mutating func noticeReceived(_ notice: PostgresBackendMessage.NoticeResponse) -> Action {
248248
//self.queryObject.noticeReceived(notice)
249249
return .wait
250250
}

‎Sources/PostgresNIO/New/Connection State Machine/PrepareStatementStateMachine.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ struct PrepareStatementStateMachine {
5454
return .wait
5555
}
5656

57-
mutating func parameterDescriptionReceived(_ parameterDescription: PSQLBackendMessage.ParameterDescription) -> Action {
57+
mutating func parameterDescriptionReceived(_ parameterDescription: PostgresBackendMessage.ParameterDescription) -> Action {
5858
guard case .parseCompleteReceived(let createContext) = self.state else {
5959
return self.setAndFireError(.unexpectedBackendMessage(.parameterDescription(parameterDescription)))
6060
}
@@ -81,7 +81,7 @@ struct PrepareStatementStateMachine {
8181
return .succeedPreparedStatementCreation(queryContext, with: rowDescription)
8282
}
8383

84-
mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action {
84+
mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action {
8585
let error = PSQLError.server(errorMessage)
8686
switch self.state {
8787
case .initialized:

‎Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import NIOCore
22

33
internal extension ByteBuffer {
44

5-
mutating func psqlWriteBackendMessageID(_ messageID: PSQLBackendMessage.ID) {
5+
mutating func psqlWriteBackendMessageID(_ messageID: PostgresBackendMessage.ID) {
66
self.writeInteger(messageID.rawValue)
77
}
88

‎Sources/PostgresNIO/New/Messages/Authentication.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import NIOCore
22

3-
extension PSQLBackendMessage {
3+
extension PostgresBackendMessage {
44

55
enum Authentication: PayloadDecodable {
66
case ok
@@ -61,7 +61,7 @@ extension PSQLBackendMessage {
6161
}
6262
}
6363

64-
extension PSQLBackendMessage.Authentication: Equatable {
64+
extension PostgresBackendMessage.Authentication: Equatable {
6565
static func ==(lhs: Self, rhs: Self) -> Bool {
6666
switch (lhs, rhs) {
6767
case (.ok, .ok):
@@ -92,7 +92,7 @@ extension PSQLBackendMessage.Authentication: Equatable {
9292
}
9393
}
9494

95-
extension PSQLBackendMessage.Authentication: CustomDebugStringConvertible {
95+
extension PostgresBackendMessage.Authentication: CustomDebugStringConvertible {
9696
var debugDescription: String {
9797
switch self {
9898
case .ok:

‎Sources/PostgresNIO/New/Messages/BackendKeyData.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import NIOCore
22

3-
extension PSQLBackendMessage {
3+
extension PostgresBackendMessage {
44

55
struct BackendKeyData: PayloadDecodable, Equatable {
66
let processID: Int32
@@ -16,7 +16,7 @@ extension PSQLBackendMessage {
1616
}
1717
}
1818

19-
extension PSQLBackendMessage.BackendKeyData: CustomDebugStringConvertible {
19+
extension PostgresBackendMessage.BackendKeyData: CustomDebugStringConvertible {
2020
var debugDescription: String {
2121
"processID: \(processID), secretKey: \(secretKey)"
2222
}

‎Sources/PostgresNIO/New/Messages/DataRow.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import NIOCore
88
/// enclosing type, the enclosing type must be @usableFromInline as well.
99
/// Not putting `DataRow` in ``PSQLBackendMessage`` is our way to trick
1010
/// the Swift compiler
11-
struct DataRow: PSQLBackendMessage.PayloadDecodable, Equatable {
11+
struct DataRow: PostgresBackendMessage.PayloadDecodable, Equatable {
1212

1313
var columnCount: Int16
1414

0 commit comments

Comments
 (0)