Add support for byteaarrayoid

duckdb · Dec 22, 2024 · 26b5466 · 26b5466
1 parent 520f456
commit 26b5466
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 0 deletions.
diff --git a/src/pgduckdb_types.cpp b/src/pgduckdb_types.cpp
@@ -517,6 +517,19 @@ struct PostgresTypeTraits<VARCHAROID> {
 	}
 };
 
+// BLOB type
+template <>
+struct PostgresTypeTraits<BYTEAOID> {
+	static constexpr int16_t typlen = -1; // variable-length
+	static constexpr bool typbyval = false;
+	static constexpr char typalign = 'i';
+
+	static inline Datum
+	ToDatum(const duckdb::Value &val) {
+		return ConvertBinaryDatum(val);
+	}
+};
+
 template <int32_t OID>
 struct PostgresOIDMapping {
 	static constexpr int32_t postgres_oid = OID;
@@ -557,6 +570,7 @@ using TimestampArray = PODArray<PostgresOIDMapping<TIMESTAMPOID>>;
 using UUIDArray = PODArray<PostgresOIDMapping<UUIDOID>>;
 using VarCharArray = PODArray<PostgresOIDMapping<VARCHAROID>>;
 using NumericArray = PODArray<PostgresOIDMapping<NUMERICOID>>;
+using ByteArray = PODArray<PostgresOIDMapping<BYTEAOID>>;
 
 static idx_t
 GetDuckDBListDimensionality(const duckdb::LogicalType &list_type, idx_t depth = 0) {
@@ -800,6 +814,10 @@ ConvertDuckToPostgresValue(TupleTableSlot *slot, duckdb::Value &value, idx_t col
 		ConvertDuckToPostgresArray<UUIDArray>(slot, value, col);
 		break;
 	}
+	case BYTEAARRAYOID: {
+		ConvertDuckToPostgresArray<ByteArray>(slot, value, col);
+		break;
+	}
 	default:
 		elog(WARNING, "(PGDuckDB/ConvertDuckToPostgresValue) Unsuported pgduckdb type: %d", oid);
 		return false;
@@ -883,6 +901,7 @@ ConvertPostgresToBaseDuckColumnType(Form_pg_attribute &attribute) {
 	case REGCLASSARRAYOID:
 		return duckdb::LogicalTypeId::UINTEGER;
 	case BYTEAOID:
+	case BYTEAARRAYOID:
 		return duckdb::LogicalTypeId::BLOB;
 	default:
 		return duckdb::LogicalType::USER("UnsupportedPostgresType (Oid=" + std::to_string(attribute->atttypid) + ")");
@@ -938,6 +957,8 @@ GetPostgresArrayDuckDBType(const duckdb::LogicalType &type) {
 		return NUMERICARRAYOID;
 	case duckdb::LogicalTypeId::UUID:
 		return UUIDARRAYOID;
+	case duckdb::LogicalTypeId::BLOB:
+		return BYTEAARRAYOID;
 	default: {
 		elog(WARNING, "(PGDuckDB/GetPostgresDuckDBType) Unsupported `LIST` subtype %d to Postgres type",
 		     static_cast<uint8_t>(type.id()));

diff --git a/test/regression/expected/array_type_support.out b/test/regression/expected/array_type_support.out
@@ -318,6 +318,19 @@ SELECT * FROM varchar_array_2d;
  {{some,strings},{NULL,last}}
 (5 rows)
 
+-- BYTEA (single dimension)
+CREATE TABLE bytea_array_1d (a bytea[]);
+INSERT INTO bytea_array_1d (a) 
+VALUES 
+    (ARRAY[decode('01020304', 'hex'), decode('aabbccdd', 'hex')]),
+    (ARRAY[decode('11223344', 'hex'), decode('55667788', 'hex')]);
+SELECT * FROM bytea_array_1d;
+                                       a                                       
+-------------------------------------------------------------------------------
+ {"\\x5c7830315c7830325c7830335c783034","\\x5c7841415c7842425c7843435c784444"}
+ {"\\x5c7831315c7832323344","\\x5566775c783838"}
+(2 rows)
+
 -- TIMESTAMP (two dimensions)
 CREATE TABLE timestamp_array_2d(a TIMESTAMP[][]);
 INSERT INTO timestamp_array_2d VALUES

diff --git a/test/regression/sql/array_type_support.sql b/test/regression/sql/array_type_support.sql
@@ -195,6 +195,15 @@ INSERT INTO varchar_array_2d VALUES
     ('{{"some","strings"},{NULL,"last"}}');
 SELECT * FROM varchar_array_2d;
 
+-- BYTEA (single dimension)
+CREATE TABLE bytea_array_1d (a bytea[]);
+
+INSERT INTO bytea_array_1d (a) 
+VALUES 
+    (ARRAY[decode('01020304', 'hex'), decode('aabbccdd', 'hex')]),
+    (ARRAY[decode('11223344', 'hex'), decode('55667788', 'hex')]);
+SELECT * FROM bytea_array_1d;
+
 -- TIMESTAMP (two dimensions)
 CREATE TABLE timestamp_array_2d(a TIMESTAMP[][]);
 INSERT INTO timestamp_array_2d VALUES