runs rustfmt, removes unused imports
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
#[macro_use] extern crate diesel;
|
||||
extern crate dotenv;
|
||||
#[macro_use]
|
||||
extern crate diesel;
|
||||
extern crate dotenv;
|
||||
|
||||
use diesel::prelude::*;
|
||||
use dotenv::dotenv;
|
||||
@@ -7,15 +8,13 @@ use std::env;
|
||||
|
||||
pub fn establish_connection() -> Result<SqliteConnection, String> {
|
||||
dotenv().ok();
|
||||
let database_url =
|
||||
env::var("DATABASE_URL")
|
||||
.expect("DATABASE_URL must be set !");
|
||||
let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set !");
|
||||
SqliteConnection::establish(&database_url)
|
||||
.map_err(|e| format!("Error connecting to {} : {:?}", database_url, e))
|
||||
}
|
||||
|
||||
pub mod schema;
|
||||
pub mod models;
|
||||
pub mod schema;
|
||||
|
||||
pub fn list_players() -> Vec<models::Player> {
|
||||
use schema::players::dsl::*;
|
||||
@@ -25,18 +24,16 @@ pub fn list_players() -> Vec<models::Player> {
|
||||
.expect("Error loading players")
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn with_db<F>(f: F) -> ()
|
||||
where F: Fn(&SqliteConnection) -> (),
|
||||
where
|
||||
F: Fn(&SqliteConnection) -> (),
|
||||
{
|
||||
let conn = establish_connection().unwrap();
|
||||
conn.test_transaction::<_,diesel::result::Error,_>(|| {
|
||||
conn.test_transaction::<_, diesel::result::Error, _>(|| {
|
||||
f(&conn);
|
||||
Ok(())
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user