fix(datatype, varbyte): support send and receive hex/text varbyte

Author: Brooke-white

redshift_connector/core.py

@@ -58,7 +58,6 @@
     array_recv_binary,
     array_recv_text,
     bh_unpack,
-    bytea_recv,
     cccc_unpack,
     ci_unpack,
     date_in,
@@ -80,6 +79,7 @@
 from redshift_connector.utils import py_types as PY_TYPES
 from redshift_connector.utils import (
     q_pack,
+    text_recv,
     time_in,
     time_recv_binary,
     timetz_in,
@@ -689,7 +689,7 @@ def _enable_protocol_based_conversion_funcs(self: "Connection"):
             self.pg_types[REAL_ARRAY] = (FC_BINARY, array_recv_binary)  # FLOAT4[]
             self.pg_types[1028] = (FC_BINARY, array_recv_binary)  # OID[]
             self.pg_types[1034] = (FC_BINARY, array_recv_binary)  # ACLITEM[]
-            self.pg_types[VARBYTE] = (FC_TEXT, bytea_recv)  # VARBYTE
+            self.pg_types[VARBYTE] = (FC_TEXT, text_recv)  # VARBYTE
         else:  # text protocol
             self.pg_types[NUMERIC] = (FC_TEXT, numeric_in)
             self.pg_types[TIME] = (FC_TEXT, time_in)

redshift_connector/utils/__init__.py

@@ -16,7 +16,6 @@
     array_recv_binary,
     array_recv_text,
     bh_unpack,
-    bytea_recv,
     cccc_unpack,
     ci_unpack,
     date_in,
@@ -35,6 +34,7 @@
     pg_types,
     py_types,
     q_pack,
+    text_recv,
     time_in,
     time_recv_binary,
     timetz_in,

redshift_connector/utils/type_utils.py

@@ -173,8 +173,8 @@ def float8_recv(data: bytes, offset: int, length: int) -> float:
     return d_unpack(data, offset)[0]
 
 
-# def bytea_send(v: bytearray) -> bytearray:
-#     return v
+def varbyte_send(v: bytearray) -> bytes:
+    return v.hex().encode(_client_encoding)
 
 
 # def uuid_send(v: UUID) -> bytes:
@@ -576,8 +576,8 @@ def geometryhex_recv(data: bytes, idx: int, length: int) -> str:
         return result.hex()
 
 
-def varbytehex_recv(data: bytes, idx: int, length: int) -> bytes:
-    return codecs_decode(data[idx : idx + length], "hex_codec")
+def varbytehex_recv(data: bytes, idx: int, length: int) -> str:
+    return codecs_decode(data[idx : idx + length], "hex_codec").decode(_client_encoding)
 
 
 # def inet_in(data: bytes, offset: int, length: int) -> typing.Union[IPv4Address, IPv6Address, IPv4Network, IPv6Network]:
@@ -696,7 +696,7 @@ def numeric_out(d: Decimal) -> bytes:
     Decimal: (NUMERIC, FC_TEXT, numeric_out),  # Decimal
     PGTsvector: (3614, FC_TEXT, text_out),
     # UUID: (2950, FC_BINARY, uuid_send),  # uuid
-    # bytes: (17, FC_BINARY, bytea_send),  # bytea
+    bytes: (UNKNOWN, FC_TEXT, varbyte_send),  # varbyte
     str: (UNKNOWN, FC_TEXT, text_out),  # unknown
     enum.Enum: (UNKNOWN, FC_TEXT, enum_out),
     # IPv4Address: (869, FC_TEXT, inet_out),  # inet