Review fixes.

Author: MrMage

Sources/PostgreSQL/Connection/PostgreSQLConnection+Connect.swift

@@ -3,39 +3,50 @@ import NIO
 import NIOOpenSSL
 
 extension PostgreSQLConnection {
-	/// Connects to a PostgreSQL server using a TCP socket.
+    @available(*, deprecated, message: "Use `.connect(to:...)` instead.")
     public static func connect(
-		to serverAddress: PostgreSQLDatabaseConfig.ServerAddress = .default,
+        hostname: String = "localhost",
+        port: Int = 5432,
         transport: PostgreSQLTransportConfig = .cleartext,
         on worker: Worker,
         onError: @escaping (Error) -> ()
-    ) throws -> Future<PostgreSQLConnection> {
-		let handler = QueueHandler<PostgreSQLMessage, PostgreSQLMessage>(on: worker, onError: onError)
-		let bootstrap = ClientBootstrap(group: worker.eventLoop)
-			// Enable SO_REUSEADDR.
-			.channelOption(ChannelOptions.socket(SocketOptionLevel(SOL_SOCKET), SO_REUSEADDR), value: 1)
-			.channelInitializer { channel in
-				return channel.pipeline.addPostgreSQLClientHandlers().then {
-					channel.pipeline.add(handler: handler)
-				}
-		}
-		
-		let connectedBootstrap: Future<Channel>
-		switch serverAddress {
-		case let .tcp(hostname, port):
-			connectedBootstrap = bootstrap.connect(host: hostname, port: port)
-		case let .unixSocket(socketPath):
-			connectedBootstrap = bootstrap.connect(unixDomainSocketPath: socketPath)
-		}
-		
-		return connectedBootstrap.flatMap { channel in
-			let connection = PostgreSQLConnection(queue: handler, channel: channel)
-			if case .tls(let tlsConfiguration) = transport.method {
-				return connection.addSSLClientHandler(using: tlsConfiguration).transform(to: connection)
-			} else {
-				return worker.eventLoop.newSucceededFuture(result: connection)
-			}
-		}
+        ) throws -> Future<PostgreSQLConnection> {
+        return connect(to: .tcp(hostname: hostname, port: port), transport: transport, on: worker, onError: onError)
+    }
+    
+    /// Connects to a PostgreSQL server using a TCP socket.
+    public static func connect(
+        to serverAddress: PostgreSQLDatabaseConfig.ServerAddress = .default,
+        transport: PostgreSQLTransportConfig = .cleartext,
+        on worker: Worker,
+        onError: @escaping (Error) -> ()
+        ) throws -> Future<PostgreSQLConnection> {
+        let handler = QueueHandler<PostgreSQLMessage, PostgreSQLMessage>(on: worker, onError: onError)
+        let bootstrap = ClientBootstrap(group: worker.eventLoop)
+            // Enable SO_REUSEADDR.
+            .channelOption(ChannelOptions.socket(SocketOptionLevel(SOL_SOCKET), SO_REUSEADDR), value: 1)
+            .channelInitializer { channel in
+                return channel.pipeline.addPostgreSQLClientHandlers().then {
+                    channel.pipeline.add(handler: handler)
+                }
+        }
+        
+        let connectedBootstrap: Future<Channel>
+        switch serverAddress {
+        case let .tcp(hostname, port):
+            connectedBootstrap = bootstrap.connect(host: hostname, port: port)
+        case let .unixSocket(socketPath):
+            connectedBootstrap = bootstrap.connect(unixDomainSocketPath: socketPath)
+        }
+        
+        return connectedBootstrap.flatMap { channel in
+            let connection = PostgreSQLConnection(queue: handler, channel: channel)
+            if case .tls(let tlsConfiguration) = transport.method {
+                return connection.addSSLClientHandler(using: tlsConfiguration).transform(to: connection)
+            } else {
+                return worker.eventLoop.newSucceededFuture(result: connection)
+            }
+        }
     }
 }
 

Sources/PostgreSQL/Database/PostgreSQLDatabaseConfig.swift

@@ -7,16 +7,20 @@ public struct PostgreSQLDatabaseConfig {
     public static func `default`() -> PostgreSQLDatabaseConfig {
         return .init(hostname: "localhost", port: 5432, username: "postgres")
     }
-	
-	public enum ServerAddress {
-		case tcp(hostname: String, port: Int)
-		case unixSocket(path: String)
-		
-		public static let `default` = ServerAddress.tcp(hostname: "localhost", port: 5432)
-		public static let defaultViaSocket = ServerAddress.unixSocket(path: "/tmp/.s.PGSQL.5432")
-	}
-	
-	public let serverAddress: ServerAddress
+    
+    /// Specifies how to connect to a PostgreSQL server.
+    public enum ServerAddress {
+        /// Connect via TCP using the given hostname and port.
+        case tcp(hostname: String, port: Int)
+        /// Connect via a Unix domain socket file.
+        case unixSocket(path: String)
+        
+        public static let `default` = ServerAddress.tcp(hostname: "localhost", port: 5432)
+        public static let socketDefault = ServerAddress.unixSocket(path: "/tmp/.s.PGSQL.5432")
+    }
+    
+    /// Which server to connect to.
+    public let serverAddress: ServerAddress
 
     /// Username to authenticate.
     public let username: String

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -493,18 +493,18 @@ extension PostgreSQLConnection {
     /// Creates a test event loop and psql client over ssl.
     static func makeTest(transport: PostgreSQLTransportConfig) throws -> PostgreSQLConnection {
         #if os(macOS)
-		return try _makeTest(serverAddress: .tcp(hostname: "192.168.99.100", port: transport.isTLS ? 5433 : 5432), password: "vapor_password", transport: transport)
+        return try _makeTest(serverAddress: .tcp(hostname: "192.168.99.100", port: transport.isTLS ? 5433 : 5432), password: "vapor_password", transport: transport)
         #else
-		return try _makeTest(serverAddress: .tcp(hostname: transport.isTLS ? "tls" : "cleartext", port: 5432), password: "vapor_password", transport: transport)
+        return try _makeTest(serverAddress: .tcp(hostname: transport.isTLS ? "tls" : "cleartext", port: 5432), password: "vapor_password", transport: transport)
         #endif
     }
 
     /// Creates a test connection.
-	private static func _makeTest(serverAddress: PostgreSQLDatabaseConfig.ServerAddress, password: String? = nil, transport: PostgreSQLTransportConfig = .cleartext) throws -> PostgreSQLConnection {
+    private static func _makeTest(serverAddress: PostgreSQLDatabaseConfig.ServerAddress, password: String? = nil, transport: PostgreSQLTransportConfig = .cleartext) throws -> PostgreSQLConnection {
         let group = MultiThreadedEventLoopGroup(numThreads: 1)
-		let client = try PostgreSQLConnection.connect(to: serverAddress, transport: transport, on: group) { error in
+        let client = try PostgreSQLConnection.connect(to: serverAddress, transport: transport, on: group) { error in
             XCTFail("\(error)")
-        }.wait()
+            }.wait()
         _ = try client.authenticate(username: "vapor_username", database: "vapor_database", password: password).wait()
         return client
     }