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

Commit bbc6bb3

Browse files
sfacklersfackler
committed
rustfmt
1 parent 25bbe6d commit bbc6bb3

File tree

4 files changed

+148
-62
lines changed

4 files changed

+148
-62
lines changed

‎tests/composites.rs

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ fn defaults() {
1717
price: Option<f64>,
1818
}
1919

20-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
21-
conn.batch_execute("CREATE TYPE pg_temp.\"InventoryItem\" AS (
20+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
21+
.unwrap();
22+
conn.batch_execute(
23+
"CREATE TYPE pg_temp.\"InventoryItem\" AS (
2224
name TEXT,
2325
supplier_id INT,
2426
price DOUBLE PRECISION
25-
);").unwrap();
27+
);",
28+
).unwrap();
2629

2730
let item = InventoryItem {
2831
name: "foobar".to_owned(),
@@ -36,9 +39,14 @@ fn defaults() {
3639
price: None,
3740
};
3841

39-
util::test_type(&conn, "\"InventoryItem\"",
40-
&[(item, "ROW('foobar', 100, 15.50)"),
41-
(item_null, "ROW('foobar', 100, NULL)")]);
42+
util::test_type(
43+
&conn,
44+
"\"InventoryItem\"",
45+
&[
46+
(item, "ROW('foobar', 100, 15.50)"),
47+
(item_null, "ROW('foobar', 100, NULL)"),
48+
],
49+
);
4250
}
4351

4452
#[test]
@@ -54,12 +62,15 @@ fn name_overrides() {
5462
_price: Option<f64>,
5563
}
5664

57-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
58-
conn.batch_execute("CREATE TYPE pg_temp.inventory_item AS (
65+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
66+
.unwrap();
67+
conn.batch_execute(
68+
"CREATE TYPE pg_temp.inventory_item AS (
5969
name TEXT,
6070
supplier_id INT,
6171
price DOUBLE PRECISION
62-
);").unwrap();
72+
);",
73+
).unwrap();
6374

6475
let item = InventoryItem {
6576
_name: "foobar".to_owned(),
@@ -73,9 +84,14 @@ fn name_overrides() {
7384
_price: None,
7485
};
7586

76-
util::test_type(&conn, "inventory_item",
77-
&[(item, "ROW('foobar', 100, 15.50)"),
78-
(item_null, "ROW('foobar', 100, NULL)")]);
87+
util::test_type(
88+
&conn,
89+
"inventory_item",
90+
&[
91+
(item, "ROW('foobar', 100, 15.50)"),
92+
(item_null, "ROW('foobar', 100, NULL)"),
93+
],
94+
);
7995
}
8096

8197
#[test]
@@ -87,20 +103,24 @@ fn wrong_name() {
87103
price: Option<f64>,
88104
}
89105

90-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
91-
conn.batch_execute("CREATE TYPE pg_temp.inventory_item AS (
106+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
107+
.unwrap();
108+
conn.batch_execute(
109+
"CREATE TYPE pg_temp.inventory_item AS (
92110
name TEXT,
93111
supplier_id INT,
94112
price DOUBLE PRECISION
95-
);").unwrap();
113+
);",
114+
).unwrap();
96115

97116
let item = InventoryItem {
98117
name: "foobar".to_owned(),
99118
supplier_id: 100,
100119
price: Some(15.50),
101120
};
102121

103-
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
122+
let err = conn.execute("SELECT $1::inventory_item", &[&item])
123+
.unwrap_err();
104124
assert!(err.as_conversion().unwrap().is::<WrongType>());
105125
}
106126

@@ -115,12 +135,15 @@ fn extra_field() {
115135
foo: i32,
116136
}
117137

118-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
119-
conn.batch_execute("CREATE TYPE pg_temp.inventory_item AS (
138+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
139+
.unwrap();
140+
conn.batch_execute(
141+
"CREATE TYPE pg_temp.inventory_item AS (
120142
name TEXT,
121143
supplier_id INT,
122144
price DOUBLE PRECISION
123-
);").unwrap();
145+
);",
146+
).unwrap();
124147

125148
let item = InventoryItem {
126149
name: "foobar".to_owned(),
@@ -129,7 +152,8 @@ fn extra_field() {
129152
foo: 0,
130153
};
131154

132-
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
155+
let err = conn.execute("SELECT $1::inventory_item", &[&item])
156+
.unwrap_err();
133157
assert!(err.as_conversion().unwrap().is::<WrongType>());
134158
}
135159

@@ -142,19 +166,23 @@ fn missing_field() {
142166
supplier_id: i32,
143167
}
144168

145-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
146-
conn.batch_execute("CREATE TYPE pg_temp.inventory_item AS (
169+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
170+
.unwrap();
171+
conn.batch_execute(
172+
"CREATE TYPE pg_temp.inventory_item AS (
147173
name TEXT,
148174
supplier_id INT,
149175
price DOUBLE PRECISION
150-
);").unwrap();
176+
);",
177+
).unwrap();
151178

152179
let item = InventoryItem {
153180
name: "foobar".to_owned(),
154181
supplier_id: 100,
155182
};
156183

157-
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
184+
let err = conn.execute("SELECT $1::inventory_item", &[&item])
185+
.unwrap_err();
158186
assert!(err.as_conversion().unwrap().is::<WrongType>());
159187
}
160188

@@ -168,19 +196,23 @@ fn wrong_type() {
168196
price: i32,
169197
}
170198

171-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
172-
conn.batch_execute("CREATE TYPE pg_temp.inventory_item AS (
199+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
200+
.unwrap();
201+
conn.batch_execute(
202+
"CREATE TYPE pg_temp.inventory_item AS (
173203
name TEXT,
174204
supplier_id INT,
175205
price DOUBLE PRECISION
176-
);").unwrap();
206+
);",
207+
).unwrap();
177208

178209
let item = InventoryItem {
179210
name: "foobar".to_owned(),
180211
supplier_id: 100,
181212
price: 0,
182213
};
183214

184-
let err = conn.execute("SELECT $1::inventory_item", &[&item]).unwrap_err();
215+
let err = conn.execute("SELECT $1::inventory_item", &[&item])
216+
.unwrap_err();
185217
assert!(err.as_conversion().unwrap().is::<WrongType>());
186218
}

‎tests/domains.rs

Lines changed: 44 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,23 @@ fn defaults() {
1313
#[derive(FromSql, ToSql, Debug, PartialEq)]
1414
struct SessionId(Vec<u8>);
1515

16-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
17-
conn.execute("CREATE DOMAIN pg_temp.\"SessionId\" AS bytea CHECK(octet_length(VALUE) = 16);",
18-
&[])
16+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
1917
.unwrap();
18+
conn.execute(
19+
"CREATE DOMAIN pg_temp.\"SessionId\" AS bytea CHECK(octet_length(VALUE) = 16);",
20+
&[],
21+
).unwrap();
2022

21-
util::test_type(&conn, "\"SessionId\"", &[(SessionId(b"0123456789abcdef".to_vec()),
22-
"'0123456789abcdef'")]);
23+
util::test_type(
24+
&conn,
25+
"\"SessionId\"",
26+
&[
27+
(
28+
SessionId(b"0123456789abcdef".to_vec()),
29+
"'0123456789abcdef'",
30+
),
31+
],
32+
);
2333
}
2434

2535
#[test]
@@ -28,24 +38,39 @@ fn name_overrides() {
2838
#[postgres(name = "session_id")]
2939
struct SessionId(Vec<u8>);
3040

31-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
32-
conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
41+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
3342
.unwrap();
43+
conn.execute(
44+
"CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);",
45+
&[],
46+
).unwrap();
3447

35-
util::test_type(&conn, "session_id", &[(SessionId(b"0123456789abcdef".to_vec()),
36-
"'0123456789abcdef'")]);
48+
util::test_type(
49+
&conn,
50+
"session_id",
51+
&[
52+
(
53+
SessionId(b"0123456789abcdef".to_vec()),
54+
"'0123456789abcdef'",
55+
),
56+
],
57+
);
3758
}
3859

3960
#[test]
4061
fn wrong_name() {
4162
#[derive(FromSql, ToSql, Debug, PartialEq)]
4263
struct SessionId(Vec<u8>);
4364

44-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
45-
conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
65+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
4666
.unwrap();
67+
conn.execute(
68+
"CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);",
69+
&[],
70+
).unwrap();
4771

48-
let err = conn.execute("SELECT $1::session_id", &[&SessionId(vec![])]).unwrap_err();
72+
let err = conn.execute("SELECT $1::session_id", &[&SessionId(vec![])])
73+
.unwrap_err();
4974
assert!(err.as_conversion().unwrap().is::<WrongType>());
5075
}
5176

@@ -55,10 +80,14 @@ fn wrong_type() {
5580
#[postgres(name = "session_id")]
5681
struct SessionId(i32);
5782

58-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
59-
conn.execute("CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);", &[])
83+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
6084
.unwrap();
85+
conn.execute(
86+
"CREATE DOMAIN pg_temp.session_id AS bytea CHECK(octet_length(VALUE) = 16);",
87+
&[],
88+
).unwrap();
6189

62-
let err = conn.execute("SELECT $1::session_id", &[&SessionId(0)]).unwrap_err();
90+
let err = conn.execute("SELECT $1::session_id", &[&SessionId(0)])
91+
.unwrap_err();
6392
assert!(err.as_conversion().unwrap().is::<WrongType>());
6493
}

‎tests/enums.rs

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ fn defaults() {
1313
#[derive(Debug, ToSql, FromSql, PartialEq)]
1414
enum Foo {
1515
Bar,
16-
Baz
16+
Baz,
1717
}
1818

19-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
20-
conn.execute("CREATE TYPE pg_temp.\"Foo\" AS ENUM ('Bar', 'Baz')", &[]).unwrap();
19+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
20+
.unwrap();
21+
conn.execute("CREATE TYPE pg_temp.\"Foo\" AS ENUM ('Bar', 'Baz')", &[])
22+
.unwrap();
2123

22-
util::test_type(&conn, "\"Foo\"", &[(Foo::Bar, "'Bar'"), (Foo::Baz, "'Baz'")]);
24+
util::test_type(
25+
&conn,
26+
"\"Foo\"",
27+
&[(Foo::Bar, "'Bar'"), (Foo::Baz, "'Baz'")],
28+
);
2329
}
2430

2531
#[test]
@@ -35,24 +41,36 @@ fn name_overrides() {
3541
Happy,
3642
}
3743

38-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
39-
conn.execute("CREATE TYPE pg_temp.mood AS ENUM ('sad', 'ok', 'happy')", &[]).unwrap();
40-
41-
util::test_type(&conn,
42-
"mood",
43-
&[(Mood::Sad, "'sad'"), (Mood::Ok, "'ok'"), (Mood::Happy, "'happy'")]);
44+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
45+
.unwrap();
46+
conn.execute(
47+
"CREATE TYPE pg_temp.mood AS ENUM ('sad', 'ok', 'happy')",
48+
&[],
49+
).unwrap();
50+
51+
util::test_type(
52+
&conn,
53+
"mood",
54+
&[
55+
(Mood::Sad, "'sad'"),
56+
(Mood::Ok, "'ok'"),
57+
(Mood::Happy, "'happy'"),
58+
],
59+
);
4460
}
4561

4662
#[test]
4763
fn wrong_name() {
4864
#[derive(Debug, ToSql, FromSql, PartialEq)]
4965
enum Foo {
5066
Bar,
51-
Baz
67+
Baz,
5268
}
5369

54-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
55-
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
70+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
71+
.unwrap();
72+
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[])
73+
.unwrap();
5674

5775
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
5876
assert!(err.as_conversion().unwrap().is::<WrongType>());
@@ -68,8 +86,10 @@ fn extra_variant() {
6886
Buz,
6987
}
7088

71-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
72-
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
89+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
90+
.unwrap();
91+
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[])
92+
.unwrap();
7393

7494
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
7595
assert!(err.as_conversion().unwrap().is::<WrongType>());
@@ -83,8 +103,10 @@ fn missing_variant() {
83103
Bar,
84104
}
85105

86-
let conn = Connection::connect("postgres://postgres@localhost", TlsMode::None).unwrap();
87-
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[]).unwrap();
106+
let conn = Connection::connect("postgres://postgres:password@localhost", TlsMode::None)
107+
.unwrap();
108+
conn.execute("CREATE TYPE pg_temp.foo AS ENUM ('Bar', 'Baz')", &[])
109+
.unwrap();
88110

89111
let err = conn.execute("SELECT $1::foo", &[&Foo::Bar]).unwrap_err();
90112
assert!(err.as_conversion().unwrap().is::<WrongType>());

‎tests/util/mod.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ use postgres::Connection;
33
use std::fmt;
44

55
pub fn test_type<T, S>(conn: &Connection, sql_type: &str, checks: &[(T, S)])
6-
where T: PartialEq + FromSql + ToSql, S: fmt::Display
6+
where
7+
T: PartialEq + FromSql + ToSql,
8+
S: fmt::Display,
79
{
810
for &(ref val, ref repr) in checks.iter() {
9-
let stmt = conn.prepare(&*format!("SELECT {}::{}", *repr, sql_type)).unwrap();
11+
let stmt = conn.prepare(&*format!("SELECT {}::{}", *repr, sql_type))
12+
.unwrap();
1013
let result = stmt.query(&[]).unwrap().iter().next().unwrap().get(0);
1114
assert_eq!(val, &result);
1215

0 commit comments

Comments
 (0)