Skip to content

Commit 371f06e

Browse files
committed
Release v0.7.1
1 parent 816fd46 commit 371f06e

File tree

2 files changed

+24
-33
lines changed

2 files changed

+24
-33
lines changed

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
[package]
22
name = "postgres_large_object"
3-
version = "0.7.0"
3+
version = "0.7.1"
44
authors = ["Steven Fackler <[email protected]>"]
55
license = "MIT/Apache-2.0"
66
description = "Large object support for rust-postgres"
77
repository = "https://github.com/sfackler/rust-postgres-large-object"
8-
documentation = "https://docs.rs/postgres_large_object/0.7.0/postgres_large_object"
98
readme = "README.md"
109
keywords = ["database", "sql", "postgres"]
1110

src/lib.rs

+23-31
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
//! io::copy(&mut large_object, &mut file).unwrap();
3131
//! }
3232
//! ```
33-
#![doc(html_root_url="https://docs.rs/postgres_large_object/0.7.0")]
33+
#![doc(html_root_url = "https://docs.rs/postgres_large_object/0.7")]
3434

3535
extern crate postgres;
3636

37-
use postgres::{Result, GenericConnection};
37+
use postgres::{GenericConnection, Result};
3838
use postgres::transaction::Transaction;
3939
use postgres::types::Oid;
4040
use std::cmp;
@@ -150,25 +150,21 @@ impl<'a> LargeObject<'a> {
150150
/// null bytes to the specified size.
151151
pub fn truncate(&mut self, len: i64) -> Result<()> {
152152
if self.has_64 {
153-
let stmt = self.trans.prepare_cached(
154-
"SELECT pg_catalog.lo_truncate64($1, $2)",
155-
)?;
153+
let stmt = self.trans
154+
.prepare_cached("SELECT pg_catalog.lo_truncate64($1, $2)")?;
156155
stmt.execute(&[&self.fd, &len]).map(|_| ())
157156
} else {
158157
let len = if len <= i32::max_value() as i64 {
159158
len as i32
160159
} else {
161-
return Err(
162-
io::Error::new(
163-
io::ErrorKind::InvalidInput,
164-
"The database does not support objects larger \
165-
than 2GB",
166-
).into(),
167-
);
160+
return Err(io::Error::new(
161+
io::ErrorKind::InvalidInput,
162+
"The database does not support objects larger \
163+
than 2GB",
164+
).into());
168165
};
169-
let stmt = self.trans.prepare_cached(
170-
"SELECT pg_catalog.lo_truncate($1, $2)",
171-
)?;
166+
let stmt = self.trans
167+
.prepare_cached("SELECT pg_catalog.lo_truncate($1, $2)")?;
172168
stmt.execute(&[&self.fd, &len]).map(|_| ())
173169
}
174170
}
@@ -194,9 +190,8 @@ impl<'a> LargeObject<'a> {
194190

195191
impl<'a> io::Read for LargeObject<'a> {
196192
fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
197-
let stmt = self.trans.prepare_cached(
198-
"SELECT pg_catalog.loread($1, $2)",
199-
)?;
193+
let stmt = self.trans
194+
.prepare_cached("SELECT pg_catalog.loread($1, $2)")?;
200195
let cap = cmp::min(buf.len(), i32::MAX as usize) as i32;
201196
let rows = stmt.query(&[&self.fd, &cap])?;
202197
buf.write(rows.get(0).get_bytes(0).unwrap())
@@ -205,9 +200,8 @@ impl<'a> io::Read for LargeObject<'a> {
205200

206201
impl<'a> io::Write for LargeObject<'a> {
207202
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
208-
let stmt = self.trans.prepare_cached(
209-
"SELECT pg_catalog.lowrite($1, $2)",
210-
)?;
203+
let stmt = self.trans
204+
.prepare_cached("SELECT pg_catalog.lowrite($1, $2)")?;
211205
let cap = cmp::min(buf.len(), i32::MAX as usize);
212206
stmt.execute(&[&self.fd, &&buf[..cap]])?;
213207
Ok(cap)
@@ -237,9 +231,8 @@ impl<'a> io::Seek for LargeObject<'a> {
237231
};
238232

239233
if self.has_64 {
240-
let stmt = self.trans.prepare_cached(
241-
"SELECT pg_catalog.lo_lseek64($1, $2, $3)",
242-
)?;
234+
let stmt = self.trans
235+
.prepare_cached("SELECT pg_catalog.lo_lseek64($1, $2, $3)")?;
243236
let rows = stmt.query(&[&self.fd, &pos, &kind])?;
244237
let pos: i64 = rows.iter().next().unwrap().get(0);
245238
Ok(pos as u64)
@@ -252,9 +245,8 @@ impl<'a> io::Seek for LargeObject<'a> {
252245
"cannot seek more than 2^31 bytes",
253246
));
254247
};
255-
let stmt = self.trans.prepare_cached(
256-
"SELECT pg_catalog.lo_lseek($1, $2, $3)",
257-
)?;
248+
let stmt = self.trans
249+
.prepare_cached("SELECT pg_catalog.lo_lseek($1, $2, $3)")?;
258250
let rows = stmt.query(&[&self.fd, &pos, &kind])?;
259251
let pos: i32 = rows.iter().next().unwrap().get(0);
260252
Ok(pos as u64)
@@ -275,7 +267,7 @@ mod test {
275267
use postgres::{Connection, TlsMode};
276268
use postgres::error::UNDEFINED_OBJECT;
277269

278-
use {LargeObjectExt, LargeObjectTransactionExt, Mode, parse_version};
270+
use {parse_version, LargeObjectExt, LargeObjectTransactionExt, Mode};
279271

280272
#[test]
281273
fn test_create_delete() {
@@ -316,7 +308,7 @@ mod test {
316308

317309
#[test]
318310
fn test_write_read() {
319-
use std::io::{Write, Read};
311+
use std::io::{Read, Write};
320312

321313
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
322314
let trans = conn.transaction().unwrap();
@@ -331,7 +323,7 @@ mod test {
331323

332324
#[test]
333325
fn test_seek_tell() {
334-
use std::io::{Write, Read, Seek, SeekFrom};
326+
use std::io::{Read, Seek, SeekFrom, Write};
335327

336328
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
337329
let trans = conn.transaction().unwrap();
@@ -366,7 +358,7 @@ mod test {
366358

367359
#[test]
368360
fn test_truncate() {
369-
use std::io::{Seek, SeekFrom, Write, Read};
361+
use std::io::{Read, Seek, SeekFrom, Write};
370362

371363
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
372364
let trans = conn.transaction().unwrap();

0 commit comments

Comments
 (0)