Skip to content

Commit 118ae38

Browse files
committed
Fix postgres test results
1 parent 3b2a249 commit 118ae38

1 file changed

Lines changed: 55 additions & 5 deletions

File tree

diesel_cli/tests/print_schema.rs

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ fn run_infer_schema() {
1717
let result = p.command("print-schema").run();
1818

1919
assert!(result.is_success(), "Result was unsuccessful {:?}", result);
20-
assert_eq!(result.stdout(),
20+
if cfg!(feature = "sqlite") {
21+
assert_eq!(result.stdout(),
2122
r"mod infer_users1 {
2223
table! {
2324
users1(id) {
@@ -36,11 +37,32 @@ mod infer_users2 {
3637
pub use self::infer_users2::*;
3738
3839
");
40+
} else if cfg!(feature = "postgres") {
41+
assert_eq!(result.stdout(),
42+
r"mod infer_users1 {
43+
table! {
44+
users1(id) {
45+
id -> Int4,
46+
}
47+
}
48+
}
49+
pub use self::infer_users1::*;
50+
mod infer_users2 {
51+
table! {
52+
users2(id) {
53+
id -> Int4,
54+
}
55+
}
56+
}
57+
pub use self::infer_users2::*;
58+
59+
");
60+
}
3961
}
4062

4163
#[test]
4264
fn run_infer_schema_whitelist() {
43-
let p = project("print_schema").build();
65+
let p = project("print_schema_whitelist").build();
4466
let db = database(&p.database_url());
4567

4668
// Make sure the project is setup
@@ -55,7 +77,8 @@ fn run_infer_schema_whitelist() {
5577
let result = p.command("print-schema").arg("users1").arg("-w").run();
5678

5779
assert!(result.is_success(), "Result was unsuccessful {:?}", result);
58-
assert_eq!(result.stdout(),
80+
if cfg!(feature = "sqlite") {
81+
assert_eq!(result.stdout(),
5982
r"mod infer_users1 {
6083
table! {
6184
users1(id) {
@@ -66,11 +89,24 @@ r"mod infer_users1 {
6689
pub use self::infer_users1::*;
6790
6891
");
92+
} else if cfg!(feature = "postgres") {
93+
assert_eq!(result.stdout(),
94+
r"mod infer_users1 {
95+
table! {
96+
users1(id) {
97+
id -> Int4,
98+
}
99+
}
100+
}
101+
pub use self::infer_users1::*;
102+
103+
");
104+
}
69105
}
70106

71107
#[test]
72108
fn run_infer_schema_blacklist() {
73-
let p = project("print_schema").build();
109+
let p = project("print_schema_blacklist").build();
74110
let db = database(&p.database_url());
75111

76112
// Make sure the project is setup
@@ -85,7 +121,8 @@ fn run_infer_schema_blacklist() {
85121
let result = p.command("print-schema").arg("users1").arg("-b").run();
86122

87123
assert!(result.is_success(), "Result was unsuccessful {:?}", result);
88-
assert_eq!(result.stdout(),
124+
if cfg!(feature = "sqlite") {
125+
assert_eq!(result.stdout(),
89126
r"mod infer_users2 {
90127
table! {
91128
users2(id) {
@@ -96,4 +133,17 @@ r"mod infer_users2 {
96133
pub use self::infer_users2::*;
97134
98135
");
136+
} else if cfg!(feature = "postgres") {
137+
assert_eq!(result.stdout(),
138+
r"mod infer_users2 {
139+
table! {
140+
users2(id) {
141+
id -> Int4,
142+
}
143+
}
144+
}
145+
pub use self::infer_users2::*;
146+
147+
");
148+
}
99149
}

0 commit comments

Comments
 (0)