Merge PSQLConnection into PostgresConnection (#240)

Author: fabianfett

Sources/PostgresNIO/Connection/PostgresConnection.swift

@@ -134,22 +134,37 @@ struct ConnectionStateMachine {
     }
 
     mutating func connected(tls: TLSConfiguration) -> ConnectionAction {
-        guard case .initialized = self.state else {
-            preconditionFailure("Unexpected state")
-        }
+        switch self.state {
+        case .initialized:
+            switch tls {
+            case .disable:
+                self.state = .waitingToStartAuthentication
+                return .provideAuthenticationContext
 
-        switch tls {
-        case .disable:
-            self.state = .waitingToStartAuthentication
-            return .provideAuthenticationContext
+            case .prefer:
+                self.state = .sslRequestSent(.prefer)
+                return .sendSSLRequest
 
-        case .prefer:
-            self.state = .sslRequestSent(.prefer)
-            return .sendSSLRequest
+            case .require:
+                self.state = .sslRequestSent(.require)
+                return .sendSSLRequest
+            }
 
-        case .require:
-            self.state = .sslRequestSent(.require)
-            return .sendSSLRequest
+        case .sslRequestSent,
+             .sslNegotiated,
+             .sslHandlerAdded,
+             .waitingToStartAuthentication,
+             .authenticating,
+             .authenticated,
+             .readyForQuery,
+             .extendedQuery,
+             .prepareStatement,
+             .closeCommand,
+             .error,
+             .closing,
+             .closed,
+             .modifying:
+            return .wait
         }
     }
 
@@ -1084,7 +1099,7 @@ extension ConnectionStateMachine {
         case .tooManyParameters:
             return true
         case .connectionQuiescing:
-            preconditionFailure("Pure client error, that is thrown directly in PSQLConnection")
+            preconditionFailure("Pure client error, that is thrown directly in PostgresConnection")
         case .connectionClosed:
             preconditionFailure("Pure client error, that is thrown directly and should never ")
         case .connectionError:

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

@@ -1,5 +1,8 @@
 import Logging
 
+@usableFromInline
+enum PSQLConnection {}
+
 extension PSQLConnection {
     @usableFromInline
     enum LoggerMetaDataKey: String {

Sources/PostgresNIO/New/Extensions/Logging+PSQL.swift

@@ -26,13 +26,13 @@ final class PSQLChannelHandler: ChannelDuplexHandler {
     private var rowStream: PSQLRowStream?
     private var decoder: NIOSingleStepByteToMessageProcessor<PSQLBackendMessageDecoder>
     private var encoder: BufferedMessageEncoder!
-    private let configuration: PSQLConnection.Configuration
+    private let configuration: PostgresConnection.Configuration
     private let configureSSLCallback: ((Channel) throws -> Void)?
 
     /// this delegate should only be accessed on the connections `EventLoop`
     weak var notificationDelegate: PSQLChannelHandlerNotificationDelegate?
 
-    init(configuration: PSQLConnection.Configuration,
+    init(configuration: PostgresConnection.Configuration,
          logger: Logger,
          configureSSLCallback: ((Channel) throws -> Void)?)
     {
@@ -45,7 +45,7 @@ final class PSQLChannelHandler: ChannelDuplexHandler {
 
     #if DEBUG
     /// for testing purposes only
-    init(configuration: PSQLConnection.Configuration,
+    init(configuration: PostgresConnection.Configuration,
          state: ConnectionStateMachine = .init(.initialized),
          logger: Logger = .psqlNoOpLogger,
          configureSSLCallback: ((Channel) throws -> Void)?)
@@ -518,7 +518,7 @@ extension PSQLChannelHandler: PSQLRowsDataSource {
     }
 }
 
-extension PSQLConnection.Configuration.Authentication {
+extension PostgresConnection.Configuration.Authentication {
     func toAuthContext() -> AuthContext {
         AuthContext(
             username: self.username,
@@ -575,7 +575,7 @@ private extension Insecure.MD5.Digest {
 }
 
 extension ConnectionStateMachine.TLSConfiguration {
-    fileprivate init(_ connection: PSQLConnection.Configuration.TLS) {
+    fileprivate init(_ connection: PostgresConnection.Configuration.TLS) {
         switch connection.base {
         case .disable:
             self = .disable
@@ -589,7 +589,7 @@ extension ConnectionStateMachine.TLSConfiguration {
 
 extension PSQLChannelHandler {
     convenience init(
-        configuration: PSQLConnection.Configuration,
+        configuration: PostgresConnection.Configuration,
         configureSSLCallback: ((Channel) throws -> Void)?)
     {
         self.init(