fix U/Int8 encoding + remove char, bpchar U/Int8 decoding

Author: tanner0101

Sources/PostgreSQL/Data/PostgreSQLData+FixedWidthInteger.swift

@@ -5,10 +5,21 @@ extension FixedWidthInteger {
         case .binary(let value):
             let i: Self?
             switch data.type {
-            case .char, .bpchar: i = value.as(Int8.self, default: 0).bigEndian.cast(to: Self.self)
-            case .int2: i = value.as(Int16.self, default: 0).bigEndian.cast(to: Self.self)
-            case .int4, .oid, .regproc: i = value.as(Int32.self, default: 0).bigEndian.cast(to: Self.self)
-            case .int8: i = value.as(Int64.self, default: 0).bigEndian.cast(to: Self.self)
+            case .int2:
+                guard value.count == 2 else {
+                    throw PostgreSQLError.decode(self, from: data)
+                }
+                i = value.as(Int16.self, default: 0).bigEndian.cast(to: Self.self)
+            case .int4, .oid, .regproc:
+                guard value.count == 4 else {
+                    throw PostgreSQLError.decode(self, from: data)
+                }
+                i = value.as(Int32.self, default: 0).bigEndian.cast(to: Self.self)
+            case .int8:
+                guard value.count == 8 else {
+                    throw PostgreSQLError.decode(self, from: data)
+                }
+                i = value.as(Int64.self, default: 0).bigEndian.cast(to: Self.self)
             default: throw PostgreSQLError.decode(self, from: data)
             }
             guard let value = i else {
@@ -36,7 +47,17 @@ extension FixedWidthInteger {
     public func convertToPostgreSQLData() throws -> PostgreSQLData {
         let type: PostgreSQLDataFormat
         switch Self.bitWidth {
-        case 8: type = .char
+        case 8:
+            let data: PostgreSQLData?
+            if Self.isSigned {
+                data = try cast(to: Int16.self)?.convertToPostgreSQLData()
+            } else {
+                data = try cast(to: UInt16.self)?.convertToPostgreSQLData()
+            }
+            guard let d = data else {
+                throw PostgreSQLError(identifier: "singleByteInt", reason: "Could not convert \(Self.self) to PostgreSQLData: \(self)")
+            }
+            return d
         case 16: type = .int2
         case 32: type = .int4
         case 64: type = .int8

Sources/PostgreSQL/Utilities/Utilities.swift

@@ -67,30 +67,6 @@ extension ByteBuffer {
     }
 }
 
-public struct Char: Codable, CustomStringConvertible {
-    public let value: UInt8
-    public var description: String {
-        if let string = String(data: Data([value]), encoding: .utf8) {
-            return "\"" + string + "\""
-        } else {
-            return "\\" + value.description
-        }
-    }
-    public init(_ value: UInt8) {
-        self.value = value
-    }
-    
-    public init(from decoder: Decoder) throws {
-        let single = try decoder.singleValueContainer()
-        self.value = try single.decode(UInt8.self)
-    }
-    
-    public func encode(to encoder: Encoder) throws {
-        var single = encoder.singleValueContainer()
-        try single.encode(value)
-    }
-}
-
 public enum Regproc: PostgreSQLDataConvertible, Codable {
     public func convertToPostgreSQLData() throws -> PostgreSQLData {
         switch self {

Tests/PostgreSQLTests/PostgreSQLConnectionTests.swift

@@ -63,11 +63,11 @@ class PostgreSQLConnectionTests: XCTestCase {
             var typowner: UInt32
             var typlen: Int16
             var typbyval: Bool
-            var typtype: Char
-            var typcategory: Char
+            var typtype: String
+            var typcategory: String
             var typispreferred: Bool
             var typisdefined: Bool
-            var typdelim: Char
+            var typdelim: String
             var typrelid: UInt32
             var typelem: UInt32
             var typarray: UInt32
@@ -78,8 +78,8 @@ class PostgreSQLConnectionTests: XCTestCase {
             var typmodin: Regproc
             var typmodout: Regproc
             var typanalyze: Regproc
-            var typalign: Char
-            var typstorage: Char
+            var typalign: String
+            var typstorage: String
             var typnotnull: Bool
             var typbasetype: UInt32
             var typtypmod: Int