File tree Expand file tree Collapse file tree 5 files changed +15
-13
lines changed Expand file tree Collapse file tree 5 files changed +15
-13
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,10 @@ serde.workspace = true
19
19
serde_json.workspace = true
20
20
pg_diagnostics.workspace = true
21
21
pg_console.workspace = true
22
-
23
22
sqlx.workspace = true
24
23
24
+ [dev-dependencies ]
25
+ pg_test_utils.workspace = true
26
+
25
27
[lib ]
26
28
doctest = false
Original file line number Diff line number Diff line change @@ -75,17 +75,16 @@ pub trait SchemaCacheItem {
75
75
76
76
#[ cfg( test) ]
77
77
mod tests {
78
- use sqlx:: PgPool ;
78
+ use async_std:: task:: block_on;
79
+ use pg_test_utils:: test_database:: get_new_test_db;
79
80
80
81
use crate :: SchemaCache ;
81
82
82
83
#[ test]
83
84
fn test_schema_cache ( ) {
84
- let conn_string = std :: env :: var ( "DATABASE_URL" ) . unwrap ( ) ;
85
+ let test_db = block_on ( get_new_test_db ( ) ) ;
85
86
86
- let pool = async_std:: task:: block_on ( PgPool :: connect ( conn_string. as_str ( ) ) ) . unwrap ( ) ;
87
-
88
- async_std:: task:: block_on ( SchemaCache :: load ( & pool) ) . expect ( "Couldn't load Schema Cache" ) ;
87
+ block_on ( SchemaCache :: load ( & test_db) ) . expect ( "Couldn't load Schema Cache" ) ;
89
88
90
89
assert ! ( true ) ;
91
90
}
Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ async-std = "1.12.0"
24
24
25
25
26
26
[dev-dependencies ]
27
+ pg_test_utils.workspace = true
27
28
28
29
[lib ]
29
30
doctest = false
Original file line number Diff line number Diff line change @@ -85,23 +85,21 @@ pub async fn check_sql<'a>(params: TypecheckerParams<'a>) -> Vec<TypeError> {
85
85
#[ cfg( test) ]
86
86
mod tests {
87
87
use async_std:: task:: block_on;
88
- use sqlx :: PgPool ;
88
+ use pg_test_utils :: test_database :: get_new_test_db ;
89
89
90
90
use crate :: { check_sql, TypecheckerParams } ;
91
91
92
92
#[ test]
93
- fn test_check_sql ( ) {
93
+ fn test_basic_type ( ) {
94
94
let input = "select id, unknown from contact;" ;
95
95
96
- let conn_string = std:: env:: var ( "DATABASE_URL" ) . unwrap ( ) ;
97
-
98
- let pool = block_on ( PgPool :: connect ( conn_string. as_str ( ) ) ) . unwrap ( ) ;
96
+ let test_db = block_on ( get_new_test_db ( ) ) ;
99
97
100
98
let root = pg_query_ext:: parse ( input) . unwrap ( ) ;
101
99
let ast = pg_syntax:: parse_syntax ( input, & root) . ast ;
102
100
103
101
let errs = block_on ( check_sql ( TypecheckerParams {
104
- conn : & pool ,
102
+ conn : & test_db ,
105
103
sql : input,
106
104
ast : & root,
107
105
enriched_ast : Some ( & ast) ,
@@ -111,6 +109,6 @@ mod tests {
111
109
112
110
let e = & errs[ 0 ] ;
113
111
114
- assert_eq ! ( & input[ e. range. unwrap( ) ] , "unknown " ) ;
112
+ assert_eq ! ( & input[ e. range. unwrap( ) ] , "contact " ) ;
115
113
}
116
114
}
You can’t perform that action at this time.
0 commit comments