Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.

Commit b60cc9b

Browse files
committed
Update to postgres 0.15
1 parent d94511d commit b60cc9b

File tree

5 files changed

+20
-41
lines changed

5 files changed

+20
-41
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ syn = "0.11"
1717
quote = "0.3"
1818

1919
[dev-dependencies]
20-
postgres = "0.14"
20+
postgres = "0.15.1"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
Syntax extensions to automatically derive `FromSql` and `ToSql` implementations for Postgres enum,
66
domain, and composite types.
77

8-
The generated code requires rust-postgres 0.14 and Rust 1.15.0 or higher.
8+
The generated code requires rust-postgres 0.14 or 0.15 and Rust 1.15.0 or higher.
99

1010
# Usage
1111

tests/composites.rs

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ extern crate postgres_derive;
44
extern crate postgres;
55

66
use postgres::{Connection, TlsMode};
7-
use postgres::error::Error;
87
use postgres::types::WrongType;
98

109
mod util;
@@ -101,10 +100,8 @@ fn wrong_name() {
101100
price: Some(15.50),
102101
};
103102

104-
match conn.execute("SELECT $1::inventory_item", &[&item]) {
105-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
106-
v => panic!("unexpected response {:?}", v),
107-
}
103+
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
104+
assert!(err.as_conversion().unwrap().is::<WrongType>());
108105
}
109106

110107
#[test]
@@ -132,10 +129,8 @@ fn extra_field() {
132129
foo: 0,
133130
};
134131

135-
match conn.execute("SELECT $1::inventory_item", &[&item]) {
136-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
137-
v => panic!("unexpected response {:?}", v),
138-
}
132+
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
133+
assert!(err.as_conversion().unwrap().is::<WrongType>());
139134
}
140135

141136
#[test]
@@ -159,10 +154,8 @@ fn missing_field() {
159154
supplier_id: 100,
160155
};
161156

162-
match conn.execute("SELECT $1::inventory_item", &[&item]) {
163-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
164-
v => panic!("unexpected response {:?}", v),
165-
}
157+
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
158+
assert!(err.as_conversion().unwrap().is::<WrongType>());
166159
}
167160

168161
#[test]
@@ -188,8 +181,6 @@ fn wrong_type() {
188181
price: 0,
189182
};
190183

191-
match conn.execute("SELECT $1::inventory_item", &[&item]) {
192-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
193-
v => panic!("unexpected response {:?}", v),
194-
}
184+
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
185+
assert!(err.as_conversion().unwrap().is::<WrongType>());
195186
}

tests/domains.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ extern crate postgres_derive;
44
extern crate postgres;
55

66
use postgres::{Connection, TlsMode};
7-
use postgres::error::Error;
87
use postgres::types::WrongType;
98

109
mod util;
@@ -46,10 +45,8 @@ fn wrong_name() {
4645
conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
4746
.unwrap();
4847

49-
match conn.execute("SELECT $1::session_id", &[&SessionId(vec![])]) {
50-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
51-
v => panic!("unexpected response {:?}", v),
52-
}
48+
let err = conn.execute("SELECT $1::session_id", &[&SessionId(vec![])]).unwrap_err();
49+
assert!(err.as_conversion().unwrap().is::<WrongType>());
5350
}
5451

5552
#[test]
@@ -62,8 +59,6 @@ fn wrong_type() {
6259
conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
6360
.unwrap();
6461

65-
match conn.execute("SELECT $1::session_id", &[&SessionId(0)]) {
66-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
67-
v => panic!("unexpected response {:?}", v),
68-
}
62+
let err = conn.execute("SELECT $1::session_id", &[&SessionId(0)]).unwrap_err();
63+
assert!(err.as_conversion().unwrap().is::<WrongType>());
6964
}

tests/enums.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ extern crate postgres_derive;
44
extern crate postgres;
55

66
use postgres::{Connection, TlsMode};
7-
use postgres::error::Error;
87
use postgres::types::WrongType;
98

109
mod util;
@@ -55,10 +54,8 @@ fn wrong_name() {
5554
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
5655
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
5756

58-
match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
59-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
60-
v => panic!("unexpected response {:?}", v),
61-
}
57+
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
58+
assert!(err.as_conversion().unwrap().is::<WrongType>());
6259
}
6360

6461
#[test]
@@ -74,10 +71,8 @@ fn extra_variant() {
7471
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
7572
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
7673

77-
match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
78-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
79-
v => panic!("unexpected response {:?}", v),
80-
}
74+
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
75+
assert!(err.as_conversion().unwrap().is::<WrongType>());
8176
}
8277

8378
#[test]
@@ -91,8 +86,6 @@ fn missing_variant() {
9186
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
9287
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
9388

94-
match conn.execute("SELECT $1::foo", &[&Foo::Bar]) {
95-
Err(Error::Conversion(ref r)) if r.is::<WrongType>() => {}
96-
v => panic!("unexpected response {:?}", v),
97-
}
89+
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
90+
assert!(err.as_conversion().unwrap().is::<WrongType>());
9891
}

0 commit comments

Comments
 (0)