Rename PSQLEncodingContext to PostgresEncodingContext (vapor#227)

fabianfett · web-flow · commit 7f53867076c4 · 2022-02-25T10:02:18.000+01:00
diff --git a/Sources/PostgresNIO/New/Data/Array+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Array+PostgresCodable.swift
@@ -78,7 +78,7 @@ extension Array: PostgresEncodable where Element: PSQLArrayElement {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into buffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         // 0 if empty, 1 if not
         buffer.writeInteger(self.isEmpty ? 0 : 1, as: UInt32.self)
diff --git a/Sources/PostgresNIO/New/Data/Bool+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Bool+PostgresCodable.swift
@@ -51,7 +51,7 @@ extension Bool: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self ? 1 : 0, as: UInt8.self)
     }
diff --git a/Sources/PostgresNIO/New/Data/Bytes+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Bytes+PostgresCodable.swift
@@ -13,7 +13,7 @@ extension PostgresEncodable where Self: Sequence, Self.Element == UInt8 {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeBytes(self)
     }
@@ -30,7 +30,7 @@ extension ByteBuffer: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         var copyOfSelf = self // dirty hack
         byteBuffer.writeBuffer(&copyOfSelf)
@@ -57,7 +57,7 @@ extension Data: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeBytes(self)
     }
diff --git a/Sources/PostgresNIO/New/Data/Date+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Date+PostgresCodable.swift
@@ -36,7 +36,7 @@ extension Date: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         let seconds = self.timeIntervalSince(Self._psqlDateStart) * Double(Self._microsecondsPerSecond)
         byteBuffer.writeInteger(Int64(seconds))
diff --git a/Sources/PostgresNIO/New/Data/Decimal+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Decimal+PostgresCodable.swift
@@ -34,7 +34,7 @@ extension Decimal: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         let numeric = PostgresNumeric(decimal: self)
         byteBuffer.writeInteger(numeric.ndigits)
diff --git a/Sources/PostgresNIO/New/Data/Float+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Float+PostgresCodable.swift
@@ -38,7 +38,7 @@ extension Float: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.psqlWriteFloat(self)
     }
@@ -82,7 +82,7 @@ extension Double: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.psqlWriteDouble(self)
     }
diff --git a/Sources/PostgresNIO/New/Data/Int+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Int+PostgresCodable.swift
@@ -29,7 +29,7 @@ extension UInt8: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self, as: UInt8.self)
     }
@@ -69,7 +69,7 @@ extension Int16: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self, as: Int16.self)
     }
@@ -113,7 +113,7 @@ extension Int32: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self, as: Int32.self)
     }
@@ -162,7 +162,7 @@ extension Int64: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self, as: Int64.self)
     }
@@ -218,7 +218,7 @@ extension Int: PostgresCodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeInteger(self, as: Int.self)
     }
diff --git a/Sources/PostgresNIO/New/Data/JSON+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/JSON+PostgresCodable.swift
@@ -35,7 +35,7 @@ extension PostgresCodable where Self: Codable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         byteBuffer.writeInteger(JSONBVersionByte)
         try context.jsonEncoder.encode(self, into: &byteBuffer)
diff --git a/Sources/PostgresNIO/New/Data/Optional+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/Optional+PostgresCodable.swift
@@ -46,14 +46,14 @@ extension Optional: PostgresEncodable where Wrapped: PostgresEncodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         preconditionFailure("Should never be hit, since `encodeRaw` is implemented.")
     }
     
     func encodeRaw<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         switch self {
         case .none:
diff --git a/Sources/PostgresNIO/New/Data/RawRepresentable+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/RawRepresentable+PostgresCodable.swift
@@ -25,7 +25,7 @@ extension PostgresCodable where Self: RawRepresentable, RawValue: PostgresCodabl
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         try rawValue.encode(into: &byteBuffer, context: context)
     }
diff --git a/Sources/PostgresNIO/New/Data/String+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/String+PostgresCodable.swift
@@ -12,7 +12,7 @@ extension String: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         byteBuffer.writeString(self)
     }
diff --git a/Sources/PostgresNIO/New/Data/UUID+PostgresCodable.swift b/Sources/PostgresNIO/New/Data/UUID+PostgresCodable.swift
@@ -14,7 +14,7 @@ extension UUID: PostgresCodable {
     
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         let uuid = self.uuid
         byteBuffer.writeBytes([
diff --git a/Sources/PostgresNIO/New/PostgresCodable.swift b/Sources/PostgresNIO/New/PostgresCodable.swift
@@ -11,12 +11,12 @@ protocol PostgresEncodable {
     
     /// Encode the entity into the `byteBuffer` in Postgres binary format, without setting
     /// the byte count. This method is called from the default `encodeRaw` implementation.
-    func encode<JSONEncoder: PostgresJSONEncoder>(into byteBuffer: inout ByteBuffer, context: PSQLEncodingContext<JSONEncoder>) throws
+    func encode<JSONEncoder: PostgresJSONEncoder>(into byteBuffer: inout ByteBuffer, context: PostgresEncodingContext<JSONEncoder>) throws
     
     /// Encode the entity into the `byteBuffer` in Postgres binary format including its
     /// leading byte count. This method has a default implementation and may be overriden
     /// only for special cases, like `Optional`s.
-    func encodeRaw<JSONEncoder: PostgresJSONEncoder>(into byteBuffer: inout ByteBuffer, context: PSQLEncodingContext<JSONEncoder>) throws
+    func encodeRaw<JSONEncoder: PostgresJSONEncoder>(into byteBuffer: inout ByteBuffer, context: PostgresEncodingContext<JSONEncoder>) throws
 }
 
 /// A type that can decode itself from a postgres wire binary representation.
@@ -73,7 +73,7 @@ protocol PostgresCodable: PostgresEncodable, PostgresDecodable {}
 extension PostgresEncodable {
     func encodeRaw<JSONEncoder: PostgresJSONEncoder>(
         into buffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         // The length of the parameter value, in bytes (this count does not include
         // itself). Can be zero.
@@ -89,16 +89,16 @@ extension PostgresEncodable {
     }
 }
 
-struct PSQLEncodingContext<JSONEncoder: PostgresJSONEncoder> {
+struct PostgresEncodingContext<JSONEncoder: PostgresJSONEncoder> {
     let jsonEncoder: JSONEncoder
 
     init(jsonEncoder: JSONEncoder) {
         self.jsonEncoder = jsonEncoder
     }
 }
 
-extension PSQLEncodingContext where JSONEncoder == Foundation.JSONEncoder {
-    static let `default` = PSQLEncodingContext(jsonEncoder: JSONEncoder())
+extension PostgresEncodingContext where JSONEncoder == Foundation.JSONEncoder {
+    static let `default` = PostgresEncodingContext(jsonEncoder: JSONEncoder())
 }
 
 struct PostgresDecodingContext<JSONDecoder: PostgresJSONDecoder> {
diff --git a/Sources/PostgresNIO/New/PostgresQuery.swift b/Sources/PostgresNIO/New/PostgresQuery.swift
@@ -25,7 +25,7 @@ extension PostgresQuery: ExpressibleByStringInterpolation {
 
     mutating func appendBinding<Value: PostgresEncodable, JSONEncoder: PostgresJSONEncoder>(
         _ value: Value,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         try self.binds.append(value, context: context)
     }
@@ -59,7 +59,7 @@ extension PostgresQuery {
 
         mutating func appendInterpolation<Value: PostgresEncodable, JSONEncoder: PostgresJSONEncoder>(
             _ value: Value,
-            context: PSQLEncodingContext<JSONEncoder>
+            context: PostgresEncodingContext<JSONEncoder>
         ) throws {
             try self.binds.append(value, context: context)
             self.sql.append(contentsOf: "$\(self.binds.count)")
@@ -112,7 +112,7 @@ struct PostgresBindings: Hashable {
 
     mutating func append<Value: PostgresEncodable, JSONEncoder: PostgresJSONEncoder>(
         _ value: Value,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         try value.encodeRaw(into: &self.bytes, context: context)
         self.metadata.append(.init(value: value))
diff --git a/Sources/PostgresNIO/Postgres+PSQLCompat.swift b/Sources/PostgresNIO/Postgres+PSQLCompat.swift
@@ -11,15 +11,15 @@ extension PostgresData: PostgresEncodable {
 
     func encode<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) throws {
         preconditionFailure("Should never be hit, since `encodeRaw` is implemented.")
     }
     
     // encoding
     func encodeRaw<JSONEncoder: PostgresJSONEncoder>(
         into byteBuffer: inout ByteBuffer,
-        context: PSQLEncodingContext<JSONEncoder>
+        context: PostgresEncodingContext<JSONEncoder>
     ) {
         switch self.value {
         case .none:
diff --git a/Tests/PostgresNIOTests/New/Extensions/PSQLCoding+TestUtils.swift b/Tests/PostgresNIOTests/New/Extensions/PSQLCoding+TestUtils.swift
@@ -7,7 +7,7 @@ extension PostgresDecodingContext where JSONDecoder == Foundation.JSONDecoder {
     }
 }
 
-extension PSQLEncodingContext where JSONEncoder == Foundation.JSONEncoder {
+extension PostgresEncodingContext where JSONEncoder == Foundation.JSONEncoder {
     static func forTests(jsonEncoder: JSONEncoder = JSONEncoder()) -> Self {
         Self(jsonEncoder: jsonEncoder)
     }
diff --git a/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift b/Tests/PostgresNIOTests/New/Messages/DataRowTests.swift
@@ -119,7 +119,7 @@ extension DataRow: ExpressibleByArrayLiteral {
     public init(arrayLiteral elements: PostgresEncodable...) {
         
         var buffer = ByteBuffer()
-        let encodingContext = PSQLEncodingContext(jsonEncoder: JSONEncoder())
+        let encodingContext = PostgresEncodingContext(jsonEncoder: JSONEncoder())
         elements.forEach { element in
             try! element.encodeRaw(into: &buffer, context: encodingContext)
         }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ extension Bool: PostgresCodable {`
`51`	`51`
`52`	`52`	`func encode<JSONEncoder: PostgresJSONEncoder>(`
`53`	`53`	`into byteBuffer: inout ByteBuffer,`
`54`		`- context: PSQLEncodingContext<JSONEncoder>`
	`54`	`+ context: PostgresEncodingContext<JSONEncoder>`
`55`	`55`	`) {`
`56`	`56`	`byteBuffer.writeInteger(self ? 1 : 0, as: UInt8.self)`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extension PostgresCodable where Self: RawRepresentable, RawValue: PostgresCodabl`
`25`	`25`
`26`	`26`	`func encode<JSONEncoder: PostgresJSONEncoder>(`
`27`	`27`	`into byteBuffer: inout ByteBuffer,`
`28`		`- context: PSQLEncodingContext<JSONEncoder>`
	`28`	`+ context: PostgresEncodingContext<JSONEncoder>`
`29`	`29`	`) throws {`
`30`	`30`	`try rawValue.encode(into: &byteBuffer, context: context)`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ extension String: PostgresCodable {`
`12`	`12`
`13`	`13`	`func encode<JSONEncoder: PostgresJSONEncoder>(`
`14`	`14`	`into byteBuffer: inout ByteBuffer,`
`15`		`- context: PSQLEncodingContext<JSONEncoder>`
	`15`	`+ context: PostgresEncodingContext<JSONEncoder>`
`16`	`16`	`) {`
`17`	`17`	`byteBuffer.writeString(self)`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ extension PostgresDecodingContext where JSONDecoder == Foundation.JSONDecoder {`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`		`-extension PSQLEncodingContext where JSONEncoder == Foundation.JSONEncoder {`
	`10`	`+extension PostgresEncodingContext where JSONEncoder == Foundation.JSONEncoder {`
`11`	`11`	`static func forTests(jsonEncoder: JSONEncoder = JSONEncoder()) -> Self {`
`12`	`12`	`Self(jsonEncoder: jsonEncoder)`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ extension DataRow: ExpressibleByArrayLiteral {`
`119`	`119`	`public init(arrayLiteral elements: PostgresEncodable...) {`
`120`	`120`
`121`	`121`	`var buffer = ByteBuffer()`
`122`		`- let encodingContext = PSQLEncodingContext(jsonEncoder: JSONEncoder())`
	`122`	`+ let encodingContext = PostgresEncodingContext(jsonEncoder: JSONEncoder())`
`123`	`123`	`elements.forEach { element in`
`124`	`124`	`try! element.encodeRaw(into: &buffer, context: encodingContext)`
`125`	`125`	`}`