From 6c7f68fa356efc5a0f80f940ceba76c03f4b6f02 Mon Sep 17 00:00:00 2001 From: Fabian Fett Date: Mon, 28 Feb 2022 14:25:33 +0100 Subject: [PATCH] Rename PSQLBackendMessage to PostgresBackendMessage --- .../Connection/PostgresConnection.swift | 2 +- .../AuthenticationStateMachine.swift | 4 +- .../CloseStateMachine.swift | 2 +- .../ConnectionStateMachine.swift | 20 +-- .../ExtendedQueryStateMachine.swift | 6 +- .../PrepareStatementStateMachine.swift | 4 +- .../New/Extensions/ByteBuffer+PSQL.swift | 2 +- .../New/Messages/Authentication.swift | 6 +- .../New/Messages/BackendKeyData.swift | 4 +- .../PostgresNIO/New/Messages/DataRow.swift | 2 +- .../New/Messages/ErrorResponse.swift | 24 +-- .../New/Messages/NotificationResponse.swift | 4 +- .../New/Messages/ParameterDescription.swift | 2 +- .../New/Messages/ParameterStatus.swift | 4 +- .../New/Messages/ReadyForQuery.swift | 4 +- .../New/Messages/RowDescription.swift | 2 +- .../New/PSQLBackendMessageDecoder.swift | 10 +- .../PostgresNIO/New/PSQLChannelHandler.swift | 2 +- Sources/PostgresNIO/New/PSQLError.swift | 8 +- Sources/PostgresNIO/New/PSQLRowStream.swift | 2 +- ...age.swift => PostgresBackendMessage.swift} | 14 +- .../AuthenticationStateMachineTests.swift | 8 +- .../ConnectionStateMachineTests.swift | 2 +- .../New/Extensions/ByteBuffer+Utils.swift | 4 +- .../ConnectionAction+TestUtils.swift | 4 +- .../PSQLBackendMessage+Equatable.swift | 2 +- .../PSQLBackendMessageEncoder.swift | 24 +-- .../New/Messages/AuthenticationTests.swift | 2 +- .../New/Messages/BackendKeyDataTests.swift | 4 +- .../New/Messages/DataRowTests.swift | 2 +- .../New/Messages/ErrorResponseTests.swift | 4 +- .../Messages/NotificationResponseTests.swift | 2 +- .../Messages/ParameterDescriptionTests.swift | 2 +- .../New/Messages/ParameterStatusTests.swift | 2 +- .../New/Messages/ReadyForQueryTests.swift | 10 +- .../New/Messages/RowDescriptionTests.swift | 2 +- .../New/PSQLBackendMessageTests.swift | 164 +++++++++--------- .../New/PSQLChannelHandlerTests.swift | 14 +- 38 files changed, 190 insertions(+), 190 deletions(-) rename Sources/PostgresNIO/New/{PSQLBackendMessage.swift => PostgresBackendMessage.swift} (96%) diff --git a/Sources/PostgresNIO/Connection/PostgresConnection.swift b/Sources/PostgresNIO/Connection/PostgresConnection.swift index 5377f110..4552a286 100644 --- a/Sources/PostgresNIO/Connection/PostgresConnection.swift +++ b/Sources/PostgresNIO/Connection/PostgresConnection.swift @@ -251,7 +251,7 @@ extension PostgresConnection { } extension PostgresConnection: PSQLChannelHandlerNotificationDelegate { - func notificationReceived(_ notification: PSQLBackendMessage.NotificationResponse) { + func notificationReceived(_ notification: PostgresBackendMessage.NotificationResponse) { self.underlying.eventLoop.assertInEventLoop() guard let listeners = self.notificationListeners[notification.channel] else { diff --git a/Sources/PostgresNIO/New/Connection State Machine/AuthenticationStateMachine.swift b/Sources/PostgresNIO/New/Connection State Machine/AuthenticationStateMachine.swift index 5848288d..859a4d4b 100644 --- a/Sources/PostgresNIO/New/Connection State Machine/AuthenticationStateMachine.swift +++ b/Sources/PostgresNIO/New/Connection State Machine/AuthenticationStateMachine.swift @@ -42,7 +42,7 @@ struct AuthenticationStateMachine { return .sendStartupMessage(self.authContext) } - mutating func authenticationMessageReceived(_ message: PSQLBackendMessage.Authentication) -> Action { + mutating func authenticationMessageReceived(_ message: PostgresBackendMessage.Authentication) -> Action { switch self.state { case .startupMessageSent: switch message { @@ -156,7 +156,7 @@ struct AuthenticationStateMachine { } } - mutating func errorReceived(_ message: PSQLBackendMessage.ErrorResponse) -> Action { + mutating func errorReceived(_ message: PostgresBackendMessage.ErrorResponse) -> Action { return self.setAndFireError(.server(message)) } diff --git a/Sources/PostgresNIO/New/Connection State Machine/CloseStateMachine.swift b/Sources/PostgresNIO/New/Connection State Machine/CloseStateMachine.swift index 0dccd10d..791cebdd 100644 --- a/Sources/PostgresNIO/New/Connection State Machine/CloseStateMachine.swift +++ b/Sources/PostgresNIO/New/Connection State Machine/CloseStateMachine.swift @@ -43,7 +43,7 @@ struct CloseStateMachine { return .succeedClose(closeContext) } - mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action { + mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action { let error = PSQLError.server(errorMessage) switch self.state { case .initialized: diff --git a/Sources/PostgresNIO/New/Connection State Machine/ConnectionStateMachine.swift b/Sources/PostgresNIO/New/Connection State Machine/ConnectionStateMachine.swift index 36bcdf39..a8c45e36 100644 --- a/Sources/PostgresNIO/New/Connection State Machine/ConnectionStateMachine.swift +++ b/Sources/PostgresNIO/New/Connection State Machine/ConnectionStateMachine.swift @@ -2,7 +2,7 @@ import NIOCore struct ConnectionStateMachine { - typealias TransactionState = PSQLBackendMessage.TransactionState + typealias TransactionState = PostgresBackendMessage.TransactionState struct ConnectionContext { let processID: Int32 @@ -66,7 +66,7 @@ struct ConnectionStateMachine { case sendSSLRequest case establishSSLConnection case provideAuthenticationContext - case forwardNotificationToListeners(PSQLBackendMessage.NotificationResponse) + case forwardNotificationToListeners(PostgresBackendMessage.NotificationResponse) case fireEventReadyForQuery case fireChannelInactive /// Close the connection by sending a `Terminate` message and then closing the connection. This is for clean shutdowns. @@ -298,7 +298,7 @@ struct ConnectionStateMachine { } } - mutating func authenticationMessageReceived(_ message: PSQLBackendMessage.Authentication) -> ConnectionAction { + mutating func authenticationMessageReceived(_ message: PostgresBackendMessage.Authentication) -> ConnectionAction { guard case .authenticating(var authState) = self.state else { return self.closeConnectionAndCleanup(.unexpectedBackendMessage(.authentication(message))) } @@ -310,7 +310,7 @@ struct ConnectionStateMachine { } } - mutating func backendKeyDataReceived(_ keyData: PSQLBackendMessage.BackendKeyData) -> ConnectionAction { + mutating func backendKeyDataReceived(_ keyData: PostgresBackendMessage.BackendKeyData) -> ConnectionAction { guard case .authenticated(_, let parameters) = self.state else { return self.closeConnectionAndCleanup(.unexpectedBackendMessage(.backendKeyData(keyData))) } @@ -323,7 +323,7 @@ struct ConnectionStateMachine { return .wait } - mutating func parameterStatusReceived(_ status: PSQLBackendMessage.ParameterStatus) -> ConnectionAction { + mutating func parameterStatusReceived(_ status: PostgresBackendMessage.ParameterStatus) -> ConnectionAction { switch self.state { case .sslRequestSent, .sslNegotiated, @@ -373,7 +373,7 @@ struct ConnectionStateMachine { } } - mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> ConnectionAction { + mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> ConnectionAction { switch self.state { case .sslRequestSent, .sslNegotiated, @@ -487,7 +487,7 @@ struct ConnectionStateMachine { } } - mutating func noticeReceived(_ notice: PSQLBackendMessage.NoticeResponse) -> ConnectionAction { + mutating func noticeReceived(_ notice: PostgresBackendMessage.NoticeResponse) -> ConnectionAction { switch self.state { case .extendedQuery(var extendedQuery, let connectionContext): return self.avoidingStateMachineCoW { machine -> ConnectionAction in @@ -500,11 +500,11 @@ struct ConnectionStateMachine { } } - mutating func notificationReceived(_ notification: PSQLBackendMessage.NotificationResponse) -> ConnectionAction { + mutating func notificationReceived(_ notification: PostgresBackendMessage.NotificationResponse) -> ConnectionAction { return .forwardNotificationToListeners(notification) } - mutating func readyForQueryReceived(_ transactionState: PSQLBackendMessage.TransactionState) -> ConnectionAction { + mutating func readyForQueryReceived(_ transactionState: PostgresBackendMessage.TransactionState) -> ConnectionAction { switch self.state { case .authenticated(let backendKeyData, let parameters): guard let keyData = backendKeyData else { @@ -694,7 +694,7 @@ struct ConnectionStateMachine { } } - mutating func parameterDescriptionReceived(_ description: PSQLBackendMessage.ParameterDescription) -> ConnectionAction { + mutating func parameterDescriptionReceived(_ description: PostgresBackendMessage.ParameterDescription) -> ConnectionAction { switch self.state { case .extendedQuery(var queryState, let connectionContext) where !queryState.isComplete: return self.avoidingStateMachineCoW { machine -> ConnectionAction in diff --git a/Sources/PostgresNIO/New/Connection State Machine/ExtendedQueryStateMachine.swift b/Sources/PostgresNIO/New/Connection State Machine/ExtendedQueryStateMachine.swift index c778477a..333742bb 100644 --- a/Sources/PostgresNIO/New/Connection State Machine/ExtendedQueryStateMachine.swift +++ b/Sources/PostgresNIO/New/Connection State Machine/ExtendedQueryStateMachine.swift @@ -83,7 +83,7 @@ struct ExtendedQueryStateMachine { } } - mutating func parameterDescriptionReceived(_ parameterDescription: PSQLBackendMessage.ParameterDescription) -> Action { + mutating func parameterDescriptionReceived(_ parameterDescription: PostgresBackendMessage.ParameterDescription) -> Action { guard case .parseCompleteReceived(let queryContext) = self.state else { return self.setAndFireError(.unexpectedBackendMessage(.parameterDescription(parameterDescription))) } @@ -217,7 +217,7 @@ struct ExtendedQueryStateMachine { preconditionFailure("Unimplemented") } - mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action { + mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action { let error = PSQLError.server(errorMessage) switch self.state { case .initialized: @@ -244,7 +244,7 @@ struct ExtendedQueryStateMachine { } } - mutating func noticeReceived(_ notice: PSQLBackendMessage.NoticeResponse) -> Action { + mutating func noticeReceived(_ notice: PostgresBackendMessage.NoticeResponse) -> Action { //self.queryObject.noticeReceived(notice) return .wait } diff --git a/Sources/PostgresNIO/New/Connection State Machine/PrepareStatementStateMachine.swift b/Sources/PostgresNIO/New/Connection State Machine/PrepareStatementStateMachine.swift index 947c8f97..5b65fc90 100644 --- a/Sources/PostgresNIO/New/Connection State Machine/PrepareStatementStateMachine.swift +++ b/Sources/PostgresNIO/New/Connection State Machine/PrepareStatementStateMachine.swift @@ -54,7 +54,7 @@ struct PrepareStatementStateMachine { return .wait } - mutating func parameterDescriptionReceived(_ parameterDescription: PSQLBackendMessage.ParameterDescription) -> Action { + mutating func parameterDescriptionReceived(_ parameterDescription: PostgresBackendMessage.ParameterDescription) -> Action { guard case .parseCompleteReceived(let createContext) = self.state else { return self.setAndFireError(.unexpectedBackendMessage(.parameterDescription(parameterDescription))) } @@ -81,7 +81,7 @@ struct PrepareStatementStateMachine { return .succeedPreparedStatementCreation(queryContext, with: rowDescription) } - mutating func errorReceived(_ errorMessage: PSQLBackendMessage.ErrorResponse) -> Action { + mutating func errorReceived(_ errorMessage: PostgresBackendMessage.ErrorResponse) -> Action { let error = PSQLError.server(errorMessage) switch self.state { case .initialized: diff --git a/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift b/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift index a948b41b..1e804a0c 100644 --- a/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift +++ b/Sources/PostgresNIO/New/Extensions/ByteBuffer+PSQL.swift @@ -2,7 +2,7 @@ import NIOCore internal extension ByteBuffer { - mutating func psqlWriteBackendMessageID(_ messageID: PSQLBackendMessage.ID) { + mutating func psqlWriteBackendMessageID(_ messageID: PostgresBackendMessage.ID) { self.writeInteger(messageID.rawValue) } diff --git a/Sources/PostgresNIO/New/Messages/Authentication.swift b/Sources/PostgresNIO/New/Messages/Authentication.swift index 54d7c6ad..bd0d2e57 100644 --- a/Sources/PostgresNIO/New/Messages/Authentication.swift +++ b/Sources/PostgresNIO/New/Messages/Authentication.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { enum Authentication: PayloadDecodable { case ok @@ -61,7 +61,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage.Authentication: Equatable { +extension PostgresBackendMessage.Authentication: Equatable { static func ==(lhs: Self, rhs: Self) -> Bool { switch (lhs, rhs) { case (.ok, .ok): @@ -92,7 +92,7 @@ extension PSQLBackendMessage.Authentication: Equatable { } } -extension PSQLBackendMessage.Authentication: CustomDebugStringConvertible { +extension PostgresBackendMessage.Authentication: CustomDebugStringConvertible { var debugDescription: String { switch self { case .ok: diff --git a/Sources/PostgresNIO/New/Messages/BackendKeyData.swift b/Sources/PostgresNIO/New/Messages/BackendKeyData.swift index 2d6a23a4..498c5110 100644 --- a/Sources/PostgresNIO/New/Messages/BackendKeyData.swift +++ b/Sources/PostgresNIO/New/Messages/BackendKeyData.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { struct BackendKeyData: PayloadDecodable, Equatable { let processID: Int32 @@ -16,7 +16,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage.BackendKeyData: CustomDebugStringConvertible { +extension PostgresBackendMessage.BackendKeyData: CustomDebugStringConvertible { var debugDescription: String { "processID: \(processID), secretKey: \(secretKey)" } diff --git a/Sources/PostgresNIO/New/Messages/DataRow.swift b/Sources/PostgresNIO/New/Messages/DataRow.swift index 31148c20..b49c9eeb 100644 --- a/Sources/PostgresNIO/New/Messages/DataRow.swift +++ b/Sources/PostgresNIO/New/Messages/DataRow.swift @@ -8,7 +8,7 @@ import NIOCore /// enclosing type, the enclosing type must be @usableFromInline as well. /// Not putting `DataRow` in ``PSQLBackendMessage`` is our way to trick /// the Swift compiler -struct DataRow: PSQLBackendMessage.PayloadDecodable, Equatable { +struct DataRow: PostgresBackendMessage.PayloadDecodable, Equatable { var columnCount: Int16 diff --git a/Sources/PostgresNIO/New/Messages/ErrorResponse.swift b/Sources/PostgresNIO/New/Messages/ErrorResponse.swift index 254cdf0f..818c1ebf 100644 --- a/Sources/PostgresNIO/New/Messages/ErrorResponse.swift +++ b/Sources/PostgresNIO/New/Messages/ErrorResponse.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { enum Field: UInt8, Hashable { /// Severity: the field contents are ERROR, FATAL, or PANIC (in an error message), @@ -81,40 +81,40 @@ extension PSQLBackendMessage { } struct ErrorResponse: PSQLMessageNotice, PayloadDecodable, Equatable { - let fields: [PSQLBackendMessage.Field: String] + let fields: [PostgresBackendMessage.Field: String] - init(fields: [PSQLBackendMessage.Field: String]) { + init(fields: [PostgresBackendMessage.Field: String]) { self.fields = fields } } struct NoticeResponse: PSQLMessageNotice, PayloadDecodable, Equatable { - let fields: [PSQLBackendMessage.Field: String] + let fields: [PostgresBackendMessage.Field: String] - init(fields: [PSQLBackendMessage.Field: String]) { + init(fields: [PostgresBackendMessage.Field: String]) { self.fields = fields } } } protocol PSQLMessageNotice { - var fields: [PSQLBackendMessage.Field: String] { get } + var fields: [PostgresBackendMessage.Field: String] { get } - init(fields: [PSQLBackendMessage.Field: String]) + init(fields: [PostgresBackendMessage.Field: String]) } -extension PSQLBackendMessage.PayloadDecodable where Self: PSQLMessageNotice { +extension PostgresBackendMessage.PayloadDecodable where Self: PSQLMessageNotice { static func decode(from buffer: inout ByteBuffer) throws -> Self { - var fields: [PSQLBackendMessage.Field: String] = [:] + var fields: [PostgresBackendMessage.Field: String] = [:] while let id = buffer.readInteger(as: UInt8.self) { if id == 0 { break } - guard let field = PSQLBackendMessage.Field(rawValue: id) else { + guard let field = PostgresBackendMessage.Field(rawValue: id) else { throw PSQLPartialDecodingError.valueNotRawRepresentable( value: id, - asType: PSQLBackendMessage.Field.self) + asType: PostgresBackendMessage.Field.self) } guard let string = buffer.readNullTerminatedString() else { @@ -126,7 +126,7 @@ extension PSQLBackendMessage.PayloadDecodable where Self: PSQLMessageNotice { } } -extension PSQLBackendMessage.Field: CustomStringConvertible { +extension PostgresBackendMessage.Field: CustomStringConvertible { var description: String { switch self { diff --git a/Sources/PostgresNIO/New/Messages/NotificationResponse.swift b/Sources/PostgresNIO/New/Messages/NotificationResponse.swift index dd5c0cf2..5cd9422e 100644 --- a/Sources/PostgresNIO/New/Messages/NotificationResponse.swift +++ b/Sources/PostgresNIO/New/Messages/NotificationResponse.swift @@ -1,13 +1,13 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { struct NotificationResponse: PayloadDecodable, Equatable { let backendPID: Int32 let channel: String let payload: String - static func decode(from buffer: inout ByteBuffer) throws -> PSQLBackendMessage.NotificationResponse { + static func decode(from buffer: inout ByteBuffer) throws -> PostgresBackendMessage.NotificationResponse { let backendPID = try buffer.throwingReadInteger(as: Int32.self) guard let channel = buffer.readNullTerminatedString() else { diff --git a/Sources/PostgresNIO/New/Messages/ParameterDescription.swift b/Sources/PostgresNIO/New/Messages/ParameterDescription.swift index bd468c44..0d519583 100644 --- a/Sources/PostgresNIO/New/Messages/ParameterDescription.swift +++ b/Sources/PostgresNIO/New/Messages/ParameterDescription.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { struct ParameterDescription: PayloadDecodable, Equatable { /// Specifies the object ID of the parameter data type. diff --git a/Sources/PostgresNIO/New/Messages/ParameterStatus.swift b/Sources/PostgresNIO/New/Messages/ParameterStatus.swift index 89dd1d6d..4ffcbe12 100644 --- a/Sources/PostgresNIO/New/Messages/ParameterStatus.swift +++ b/Sources/PostgresNIO/New/Messages/ParameterStatus.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { struct ParameterStatus: PayloadDecodable, Equatable { /// The name of the run-time parameter being reported. @@ -23,7 +23,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage.ParameterStatus: CustomDebugStringConvertible { +extension PostgresBackendMessage.ParameterStatus: CustomDebugStringConvertible { var debugDescription: String { "parameter: \(String(reflecting: self.parameter)), value: \(String(reflecting: self.value))" } diff --git a/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift b/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift index b8fff2aa..a300f714 100644 --- a/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift +++ b/Sources/PostgresNIO/New/Messages/ReadyForQuery.swift @@ -1,6 +1,6 @@ import NIOCore -extension PSQLBackendMessage { +extension PostgresBackendMessage { enum TransactionState: PayloadDecodable, RawRepresentable { typealias RawValue = UInt8 @@ -43,7 +43,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage.TransactionState: CustomDebugStringConvertible { +extension PostgresBackendMessage.TransactionState: CustomDebugStringConvertible { var debugDescription: String { switch self { case .idle: diff --git a/Sources/PostgresNIO/New/Messages/RowDescription.swift b/Sources/PostgresNIO/New/Messages/RowDescription.swift index 9ca491db..de855e98 100644 --- a/Sources/PostgresNIO/New/Messages/RowDescription.swift +++ b/Sources/PostgresNIO/New/Messages/RowDescription.swift @@ -8,7 +8,7 @@ import NIOCore /// enclosing type, the enclosing type must be @usableFromInline as well. /// Not putting `DataRow` in ``PSQLBackendMessage`` is our way to trick /// the Swift compiler. -struct RowDescription: PSQLBackendMessage.PayloadDecodable, Equatable { +struct RowDescription: PostgresBackendMessage.PayloadDecodable, Equatable { /// Specifies the object ID of the parameter data type. var columns: [Column] diff --git a/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift b/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift index 47485a7b..9a3d6628 100644 --- a/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift +++ b/Sources/PostgresNIO/New/PSQLBackendMessageDecoder.swift @@ -1,5 +1,5 @@ struct PSQLBackendMessageDecoder: NIOSingleStepByteToMessageDecoder { - typealias InboundOut = PSQLBackendMessage + typealias InboundOut = PostgresBackendMessage private(set) var hasAlreadyReceivedBytes: Bool @@ -7,7 +7,7 @@ struct PSQLBackendMessageDecoder: NIOSingleStepByteToMessageDecoder { self.hasAlreadyReceivedBytes = hasAlreadyReceivedBytes } - mutating func decode(buffer: inout ByteBuffer) throws -> PSQLBackendMessage? { + mutating func decode(buffer: inout ByteBuffer) throws -> PostgresBackendMessage? { if !self.hasAlreadyReceivedBytes { // We have not received any bytes yet! Let's peek at the first message id. If it @@ -51,7 +51,7 @@ struct PSQLBackendMessageDecoder: NIOSingleStepByteToMessageDecoder { } // 2. make sure we have a known message identifier - guard let messageID = PSQLBackendMessage.ID(rawValue: idByte) else { + guard let messageID = PostgresBackendMessage.ID(rawValue: idByte) else { buffer.moveReaderIndex(to: startReaderIndex) let completeMessage = buffer.readSlice(length: Int(length) + 1)! throw PSQLDecodingError.unknownMessageIDReceived(messageID: idByte, messageBytes: completeMessage) @@ -59,7 +59,7 @@ struct PSQLBackendMessageDecoder: NIOSingleStepByteToMessageDecoder { // 3. decode the message do { - let result = try PSQLBackendMessage.decode(from: &message, for: messageID) + let result = try PostgresBackendMessage.decode(from: &message, for: messageID) if message.readableBytes > 0 { throw PSQLPartialDecodingError.expectedExactlyNRemainingBytes(0, actual: message.readableBytes) } @@ -73,7 +73,7 @@ struct PSQLBackendMessageDecoder: NIOSingleStepByteToMessageDecoder { } } - mutating func decodeLast(buffer: inout ByteBuffer, seenEOF: Bool) throws -> PSQLBackendMessage? { + mutating func decodeLast(buffer: inout ByteBuffer, seenEOF: Bool) throws -> PostgresBackendMessage? { try self.decode(buffer: &buffer) } } diff --git a/Sources/PostgresNIO/New/PSQLChannelHandler.swift b/Sources/PostgresNIO/New/PSQLChannelHandler.swift index c24ee07d..72eb31f0 100644 --- a/Sources/PostgresNIO/New/PSQLChannelHandler.swift +++ b/Sources/PostgresNIO/New/PSQLChannelHandler.swift @@ -4,7 +4,7 @@ import Crypto import Logging protocol PSQLChannelHandlerNotificationDelegate: AnyObject { - func notificationReceived(_: PSQLBackendMessage.NotificationResponse) + func notificationReceived(_: PostgresBackendMessage.NotificationResponse) } final class PSQLChannelHandler: ChannelDuplexHandler { diff --git a/Sources/PostgresNIO/New/PSQLError.swift b/Sources/PostgresNIO/New/PSQLError.swift index cdcf86c2..022d6016 100644 --- a/Sources/PostgresNIO/New/PSQLError.swift +++ b/Sources/PostgresNIO/New/PSQLError.swift @@ -5,9 +5,9 @@ struct PSQLError: Error { enum Base { case sslUnsupported case failedToAddSSLHandler(underlying: Error) - case server(PSQLBackendMessage.ErrorResponse) + case server(PostgresBackendMessage.ErrorResponse) case decoding(PSQLDecodingError) - case unexpectedBackendMessage(PSQLBackendMessage) + case unexpectedBackendMessage(PostgresBackendMessage) case unsupportedAuthMechanism(PSQLAuthScheme) case authMechanismRequiresPassword case saslError(underlyingError: Error) @@ -35,7 +35,7 @@ struct PSQLError: Error { Self.init(.failedToAddSSLHandler(underlying: error)) } - static func server(_ message: PSQLBackendMessage.ErrorResponse) -> PSQLError { + static func server(_ message: PostgresBackendMessage.ErrorResponse) -> PSQLError { Self.init(.server(message)) } @@ -43,7 +43,7 @@ struct PSQLError: Error { Self.init(.decoding(error)) } - static func unexpectedBackendMessage(_ message: PSQLBackendMessage) -> PSQLError { + static func unexpectedBackendMessage(_ message: PostgresBackendMessage) -> PSQLError { Self.init(.unexpectedBackendMessage(message)) } diff --git a/Sources/PostgresNIO/New/PSQLRowStream.swift b/Sources/PostgresNIO/New/PSQLRowStream.swift index 787c6cef..2d0ec455 100644 --- a/Sources/PostgresNIO/New/PSQLRowStream.swift +++ b/Sources/PostgresNIO/New/PSQLRowStream.swift @@ -255,7 +255,7 @@ final class PSQLRowStream { } } - internal func noticeReceived(_ notice: PSQLBackendMessage.NoticeResponse) { + internal func noticeReceived(_ notice: PostgresBackendMessage.NoticeResponse) { self.logger.debug("Notice Received", metadata: [ .notice: "\(notice)" ]) diff --git a/Sources/PostgresNIO/New/PSQLBackendMessage.swift b/Sources/PostgresNIO/New/PostgresBackendMessage.swift similarity index 96% rename from Sources/PostgresNIO/New/PSQLBackendMessage.swift rename to Sources/PostgresNIO/New/PostgresBackendMessage.swift index 77f7b78b..ecccd1e9 100644 --- a/Sources/PostgresNIO/New/PSQLBackendMessage.swift +++ b/Sources/PostgresNIO/New/PostgresBackendMessage.swift @@ -2,10 +2,10 @@ import NIOCore //import struct Foundation.Data -/// A protocol to implement for all associated value in the `PSQLBackendMessage` enum +/// A protocol to implement for all associated value in the `PostgresBackendMessage` enum protocol PSQLMessagePayloadDecodable { - /// Decodes the associated value for a `PSQLBackendMessage` from the given `ByteBuffer`. + /// Decodes the associated value for a `PostgresBackendMessage` from the given `ByteBuffer`. /// /// When the decoding is done all bytes in the given `ByteBuffer` must be consumed. /// `buffer.readableBytes` must be `0`. In case of an error a `PartialDecodingError` @@ -20,7 +20,7 @@ protocol PSQLMessagePayloadDecodable { /// /// All messages are defined in the official Postgres Documentation in the section /// [Frontend/Backend Protocol – Message Formats](https://www.postgresql.org/docs/13/protocol-message-formats.html) -enum PSQLBackendMessage { +enum PostgresBackendMessage { typealias PayloadDecodable = PSQLMessagePayloadDecodable @@ -45,7 +45,7 @@ enum PSQLBackendMessage { case sslUnsupported } -extension PSQLBackendMessage { +extension PostgresBackendMessage { enum ID: RawRepresentable, Equatable { typealias RawValue = UInt8 @@ -184,9 +184,9 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage { +extension PostgresBackendMessage { - static func decode(from buffer: inout ByteBuffer, for messageID: ID) throws -> PSQLBackendMessage { + static func decode(from buffer: inout ByteBuffer, for messageID: ID) throws -> PostgresBackendMessage { switch messageID { case .authentication: return try .authentication(.decode(from: &buffer)) @@ -248,7 +248,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage: CustomDebugStringConvertible { +extension PostgresBackendMessage: CustomDebugStringConvertible { var debugDescription: String { switch self { case .authentication(let authentication): diff --git a/Tests/PostgresNIOTests/New/Connection State Machine/AuthenticationStateMachineTests.swift b/Tests/PostgresNIOTests/New/Connection State Machine/AuthenticationStateMachineTests.swift index b503f1ad..19b9085e 100644 --- a/Tests/PostgresNIOTests/New/Connection State Machine/AuthenticationStateMachineTests.swift +++ b/Tests/PostgresNIOTests/New/Connection State Machine/AuthenticationStateMachineTests.swift @@ -48,7 +48,7 @@ class AuthenticationStateMachineTests: XCTestCase { XCTAssertEqual(state.provideAuthenticationContext(authContext), .sendStartupMessage(authContext)) XCTAssertEqual(state.authenticationMessageReceived(.md5(salt: salt)), .sendPasswordMessage(.md5(salt: salt), authContext)) - let fields: [PSQLBackendMessage.Field: String] = [ + let fields: [PostgresBackendMessage.Field: String] = [ .message: "password authentication failed for user \"postgres\"", .severity: "FATAL", .sqlState: "28P01", @@ -64,7 +64,7 @@ class AuthenticationStateMachineTests: XCTestCase { // MARK: Test unsupported messages func testUnsupportedAuthMechanism() { - let unsupported: [(PSQLBackendMessage.Authentication, PSQLAuthScheme)] = [ + let unsupported: [(PostgresBackendMessage.Authentication, PSQLAuthScheme)] = [ (.kerberosV5, .kerberosV5), (.scmCredential, .scmCredential), (.gss, .gss), @@ -84,7 +84,7 @@ class AuthenticationStateMachineTests: XCTestCase { func testUnexpectedMessagesAfterStartUp() { var buffer = ByteBuffer() buffer.writeBytes([0, 1, 2, 3, 4, 5, 6, 7, 8]) - let unexpected: [PSQLBackendMessage.Authentication] = [ + let unexpected: [PostgresBackendMessage.Authentication] = [ .gssContinue(data: buffer), .saslContinue(data: buffer), .saslFinal(data: buffer) @@ -103,7 +103,7 @@ class AuthenticationStateMachineTests: XCTestCase { let salt: (UInt8, UInt8, UInt8, UInt8) = (0, 1, 2, 3) var buffer = ByteBuffer() buffer.writeBytes([0, 1, 2, 3, 4, 5, 6, 7, 8]) - let unexpected: [PSQLBackendMessage.Authentication] = [ + let unexpected: [PostgresBackendMessage.Authentication] = [ .kerberosV5, .md5(salt: (0, 1, 2, 3)), .plaintext, diff --git a/Tests/PostgresNIOTests/New/Connection State Machine/ConnectionStateMachineTests.swift b/Tests/PostgresNIOTests/New/Connection State Machine/ConnectionStateMachineTests.swift index 63d40e1a..0b264ce2 100644 --- a/Tests/PostgresNIOTests/New/Connection State Machine/ConnectionStateMachineTests.swift +++ b/Tests/PostgresNIOTests/New/Connection State Machine/ConnectionStateMachineTests.swift @@ -136,7 +136,7 @@ class ConnectionStateMachineTests: XCTestCase { XCTAssertEqual(state.connected(requireTLS: false), .provideAuthenticationContext) XCTAssertEqual(state.provideAuthenticationContext(authContext), .sendStartupMessage(authContext)) XCTAssertEqual(state.authenticationMessageReceived(.md5(salt: salt)), .sendPasswordMessage(.md5(salt: salt), authContext)) - let fields: [PSQLBackendMessage.Field: String] = [ + let fields: [PostgresBackendMessage.Field: String] = [ .message: "password authentication failed for user \"postgres\"", .severity: "FATAL", .sqlState: "28P01", diff --git a/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift b/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift index 835965da..71994596 100644 --- a/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift +++ b/Tests/PostgresNIOTests/New/Extensions/ByteBuffer+Utils.swift @@ -3,13 +3,13 @@ import NIOCore extension ByteBuffer { - static func backendMessage(id: PSQLBackendMessage.ID, _ payload: (inout ByteBuffer) throws -> ()) rethrows -> ByteBuffer { + static func backendMessage(id: PostgresBackendMessage.ID, _ payload: (inout ByteBuffer) throws -> ()) rethrows -> ByteBuffer { var byteBuffer = ByteBuffer() try byteBuffer.writeBackendMessage(id: id, payload) return byteBuffer } - mutating func writeBackendMessage(id: PSQLBackendMessage.ID, _ payload: (inout ByteBuffer) throws -> ()) rethrows { + mutating func writeBackendMessage(id: PostgresBackendMessage.ID, _ payload: (inout ByteBuffer) throws -> ()) rethrows { self.psqlWriteBackendMessageID(id) let lengthIndex = self.writerIndex self.writeInteger(Int32(0)) diff --git a/Tests/PostgresNIOTests/New/Extensions/ConnectionAction+TestUtils.swift b/Tests/PostgresNIOTests/New/Extensions/ConnectionAction+TestUtils.swift index 6db93101..23759664 100644 --- a/Tests/PostgresNIOTests/New/Extensions/ConnectionAction+TestUtils.swift +++ b/Tests/PostgresNIOTests/New/Extensions/ConnectionAction+TestUtils.swift @@ -67,12 +67,12 @@ extension ConnectionStateMachine.ConnectionAction.CleanUpContext: Equatable { } extension ConnectionStateMachine { - static func readyForQuery(transactionState: PSQLBackendMessage.TransactionState = .idle) -> Self { + static func readyForQuery(transactionState: PostgresBackendMessage.TransactionState = .idle) -> Self { let connectionContext = Self.createConnectionContext(transactionState: transactionState) return ConnectionStateMachine(.readyForQuery(connectionContext)) } - static func createConnectionContext(transactionState: PSQLBackendMessage.TransactionState = .idle) -> ConnectionContext { + static func createConnectionContext(transactionState: PostgresBackendMessage.TransactionState = .idle) -> ConnectionContext { let paramaters = [ "DateStyle": "ISO, MDY", "application_name": "", diff --git a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessage+Equatable.swift b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessage+Equatable.swift index 436c7aa9..c459ffeb 100644 --- a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessage+Equatable.swift +++ b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessage+Equatable.swift @@ -1,6 +1,6 @@ @testable import PostgresNIO -extension PSQLBackendMessage: Equatable { +extension PostgresBackendMessage: Equatable { public static func ==(lhs: Self, rhs: Self) -> Bool { switch (lhs, rhs) { diff --git a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift index 8ef8033c..eea7dec3 100644 --- a/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift +++ b/Tests/PostgresNIOTests/New/Extensions/PSQLBackendMessageEncoder.swift @@ -2,14 +2,14 @@ import NIOCore @testable import PostgresNIO struct PSQLBackendMessageEncoder: MessageToByteEncoder { - typealias OutboundIn = PSQLBackendMessage + typealias OutboundIn = PostgresBackendMessage /// Called once there is data to encode. /// /// - parameters: /// - data: The data to encode into a `ByteBuffer`. /// - out: The `ByteBuffer` into which we want to encode. - func encode(data message: PSQLBackendMessage, out buffer: inout ByteBuffer) throws { + func encode(data message: PostgresBackendMessage, out buffer: inout ByteBuffer) throws { switch message { case .authentication(let authentication): self.encode(messageID: message.id, payload: authentication, into: &buffer) @@ -73,7 +73,7 @@ struct PSQLBackendMessageEncoder: MessageToByteEncoder { } private func encode( - messageID: PSQLBackendMessage.ID, + messageID: PostgresBackendMessage.ID, payload: Payload, into buffer: inout ByteBuffer) { @@ -86,7 +86,7 @@ struct PSQLBackendMessageEncoder: MessageToByteEncoder { } } -extension PSQLBackendMessage { +extension PostgresBackendMessage { var id: ID { switch self { case .authentication: @@ -130,7 +130,7 @@ extension PSQLBackendMessage { } } -extension PSQLBackendMessage.Authentication: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.Authentication: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { switch self { @@ -181,7 +181,7 @@ extension PSQLBackendMessage.Authentication: PSQLMessagePayloadEncodable { } -extension PSQLBackendMessage.BackendKeyData: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.BackendKeyData: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { buffer.writeInteger(self.processID) buffer.writeInteger(self.secretKey) @@ -195,7 +195,7 @@ extension DataRow: PSQLMessagePayloadEncodable { } } -extension PSQLBackendMessage.ErrorResponse: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.ErrorResponse: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { for (key, value) in self.fields { buffer.writeInteger(key.rawValue, as: UInt8.self) @@ -205,7 +205,7 @@ extension PSQLBackendMessage.ErrorResponse: PSQLMessagePayloadEncodable { } } -extension PSQLBackendMessage.NoticeResponse: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.NoticeResponse: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { for (key, value) in self.fields { buffer.writeInteger(key.rawValue, as: UInt8.self) @@ -215,7 +215,7 @@ extension PSQLBackendMessage.NoticeResponse: PSQLMessagePayloadEncodable { } } -extension PSQLBackendMessage.NotificationResponse: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.NotificationResponse: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { buffer.writeInteger(self.backendPID) buffer.writeNullTerminatedString(self.channel) @@ -223,7 +223,7 @@ extension PSQLBackendMessage.NotificationResponse: PSQLMessagePayloadEncodable { } } -extension PSQLBackendMessage.ParameterDescription: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.ParameterDescription: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { buffer.writeInteger(Int16(self.dataTypes.count)) @@ -233,14 +233,14 @@ extension PSQLBackendMessage.ParameterDescription: PSQLMessagePayloadEncodable { } } -extension PSQLBackendMessage.ParameterStatus: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.ParameterStatus: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { buffer.writeNullTerminatedString(self.parameter) buffer.writeNullTerminatedString(self.value) } } -extension PSQLBackendMessage.TransactionState: PSQLMessagePayloadEncodable { +extension PostgresBackendMessage.TransactionState: PSQLMessagePayloadEncodable { public func encode(into buffer: inout ByteBuffer) { buffer.writeInteger(self.rawValue) } diff --git a/Tests/PostgresNIOTests/New/Messages/AuthenticationTests.swift b/Tests/PostgresNIOTests/New/Messages/AuthenticationTests.swift index 52e63b2e..85a4314f 100644 --- a/Tests/PostgresNIOTests/New/Messages/AuthenticationTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/AuthenticationTests.swift @@ -6,7 +6,7 @@ import NIOTestUtils class AuthenticationTests: XCTestCase { func testDecodeAuthentication() { - var expected = [PSQLBackendMessage]() + var expected = [PostgresBackendMessage]() var buffer = ByteBuffer() let encoder = PSQLBackendMessageEncoder() diff --git a/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift b/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift index 5715c61c..2db8493b 100644 --- a/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/BackendKeyDataTests.swift @@ -11,7 +11,7 @@ class BackendKeyDataTests: XCTestCase { } let expectedInOuts = [ - (buffer, [PSQLBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567))]), + (buffer, [PostgresBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567))]), ] XCTAssertNoThrow(try ByteToMessageDecoderVerifier.verifyDecoder( @@ -27,7 +27,7 @@ class BackendKeyDataTests: XCTestCase { buffer.writeInteger(Int32(4567)) let expected = [ - (buffer, [PSQLBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567))]), + (buffer, [PostgresBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567))]), ] XCTAssertThrowsError(try ByteToMessageDecoderVerifier.verifyDecoder( diff --git a/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift b/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift index 643c8a28..660baa92 100644 --- a/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift @@ -23,7 +23,7 @@ class DataRowTests: XCTestCase { let rowSlice = buffer.getSlice(at: 7, length: buffer.readableBytes - 7)! let expectedInOuts = [ - (buffer, [PSQLBackendMessage.dataRow(.init(columnCount: 3, bytes: rowSlice))]), + (buffer, [PostgresBackendMessage.dataRow(.init(columnCount: 3, bytes: rowSlice))]), ] XCTAssertNoThrow(try ByteToMessageDecoderVerifier.verifyDecoder( diff --git a/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift b/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift index bbc945e4..038ec34c 100644 --- a/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/ErrorResponseTests.swift @@ -6,7 +6,7 @@ import NIOTestUtils class ErrorResponseTests: XCTestCase { func testDecode() { - let fields: [PSQLBackendMessage.Field : String] = [ + let fields: [PostgresBackendMessage.Field : String] = [ .file: "auth.c", .routine: "auth_failed", .line: "334", @@ -25,7 +25,7 @@ class ErrorResponseTests: XCTestCase { } let expectedInOuts = [ - (buffer, [PSQLBackendMessage.error(.init(fields: fields))]), + (buffer, [PostgresBackendMessage.error(.init(fields: fields))]), ] XCTAssertNoThrow(try ByteToMessageDecoderVerifier.verifyDecoder( diff --git a/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift b/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift index 39fbb220..f41a74af 100644 --- a/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/NotificationResponseTests.swift @@ -6,7 +6,7 @@ import NIOTestUtils class NotificationResponseTests: XCTestCase { func testDecode() { - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .notification(.init(backendPID: 123, channel: "test", payload: "hello")), .notification(.init(backendPID: 123, channel: "test", payload: "world")), .notification(.init(backendPID: 123, channel: "foo", payload: "bar")) diff --git a/Tests/PostgresNIOTests/New/Messages/ParameterDescriptionTests.swift b/Tests/PostgresNIOTests/New/Messages/ParameterDescriptionTests.swift index 8bbdae4c..5c3ff150 100644 --- a/Tests/PostgresNIOTests/New/Messages/ParameterDescriptionTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/ParameterDescriptionTests.swift @@ -6,7 +6,7 @@ import NIOTestUtils class ParameterDescriptionTests: XCTestCase { func testDecode() { - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .parameterDescription(.init(dataTypes: [.bool, .varchar, .uuid, .json, .jsonbArray])), ] diff --git a/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift b/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift index db4963e0..a84e2ac4 100644 --- a/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/ParameterStatusTests.swift @@ -8,7 +8,7 @@ class ParameterStatusTests: XCTestCase { func testDecode() { var buffer = ByteBuffer() - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .parameterStatus(.init(parameter: "DateStyle", value: "ISO, MDY")), .parameterStatus(.init(parameter: "application_name", value: "")), .parameterStatus(.init(parameter: "server_encoding", value: "UTF8")), diff --git a/Tests/PostgresNIOTests/New/Messages/ReadyForQueryTests.swift b/Tests/PostgresNIOTests/New/Messages/ReadyForQueryTests.swift index 55a2c1e7..8ece1bfc 100644 --- a/Tests/PostgresNIOTests/New/Messages/ReadyForQueryTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/ReadyForQueryTests.swift @@ -8,7 +8,7 @@ class ReadyForQueryTests: XCTestCase { func testDecode() { var buffer = ByteBuffer() - let states: [PSQLBackendMessage.TransactionState] = [ + let states: [PostgresBackendMessage.TransactionState] = [ .idle, .inFailedTransaction, .inTransaction, @@ -27,7 +27,7 @@ class ReadyForQueryTests: XCTestCase { } } - let expected = states.map { state -> PSQLBackendMessage in + let expected = states.map { state -> PostgresBackendMessage in .readyForQuery(state) } @@ -67,8 +67,8 @@ class ReadyForQueryTests: XCTestCase { } func testDebugDescription() { - XCTAssertEqual(String(reflecting: PSQLBackendMessage.TransactionState.idle), ".idle") - XCTAssertEqual(String(reflecting: PSQLBackendMessage.TransactionState.inTransaction), ".inTransaction") - XCTAssertEqual(String(reflecting: PSQLBackendMessage.TransactionState.inFailedTransaction), ".inFailedTransaction") + XCTAssertEqual(String(reflecting: PostgresBackendMessage.TransactionState.idle), ".idle") + XCTAssertEqual(String(reflecting: PostgresBackendMessage.TransactionState.inTransaction), ".inTransaction") + XCTAssertEqual(String(reflecting: PostgresBackendMessage.TransactionState.inFailedTransaction), ".inFailedTransaction") } } diff --git a/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift b/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift index 8eba059d..7e941d54 100644 --- a/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift +++ b/Tests/PostgresNIOTests/New/Messages/RowDescriptionTests.swift @@ -11,7 +11,7 @@ class RowDescriptionTests: XCTestCase { .init(name: "Second", tableOID: 123, columnAttributeNumber: 456, dataType: .uuidArray, dataTypeSize: 567, dataTypeModifier: 123, format: .text), ] - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .rowDescription(.init(columns: columns)) ] diff --git a/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift b/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift index 049e23d1..60209d2b 100644 --- a/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift +++ b/Tests/PostgresNIOTests/New/PSQLBackendMessageTests.swift @@ -9,59 +9,59 @@ class PSQLBackendMessageTests: XCTestCase { // MARK: ID func testInitMessageIDWithBytes() { - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "R")), .authentication) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "K")), .backendKeyData) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "2")), .bindComplete) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "3")), .closeComplete) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "C")), .commandComplete) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "d")), .copyData) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "c")), .copyDone) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "G")), .copyInResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "H")), .copyOutResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "W")), .copyBothResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "D")), .dataRow) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "I")), .emptyQueryResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "E")), .error) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "V")), .functionCallResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "v")), .negotiateProtocolVersion) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "n")), .noData) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "N")), .noticeResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "A")), .notificationResponse) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "t")), .parameterDescription) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "S")), .parameterStatus) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "1")), .parseComplete) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "s")), .portalSuspended) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "Z")), .readyForQuery) - XCTAssertEqual(PSQLBackendMessage.ID(rawValue: UInt8(ascii: "T")), .rowDescription) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "R")), .authentication) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "K")), .backendKeyData) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "2")), .bindComplete) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "3")), .closeComplete) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "C")), .commandComplete) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "d")), .copyData) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "c")), .copyDone) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "G")), .copyInResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "H")), .copyOutResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "W")), .copyBothResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "D")), .dataRow) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "I")), .emptyQueryResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "E")), .error) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "V")), .functionCallResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "v")), .negotiateProtocolVersion) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "n")), .noData) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "N")), .noticeResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "A")), .notificationResponse) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "t")), .parameterDescription) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "S")), .parameterStatus) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "1")), .parseComplete) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "s")), .portalSuspended) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "Z")), .readyForQuery) + XCTAssertEqual(PostgresBackendMessage.ID(rawValue: UInt8(ascii: "T")), .rowDescription) - XCTAssertNil(PSQLBackendMessage.ID(rawValue: 0)) + XCTAssertNil(PostgresBackendMessage.ID(rawValue: 0)) } func testMessageIDHasCorrectRawValue() { - XCTAssertEqual(PSQLBackendMessage.ID.authentication.rawValue, UInt8(ascii: "R")) - XCTAssertEqual(PSQLBackendMessage.ID.backendKeyData.rawValue, UInt8(ascii: "K")) - XCTAssertEqual(PSQLBackendMessage.ID.bindComplete.rawValue, UInt8(ascii: "2")) - XCTAssertEqual(PSQLBackendMessage.ID.closeComplete.rawValue, UInt8(ascii: "3")) - XCTAssertEqual(PSQLBackendMessage.ID.commandComplete.rawValue, UInt8(ascii: "C")) - XCTAssertEqual(PSQLBackendMessage.ID.copyData.rawValue, UInt8(ascii: "d")) - XCTAssertEqual(PSQLBackendMessage.ID.copyDone.rawValue, UInt8(ascii: "c")) - XCTAssertEqual(PSQLBackendMessage.ID.copyInResponse.rawValue, UInt8(ascii: "G")) - XCTAssertEqual(PSQLBackendMessage.ID.copyOutResponse.rawValue, UInt8(ascii: "H")) - XCTAssertEqual(PSQLBackendMessage.ID.copyBothResponse.rawValue, UInt8(ascii: "W")) - XCTAssertEqual(PSQLBackendMessage.ID.dataRow.rawValue, UInt8(ascii: "D")) - XCTAssertEqual(PSQLBackendMessage.ID.emptyQueryResponse.rawValue, UInt8(ascii: "I")) - XCTAssertEqual(PSQLBackendMessage.ID.error.rawValue, UInt8(ascii: "E")) - XCTAssertEqual(PSQLBackendMessage.ID.functionCallResponse.rawValue, UInt8(ascii: "V")) - XCTAssertEqual(PSQLBackendMessage.ID.negotiateProtocolVersion.rawValue, UInt8(ascii: "v")) - XCTAssertEqual(PSQLBackendMessage.ID.noData.rawValue, UInt8(ascii: "n")) - XCTAssertEqual(PSQLBackendMessage.ID.noticeResponse.rawValue, UInt8(ascii: "N")) - XCTAssertEqual(PSQLBackendMessage.ID.notificationResponse.rawValue, UInt8(ascii: "A")) - XCTAssertEqual(PSQLBackendMessage.ID.parameterDescription.rawValue, UInt8(ascii: "t")) - XCTAssertEqual(PSQLBackendMessage.ID.parameterStatus.rawValue, UInt8(ascii: "S")) - XCTAssertEqual(PSQLBackendMessage.ID.parseComplete.rawValue, UInt8(ascii: "1")) - XCTAssertEqual(PSQLBackendMessage.ID.portalSuspended.rawValue, UInt8(ascii: "s")) - XCTAssertEqual(PSQLBackendMessage.ID.readyForQuery.rawValue, UInt8(ascii: "Z")) - XCTAssertEqual(PSQLBackendMessage.ID.rowDescription.rawValue, UInt8(ascii: "T")) + XCTAssertEqual(PostgresBackendMessage.ID.authentication.rawValue, UInt8(ascii: "R")) + XCTAssertEqual(PostgresBackendMessage.ID.backendKeyData.rawValue, UInt8(ascii: "K")) + XCTAssertEqual(PostgresBackendMessage.ID.bindComplete.rawValue, UInt8(ascii: "2")) + XCTAssertEqual(PostgresBackendMessage.ID.closeComplete.rawValue, UInt8(ascii: "3")) + XCTAssertEqual(PostgresBackendMessage.ID.commandComplete.rawValue, UInt8(ascii: "C")) + XCTAssertEqual(PostgresBackendMessage.ID.copyData.rawValue, UInt8(ascii: "d")) + XCTAssertEqual(PostgresBackendMessage.ID.copyDone.rawValue, UInt8(ascii: "c")) + XCTAssertEqual(PostgresBackendMessage.ID.copyInResponse.rawValue, UInt8(ascii: "G")) + XCTAssertEqual(PostgresBackendMessage.ID.copyOutResponse.rawValue, UInt8(ascii: "H")) + XCTAssertEqual(PostgresBackendMessage.ID.copyBothResponse.rawValue, UInt8(ascii: "W")) + XCTAssertEqual(PostgresBackendMessage.ID.dataRow.rawValue, UInt8(ascii: "D")) + XCTAssertEqual(PostgresBackendMessage.ID.emptyQueryResponse.rawValue, UInt8(ascii: "I")) + XCTAssertEqual(PostgresBackendMessage.ID.error.rawValue, UInt8(ascii: "E")) + XCTAssertEqual(PostgresBackendMessage.ID.functionCallResponse.rawValue, UInt8(ascii: "V")) + XCTAssertEqual(PostgresBackendMessage.ID.negotiateProtocolVersion.rawValue, UInt8(ascii: "v")) + XCTAssertEqual(PostgresBackendMessage.ID.noData.rawValue, UInt8(ascii: "n")) + XCTAssertEqual(PostgresBackendMessage.ID.noticeResponse.rawValue, UInt8(ascii: "N")) + XCTAssertEqual(PostgresBackendMessage.ID.notificationResponse.rawValue, UInt8(ascii: "A")) + XCTAssertEqual(PostgresBackendMessage.ID.parameterDescription.rawValue, UInt8(ascii: "t")) + XCTAssertEqual(PostgresBackendMessage.ID.parameterStatus.rawValue, UInt8(ascii: "S")) + XCTAssertEqual(PostgresBackendMessage.ID.parseComplete.rawValue, UInt8(ascii: "1")) + XCTAssertEqual(PostgresBackendMessage.ID.portalSuspended.rawValue, UInt8(ascii: "s")) + XCTAssertEqual(PostgresBackendMessage.ID.readyForQuery.rawValue, UInt8(ascii: "Z")) + XCTAssertEqual(PostgresBackendMessage.ID.rowDescription.rawValue, UInt8(ascii: "T")) } // MARK: Decoder @@ -70,11 +70,11 @@ class PSQLBackendMessageTests: XCTestCase { var buffer = ByteBuffer() buffer.writeInteger(UInt8(ascii: "S")) - var expectedMessages: [PSQLBackendMessage] = [.sslSupported] + var expectedMessages: [PostgresBackendMessage] = [.sslSupported] // we test tons of ParameterStatus messages after the SSLSupported message, since those are // also identified by an "S" - let parameterStatus: [PSQLBackendMessage.ParameterStatus] = [ + let parameterStatus: [PostgresBackendMessage.ParameterStatus] = [ .init(parameter: "DateStyle", value: "ISO, MDY"), .init(parameter: "application_name", value: ""), .init(parameter: "server_encoding", value: "UTF8"), @@ -102,8 +102,8 @@ class PSQLBackendMessageTests: XCTestCase { XCTAssertNoThrow(try embedded.writeInbound(buffer)) for expected in expectedMessages { - var message: PSQLBackendMessage? - XCTAssertNoThrow(message = try embedded.readInbound(as: PSQLBackendMessage.self)) + var message: PostgresBackendMessage? + XCTAssertNoThrow(message = try embedded.readInbound(as: PostgresBackendMessage.self)) XCTAssertEqual(message, expected) } } @@ -114,7 +114,7 @@ class PSQLBackendMessageTests: XCTestCase { // we test a NoticeResponse messages after the SSLUnupported message, since NoticeResponse // is identified by a "N" - let fields: [PSQLBackendMessage.Field : String] = [ + let fields: [PostgresBackendMessage.Field : String] = [ .file: "auth.c", .routine: "auth_failed", .line: "334", @@ -124,7 +124,7 @@ class PSQLBackendMessageTests: XCTestCase { .message: "password authentication failed for user \"postgre3\"", ] - let expectedMessages: [PSQLBackendMessage] = [ + let expectedMessages: [PostgresBackendMessage] = [ .sslUnsupported, .notice(.init(fields: fields)) ] @@ -142,14 +142,14 @@ class PSQLBackendMessageTests: XCTestCase { XCTAssertNoThrow(try embedded.writeInbound(buffer)) for expected in expectedMessages { - var message: PSQLBackendMessage? - XCTAssertNoThrow(message = try embedded.readInbound(as: PSQLBackendMessage.self)) + var message: PostgresBackendMessage? + XCTAssertNoThrow(message = try embedded.readInbound(as: PostgresBackendMessage.self)) XCTAssertEqual(message, expected) } } func testPayloadsWithoutAssociatedValues() { - let messageIDs: [PSQLBackendMessage.ID] = [ + let messageIDs: [PostgresBackendMessage.ID] = [ .bindComplete, .closeComplete, .emptyQueryResponse, @@ -163,7 +163,7 @@ class PSQLBackendMessageTests: XCTestCase { buffer.writeBackendMessage(id: messageID) { _ in } } - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .bindComplete, .closeComplete, .emptyQueryResponse, @@ -178,7 +178,7 @@ class PSQLBackendMessageTests: XCTestCase { } func testPayloadsWithoutAssociatedValuesInvalidLength() { - let messageIDs: [PSQLBackendMessage.ID] = [ + let messageIDs: [PostgresBackendMessage.ID] = [ .bindComplete, .closeComplete, .emptyQueryResponse, @@ -202,7 +202,7 @@ class PSQLBackendMessageTests: XCTestCase { } func testDecodeCommandCompleteMessage() { - let expected: [PSQLBackendMessage] = [ + let expected: [PostgresBackendMessage] = [ .commandComplete("SELECT 100"), .commandComplete("INSERT 0 1"), .commandComplete("UPDATE 1"), @@ -256,40 +256,40 @@ class PSQLBackendMessageTests: XCTestCase { } func testDebugDescription() { - XCTAssertEqual("\(PSQLBackendMessage.authentication(.ok))", ".authentication(.ok)") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.kerberosV5))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.ok))", ".authentication(.ok)") + XCTAssertEqual("\(PostgresBackendMessage.authentication(.kerberosV5))", ".authentication(.kerberosV5)") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.md5(salt: (0, 1, 2, 3))))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.md5(salt: (0, 1, 2, 3))))", ".authentication(.md5(salt: (0, 1, 2, 3)))") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.plaintext))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.plaintext))", ".authentication(.plaintext)") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.scmCredential))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.scmCredential))", ".authentication(.scmCredential)") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.gss))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.gss))", ".authentication(.gss)") - XCTAssertEqual("\(PSQLBackendMessage.authentication(.sspi))", + XCTAssertEqual("\(PostgresBackendMessage.authentication(.sspi))", ".authentication(.sspi)") - XCTAssertEqual("\(PSQLBackendMessage.parameterStatus(.init(parameter: "foo", value: "bar")))", + XCTAssertEqual("\(PostgresBackendMessage.parameterStatus(.init(parameter: "foo", value: "bar")))", #".parameterStatus(parameter: "foo", value: "bar")"#) - XCTAssertEqual("\(PSQLBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567)))", + XCTAssertEqual("\(PostgresBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 4567)))", ".backendKeyData(processID: 1234, secretKey: 4567)") - XCTAssertEqual("\(PSQLBackendMessage.bindComplete)", ".bindComplete") - XCTAssertEqual("\(PSQLBackendMessage.closeComplete)", ".closeComplete") - XCTAssertEqual("\(PSQLBackendMessage.commandComplete("SELECT 123"))", #".commandComplete("SELECT 123")"#) - XCTAssertEqual("\(PSQLBackendMessage.emptyQueryResponse)", ".emptyQueryResponse") - XCTAssertEqual("\(PSQLBackendMessage.noData)", ".noData") - XCTAssertEqual("\(PSQLBackendMessage.parseComplete)", ".parseComplete") - XCTAssertEqual("\(PSQLBackendMessage.portalSuspended)", ".portalSuspended") + XCTAssertEqual("\(PostgresBackendMessage.bindComplete)", ".bindComplete") + XCTAssertEqual("\(PostgresBackendMessage.closeComplete)", ".closeComplete") + XCTAssertEqual("\(PostgresBackendMessage.commandComplete("SELECT 123"))", #".commandComplete("SELECT 123")"#) + XCTAssertEqual("\(PostgresBackendMessage.emptyQueryResponse)", ".emptyQueryResponse") + XCTAssertEqual("\(PostgresBackendMessage.noData)", ".noData") + XCTAssertEqual("\(PostgresBackendMessage.parseComplete)", ".parseComplete") + XCTAssertEqual("\(PostgresBackendMessage.portalSuspended)", ".portalSuspended") - XCTAssertEqual("\(PSQLBackendMessage.readyForQuery(.idle))", ".readyForQuery(.idle)") - XCTAssertEqual("\(PSQLBackendMessage.readyForQuery(.inTransaction))", + XCTAssertEqual("\(PostgresBackendMessage.readyForQuery(.idle))", ".readyForQuery(.idle)") + XCTAssertEqual("\(PostgresBackendMessage.readyForQuery(.inTransaction))", ".readyForQuery(.inTransaction)") - XCTAssertEqual("\(PSQLBackendMessage.readyForQuery(.inFailedTransaction))", + XCTAssertEqual("\(PostgresBackendMessage.readyForQuery(.inFailedTransaction))", ".readyForQuery(.inFailedTransaction)") - XCTAssertEqual("\(PSQLBackendMessage.sslSupported)", ".sslSupported") - XCTAssertEqual("\(PSQLBackendMessage.sslUnsupported)", ".sslUnsupported") + XCTAssertEqual("\(PostgresBackendMessage.sslSupported)", ".sslSupported") + XCTAssertEqual("\(PostgresBackendMessage.sslUnsupported)", ".sslUnsupported") } } diff --git a/Tests/PostgresNIOTests/New/PSQLChannelHandlerTests.swift b/Tests/PostgresNIOTests/New/PSQLChannelHandlerTests.swift index f47a0071..bc532581 100644 --- a/Tests/PostgresNIOTests/New/PSQLChannelHandlerTests.swift +++ b/Tests/PostgresNIOTests/New/PSQLChannelHandlerTests.swift @@ -31,9 +31,9 @@ class PSQLChannelHandlerTests: XCTestCase { XCTAssertEqual(startup.parameters.options, nil) XCTAssertEqual(startup.parameters.replication, .false) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.authentication(.ok))) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 5678)))) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.readyForQuery(.idle))) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.authentication(.ok))) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 5678)))) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.readyForQuery(.idle))) } func testEstablishSSLCallbackIsCalledIfSSLIsSupported() { @@ -58,7 +58,7 @@ class PSQLChannelHandlerTests: XCTestCase { XCTAssertEqual(request.code, 80877103) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.sslSupported)) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.sslSupported)) // a NIOSSLHandler has been added, after it SSL had been negotiated XCTAssertTrue(addSSLCallbackIsHit) @@ -99,7 +99,7 @@ class PSQLChannelHandlerTests: XCTestCase { // read the ssl request message XCTAssertEqual(try embedded.readOutbound(as: PSQLFrontendMessage.self), .sslRequest(.init())) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.sslUnsupported)) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.sslUnsupported)) // the event handler should have seen an error XCTAssertEqual(eventHandler.errors.count, 1) @@ -128,7 +128,7 @@ class PSQLChannelHandlerTests: XCTestCase { embedded.triggerUserOutboundEvent(PSQLOutgoingEvent.authenticate(authContext), promise: nil) XCTAssertEqual(try embedded.readOutbound(as: PSQLFrontendMessage.self), .startup(.versionThree(parameters: authContext.toStartupParameters()))) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.authentication(.md5(salt: (0,1,2,3))))) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.authentication(.md5(salt: (0,1,2,3))))) var message: PSQLFrontendMessage? XCTAssertNoThrow(message = try embedded.readOutbound(as: PSQLFrontendMessage.self)) @@ -157,7 +157,7 @@ class PSQLChannelHandlerTests: XCTestCase { embedded.triggerUserOutboundEvent(PSQLOutgoingEvent.authenticate(authContext), promise: nil) XCTAssertEqual(try embedded.readOutbound(as: PSQLFrontendMessage.self), .startup(.versionThree(parameters: authContext.toStartupParameters()))) - XCTAssertNoThrow(try embedded.writeInbound(PSQLBackendMessage.authentication(.plaintext))) + XCTAssertNoThrow(try embedded.writeInbound(PostgresBackendMessage.authentication(.plaintext))) var message: PSQLFrontendMessage? XCTAssertNoThrow(message = try embedded.readOutbound(as: PSQLFrontendMessage.self))