Skip to content

Commit 85ad9f3

Browse files
committed
Update to postgres 0.12
1 parent 3753759 commit 85ad9f3

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ readme = "README.md"
1010
keywords = ["database", "sql", "postgres"]
1111

1212
[dependencies]
13-
postgres = "0.11"
13+
postgres = "0.12"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ extern crate postgres_large_object;
1515
use std::fs::File;
1616
use std::io;
1717

18-
use postgres::{Connection, SslMode};
18+
use postgres::{Connection, TlsMode};
1919
use postgres_large_object::{LargeObjectExt, LargeObjectTransactionExt, Mode};
2020

2121
fn main() {
22-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
22+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
2323

2424
let mut file = File::open("vacation_photos.tar.gz").unwrap();
2525
let trans = conn.transaction().unwrap();

src/lib.rs

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
//! use std::fs::File;
1010
//! use std::io;
1111
//!
12-
//! use postgres::{Connection, SslMode};
12+
//! use postgres::{Connection, TlsMode};
1313
//! use postgres_large_object::{LargeObjectExt, LargeObjectTransactionExt, Mode};
1414
//!
1515
//! fn main() {
16-
//! let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
16+
//! let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
1717
//!
1818
//! let mut file = File::open("vacation_photos.tar.gz").unwrap();
1919
//! let trans = conn.transaction().unwrap();
@@ -34,7 +34,8 @@
3434

3535
extern crate postgres;
3636

37-
use postgres::{Result, Transaction, GenericConnection};
37+
use postgres::{Result, GenericConnection};
38+
use postgres::transaction::Transaction;
3839
use postgres::error::Error;
3940
use postgres::types::Oid;
4041
use std::cmp;
@@ -252,21 +253,21 @@ impl<'a> io::Seek for LargeObject<'a> {
252253

253254
#[cfg(test)]
254255
mod test {
255-
use postgres::{Connection, SslMode};
256+
use postgres::{Connection, TlsMode};
256257
use postgres::error::{Error, SqlState};
257258

258259
use {LargeObjectExt, LargeObjectTransactionExt, Mode};
259260

260261
#[test]
261262
fn test_create_delete() {
262-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
263+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
263264
let oid = conn.create_large_object().unwrap();
264265
conn.delete_large_object(oid).unwrap();
265266
}
266267

267268
#[test]
268269
fn test_delete_bogus() {
269-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
270+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
270271
match conn.delete_large_object(0) {
271272
Ok(()) => panic!("unexpected success"),
272273
Err(Error::Db(ref e)) if e.code == SqlState::UndefinedObject => {}
@@ -276,7 +277,7 @@ mod test {
276277

277278
#[test]
278279
fn test_open_bogus() {
279-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
280+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
280281
let trans = conn.transaction().unwrap();
281282
match trans.open_large_object(0, Mode::Read) {
282283
Ok(_) => panic!("unexpected success"),
@@ -287,7 +288,7 @@ mod test {
287288

288289
#[test]
289290
fn test_open_finish() {
290-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
291+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
291292
let trans = conn.transaction().unwrap();
292293
let oid = trans.create_large_object().unwrap();
293294
let lo = trans.open_large_object(oid, Mode::Read).unwrap();
@@ -298,7 +299,7 @@ mod test {
298299
fn test_write_read() {
299300
use std::io::{Write, Read};
300301

301-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
302+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
302303
let trans = conn.transaction().unwrap();
303304
let oid = trans.create_large_object().unwrap();
304305
let mut lo = trans.open_large_object(oid, Mode::Write).unwrap();
@@ -313,7 +314,7 @@ mod test {
313314
fn test_seek_tell() {
314315
use std::io::{Write, Read, Seek, SeekFrom};
315316

316-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
317+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
317318
let trans = conn.transaction().unwrap();
318319
let oid = trans.create_large_object().unwrap();
319320
let mut lo = trans.open_large_object(oid, Mode::Write).unwrap();
@@ -337,7 +338,7 @@ mod test {
337338
fn test_write_with_read_fd() {
338339
use std::io::Write;
339340

340-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
341+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
341342
let trans = conn.transaction().unwrap();
342343
let oid = trans.create_large_object().unwrap();
343344
let mut lo = trans.open_large_object(oid, Mode::Read).unwrap();
@@ -348,7 +349,7 @@ mod test {
348349
fn test_truncate() {
349350
use std::io::{Seek, SeekFrom, Write, Read};
350351

351-
let conn = Connection::connect("postgres://postgres@localhost", SslMode::None).unwrap();
352+
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
352353
let trans = conn.transaction().unwrap();
353354
let oid = trans.create_large_object().unwrap();
354355
let mut lo = trans.open_large_object(oid, Mode::Write).unwrap();

0 commit comments

Comments
 (0)