#3: Use PostgresConnection.Configuration for the PostgreSQL connection configuration

Author: trasch

Sources/PostgresConnectionPool/PoolConfiguration.swift

@@ -9,6 +9,7 @@ import PostgresNIO
 public struct PoolConfiguration {
 
     /// PostgreSQL connection parameters.
+    @available(*, deprecated, message: "Use `PostgresConnection.Configuration` etc. instead.")
     public struct Connection {
         let username: String
         let password: String
@@ -35,7 +36,7 @@ public struct PoolConfiguration {
     public let applicationName: String
 
     /// Connection parameters to the database.
-    public let connection: Connection
+    public let postgresConfiguration: PostgresConnection.Configuration
 
     /// Timeout for opening new connections to the PostgreSQL database, in seconds (default: 5 seconds).
     public let connectTimeout: TimeInterval
@@ -64,14 +65,14 @@ public struct PoolConfiguration {
 
     public init(
         applicationName: String,
-        connection: Connection,
+        postgresConfiguration: PostgresConnection.Configuration,
         connectTimeout: TimeInterval = 5.0,
         queryTimeout: TimeInterval? = nil,
         poolSize: Int = 10,
         maxIdleConnections: Int? = nil)
     {
         self.applicationName = applicationName
-        self.connection = connection
+        self.postgresConfiguration = postgresConfiguration
         self.connectTimeout = connectTimeout.atLeast(1.0)
         self.queryTimeout = queryTimeout?.atLeast(1.0)
         self.poolSize = poolSize.atLeast(1)
@@ -82,4 +83,28 @@ public struct PoolConfiguration {
         }
     }
 
+    @available(*, deprecated, message: "Use `init(applicationName:postgresConfiguration:connectTimeout:queryTimeout:poolSize:maxIdleConnections:)` instead.")
+    public init(
+        applicationName: String,
+        connection: Connection,
+        connectTimeout: TimeInterval = 5.0,
+        queryTimeout: TimeInterval? = nil,
+        poolSize: Int = 10,
+        maxIdleConnections: Int? = nil)
+    {
+        let postgresConfiguration = PostgresConnection.Configuration(
+            host: connection.host,
+            port: connection.port,
+            username: connection.username,
+            password: connection.password,
+            database: connection.database,
+            tls: .disable)
+        self.init(applicationName: applicationName,
+                  postgresConfiguration: postgresConfiguration,
+                  connectTimeout: connectTimeout,
+                  queryTimeout: queryTimeout,
+                  poolSize: poolSize,
+                  maxIdleConnections: maxIdleConnections)
+    }
+
 }

Sources/PostgresConnectionPool/PostgresConnectionPool.swift

@@ -48,22 +48,32 @@ public actor PostgresConnectionPool {
         self.eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: configuration.poolSize * 2)
 
         self.connectionName = String(configuration.applicationName.replacingPattern("[^-\\w\\d\\s()]", with: "").prefix(PostgresConnectionPool.postgresMaxNameLength))
-        self.poolName = "\(configuration.connection.username)@\(configuration.connection.host):\(configuration.connection.port)/\(configuration.connection.database)"
         self.poolSize = configuration.poolSize
         self.maxIdleConnections = configuration.maxIdleConnections
         self.queryTimeout = configuration.queryTimeout
 
+        let dbUsername = configuration.postgresConfiguration.username
+        let dbDatabase = configuration.postgresConfiguration.database ?? dbUsername
+        if let host = configuration.postgresConfiguration.host,
+           let port = configuration.postgresConfiguration.port
+        {
+            self.poolName = "\(dbUsername)@\(host):\(port)/\(dbDatabase)"
+        }
+        else if let unixSocketPath = configuration.postgresConfiguration.unixSocketPath {
+            self.poolName = "postgresql:///\(dbDatabase)?user=\(dbUsername)&host=\(unixSocketPath)"
+        }
+        else if let channel = configuration.postgresConfiguration.establishedChannel {
+            self.poolName = "\(dbUsername)@EstablishedChannel<\(channel)>/\(dbDatabase)"
+        }
+        else {
+            self.poolName = "<Unknown connection>"
+        }
+
         self.onOpenConnection = configuration.onOpenConnection
         self.onReturnConnection = configuration.onReturnConnection
         self.onCloseConnection = configuration.onCloseConnection
 
-        var postgresConfiguration = PostgresConnection.Configuration(
-            host: configuration.connection.host,
-            port: configuration.connection.port,
-            username: configuration.connection.username,
-            password: configuration.connection.password,
-            database: configuration.connection.database,
-            tls: .disable)
+        var postgresConfiguration = configuration.postgresConfiguration
         postgresConfiguration.options.connectTimeout = .seconds(Int64(configuration.connectTimeout))
         self.postgresConfiguration = postgresConfiguration
     }