Skip to content

Commit 6bb957f

Browse files
committed
Make Oid unsigned
Closes rust-postgres#26
1 parent 6222c6a commit 6bb957f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

message.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ fn read_parameter_description(buf: &mut MemReader) -> BackendMessage {
345345
let mut types = vec::with_capacity(len);
346346

347347
for _ in range(0, len) {
348-
types.push(buf.read_be_i32());
348+
types.push(buf.read_be_u32());
349349
}
350350

351351
ParameterDescription { types: types }
@@ -358,9 +358,9 @@ fn read_row_description(buf: &mut MemReader) -> BackendMessage {
358358
for _ in range(0, len) {
359359
types.push(RowDescriptionEntry {
360360
name: buf.read_cstr(),
361-
table_oid: buf.read_be_i32(),
361+
table_oid: buf.read_be_u32(),
362362
column_id: buf.read_be_i16(),
363-
type_oid: buf.read_be_i32(),
363+
type_oid: buf.read_be_u32(),
364364
type_size: buf.read_be_i16(),
365365
type_modifier: buf.read_be_i32(),
366366
format: buf.read_be_i16()

types/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub mod array;
2121
pub mod range;
2222

2323
/// A Postgres OID
24-
pub type Oid = i32;
24+
pub type Oid = u32;
2525

2626
// Values from pg_type.h
2727
static BOOLOID: Oid = 16;
@@ -404,7 +404,7 @@ macro_rules! from_array_impl(
404404

405405
let ndim = rdr.read_be_i32() as uint;
406406
let _has_null = rdr.read_be_i32() == 1;
407-
let _element_type: Oid = rdr.read_be_i32();
407+
let _element_type: Oid = rdr.read_be_u32();
408408

409409
let mut dim_info = vec::with_capacity(ndim);
410410
for _ in range(0, ndim) {
@@ -685,7 +685,7 @@ macro_rules! to_array_impl(
685685
686686
buf.write_be_i32(self.dimension_info().len() as i32);
687687
buf.write_be_i32(1);
688-
buf.write_be_i32(ty.member_type().to_oid());
688+
buf.write_be_u32(ty.member_type().to_oid());
689689
690690
for info in self.dimension_info().iter() {
691691
buf.write_be_i32(info.len as i32);

0 commit comments

Comments
 (0)