mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 03:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sql) fix binary detection + fix custom types (#17635)

Browse Source
This commit is contained in:
Ciro Spaciari
2025-02-24 20:07:16 -08:00
committed by GitHub
parent 211824bb3e
commit 09ab840114
5 changed files with 173 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/sql/postgres/postgres_protocol.zig
View File

@@ -923,19 +923,6 @@ pub const ReadyForQuery = struct {
pub const decode = decoderWrap(ReadyForQuery, decodeInternal).decode;
};
pub const FormatCode = enum {
text,
binary,
pub fn from(value: short) !FormatCode {
return switch (value) {
0 => .text,
1 => .binary,
else => error.UnknownFormatCode,
};
}
};
pub const null_int4 = 4294967295;
pub const DataRow = struct {
@@ -1010,7 +997,7 @@ pub const FieldDescription = struct {
table_oid: int4 = 0,
column_index: short = 0,
type_oid: int4 = 0,
binary: bool = false,
pub fn typeTag(this: @This()) types.Tag {
return @enumFromInt(@as(short, @truncate(this.type_oid)));
}
@@ -1024,25 +1011,39 @@ pub const FieldDescription = struct {
errdefer {
name.deinit();
}
// If the field can be identified as a column of a specific table, the object ID of the table; otherwise zero.
// Int16
// If the field can be identified as a column of a specific table, the attribute number of the column; otherwise zero.
// Int32
// The object ID of the field's data type.
// Int16
// The data type size (see pg_type.typlen). Note that negative values denote variable-width types.
// Int32
// The type modifier (see pg_attribute.atttypmod). The meaning of the modifier is type-specific.
// Int16
// The format code being used for the field. Currently will be zero (text) or one (binary). In a RowDescription returned from the statement variant of Describe, the format code is not yet known and will always be zero.
this.* = .{
.table_oid = try reader.int4(),
.column_index = try reader.short(),
.type_oid = try reader.int4(),
.name_or_index = try ColumnIdentifier.init(name),
};
try reader.skip(2 + 4 + 2);
// Field name (null-terminated string)
const field_name = try ColumnIdentifier.init(name);
// Table OID (4 bytes)
// If the field can be identified as a column of a specific table, the object ID of the table; otherwise zero.
const table_oid = try reader.int4();
// Column attribute number (2 bytes)
// If the field can be identified as a column of a specific table, the attribute number of the column; otherwise zero.
const column_index = try reader.short();
// Data type OID (4 bytes)
// The object ID of the field's data type. The type modifier (see pg_attribute.atttypmod). The meaning of the modifier is type-specific.
const type_oid = try reader.int4();
// Data type size (2 bytes) The data type size (see pg_type.typlen). Note that negative values denote variable-width types.
// Type modifier (4 bytes) The type modifier (see pg_attribute.atttypmod). The meaning of the modifier is type-specific.
try reader.skip(6);
// Format code (2 bytes)
// The format code being used for the field. Currently will be zero (text) or one (binary). In a RowDescription returned from the statement variant of Describe, the format code is not yet known and will always be zero.
const binary = switch (try reader.short()) {
0 => false,
1 => true,
else => return error.UnknownFormatCode,
};
this.* = .{
.table_oid = table_oid,
.column_index = column_index,
.type_oid = type_oid,
.binary = binary,
.name_or_index = field_name,
};
}
pub const decode = decoderWrap(FieldDescription, decodeInternal).decode;