Fix tests

Author: fabianfett

Sources/PostgresNIO/New/PostgresChannelHandler.swift

@@ -306,7 +306,7 @@ final class PostgresChannelHandler: ChannelDuplexHandler {
         case .wait:
             break
         case .sendStartupMessage(let authContext):
-            self.encoder.startup(authContext.toStartupParameters())
+            self.encoder.startup(user: authContext.username, database: authContext.database, options: authContext.additionalParameters)
             context.writeAndFlush(self.wrapOutboundOut(self.encoder.flushBuffer()), promise: nil)
         case .sendSSLRequest:
             self.encoder.ssl()
@@ -684,17 +684,6 @@ extension PostgresChannelHandler: PSQLRowsDataSource {
     }
 }
 
-extension AuthContext {
-    func toStartupParameters() -> PostgresFrontendMessage.Startup.Parameters {
-        PostgresFrontendMessage.Startup.Parameters(
-            user: self.username,
-            database: self.database,
-            replication: .false,
-            options: self.additionalParameters
-        )
-    }
-}
-
 private extension Insecure.MD5.Digest {
 
     private static let lowercaseLookup: [UInt8] = [

Sources/PostgresNIO/New/PostgresFrontendMessageEncoder.swift

@@ -13,30 +13,22 @@ struct PostgresFrontendMessageEncoder {
         self.buffer = buffer
     }
 
-    mutating func startup(_ parameters: PostgresFrontendMessage.Startup.Parameters) {
+    mutating func startup(user: String, database: String?, options: [(String, String)]) {
         self.clearIfNeeded()
         self.encodeLengthPrefixed { buffer in
             buffer.writeInteger(PostgresFrontendMessage.Startup.versionThree)
             buffer.writeNullTerminatedString("user")
-            buffer.writeNullTerminatedString(parameters.user)
+            buffer.writeNullTerminatedString(user)
 
-            if let database = parameters.database {
+            if let database = database {
                 buffer.writeNullTerminatedString("database")
                 buffer.writeNullTerminatedString(database)
             }
 
-            switch parameters.replication {
-            case .database:
-                buffer.writeNullTerminatedString("replication")
-                buffer.writeNullTerminatedString("replication")
-            case .true:
-                buffer.writeNullTerminatedString("replication")
-                buffer.writeNullTerminatedString("true")
-            case .false:
-                break
-            }
+            // we don't send replication parameters, as the default is false and this is what we
+            // need for a client
 
-            for (key, value) in parameters.options {
+            for (key, value) in options {
                 buffer.writeNullTerminatedString(key)
                 buffer.writeNullTerminatedString(value)
             }

Tests/PostgresNIOTests/New/Messages/StartupTests.swift

@@ -7,41 +7,26 @@ class StartupTests: XCTestCase {
     func testStartupMessage() {
         var encoder = PostgresFrontendMessageEncoder(buffer: .init())
         var byteBuffer = ByteBuffer()
-        
-        let replicationValues: [PostgresFrontendMessage.Startup.Parameters.Replication] = [
-            .`true`,
-            .`false`,
-            .database
-        ]
-        
-        for replication in replicationValues {
-            let parameters = PostgresFrontendMessage.Startup.Parameters(
-                user: "test",
-                database: "abc123",
-                replication: replication,
-                options: [("some", "options")]
-            )
-            
-            encoder.startup(parameters)
-            byteBuffer = encoder.flushBuffer()
 
-            let byteBufferLength = Int32(byteBuffer.readableBytes)
-            XCTAssertEqual(byteBufferLength, byteBuffer.readInteger())
-            XCTAssertEqual(PostgresFrontendMessage.Startup.versionThree, byteBuffer.readInteger())
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "user")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "test")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "database")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "abc123")
-            if replication != .false {
-                XCTAssertEqual(byteBuffer.readNullTerminatedString(), "replication")
-                XCTAssertEqual(byteBuffer.readNullTerminatedString(), replication.stringValue)
-            }
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "some")
-            XCTAssertEqual(byteBuffer.readNullTerminatedString(), "options")
-            XCTAssertEqual(byteBuffer.readInteger(), UInt8(0))
-            
-            XCTAssertEqual(byteBuffer.readableBytes, 0)
-        }
+        let user = "test"
+        let database = "abc123"
+        let options = [("some", "options")]
+
+        encoder.startup(user: user, database: database, options: options)
+        byteBuffer = encoder.flushBuffer()
+
+        let byteBufferLength = Int32(byteBuffer.readableBytes)
+        XCTAssertEqual(byteBufferLength, byteBuffer.readInteger())
+        XCTAssertEqual(PostgresFrontendMessage.Startup.versionThree, byteBuffer.readInteger())
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "user")
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "test")
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "database")
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "abc123")
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "some")
+        XCTAssertEqual(byteBuffer.readNullTerminatedString(), "options")
+        XCTAssertEqual(byteBuffer.readInteger(), UInt8(0))
+
+        XCTAssertEqual(byteBuffer.readableBytes, 0)
     }
 }
 

Tests/PostgresNIOTests/New/PostgresChannelHandlerTests.swift

@@ -5,6 +5,7 @@ import NIOSSL
 import NIOEmbedded
 @testable import PostgresNIO
 
+
 class PostgresChannelHandlerTests: XCTestCase {
 
     var eventLoop: EmbeddedEventLoop!
@@ -207,7 +208,7 @@ class PostgresChannelHandlerTests: XCTestCase {
 
         XCTAssertEqual(startup.parameters.user, config.username)
         XCTAssertEqual(startup.parameters.database, config.database)
-        XCTAssertEqual(startup.parameters.options, nil)
+        XCTAssert(startup.parameters.options.isEmpty)
         XCTAssertEqual(startup.parameters.replication, .false)
 
         var buffer = ByteBuffer()
@@ -274,3 +275,14 @@ class TestEventHandler: ChannelInboundHandler {
         self.events.append(psqlEvent)
     }
 }
+
+extension AuthContext {
+    func toStartupParameters() -> PostgresFrontendMessage.Startup.Parameters {
+        PostgresFrontendMessage.Startup.Parameters(
+            user: self.username,
+            database: self.database,
+            replication: .false,
+            options: self.additionalParameters
+        )
+    }
+}

Tests/PostgresNIOTests/New/PostgresConnectionTests.swift

@@ -292,7 +292,7 @@ class PostgresConnectionTests: XCTestCase {
 
         async let connectionPromise = PostgresConnection.connect(on: eventLoop, configuration: configuration, id: 1, logger: self.logger)
         let message = try await channel.waitForOutboundWrite(as: PostgresFrontendMessage.self)
-        XCTAssertEqual(message, .startup(.versionThree(parameters: .init(user: "username", database: "database", replication: .false))))
+        XCTAssertEqual(message, .startup(.versionThree(parameters: .init(user: "username", database: "database", replication: .false, options: []))))
         try await channel.writeInbound(PostgresBackendMessage.authentication(.ok))
         try await channel.writeInbound(PostgresBackendMessage.backendKeyData(.init(processID: 1234, secretKey: 5678)))
         try await channel.writeInbound(PostgresBackendMessage.readyForQuery(.idle))