From 455dea3bd05f3b4b74f1777c7d3f87e3319cc5b7 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Thu, 14 Aug 2014 20:22:12 -0700 Subject: [PATCH] Force all result formats to binary --- src/lib.rs | 6 ++---- src/types/mod.rs | 10 ---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 7817d23e..63f37378 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -140,7 +140,7 @@ use message::{Bind, Sync, Terminate}; use message::{WriteMessage, ReadMessage}; -use types::{Oid, PostgresType, ToSql, FromSql, PgUnknownType}; +use types::{Oid, PostgresType, ToSql, FromSql, PgUnknownType, Binary}; #[macro_escape] mod macros; @@ -1118,9 +1118,7 @@ impl<'conn> PostgresStatement<'conn> { values.push(value); }; - let result_formats: Vec = self.result_desc.iter().map(|desc| { - desc.ty.result_format() as i16 - }).collect(); + let result_formats = Vec::from_elem(self.result_desc.len(), Binary as i16); try_pg!(self.conn.write_messages([ Bind { diff --git a/src/types/mod.rs b/src/types/mod.rs index d374d7ae..115ff73f 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -115,16 +115,6 @@ macro_rules! make_postgres_type( _ => unreachable!() } } - - /// Returns the wire format needed for the value of `self`. - pub fn result_format(&self) -> Format { - match *self { - PgUnknownType { name: ref name, .. } - if "hstore" == name.as_slice() => Binary, - PgUnknownType { .. } => Text, - _ => Binary - } - } } ) )