cleans up a little + rustfmt
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
extern crate dotenv;
|
||||
#[macro_use] extern crate diesel;
|
||||
#[macro_use] extern crate serde_derive;
|
||||
extern crate dotenv;
|
||||
#[macro_use]
|
||||
extern crate diesel;
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
use diesel::prelude::*;
|
||||
use diesel::r2d2::{self, ConnectionManager };
|
||||
use diesel::r2d2::{self, ConnectionManager};
|
||||
|
||||
pub fn establish_connection() -> Result<SqliteConnection, String> {
|
||||
dotenv::dotenv().ok();
|
||||
@@ -15,11 +17,15 @@ pub fn establish_connection() -> Result<SqliteConnection, String> {
|
||||
pub mod models;
|
||||
pub mod schema;
|
||||
|
||||
pub fn list_players(conn: &SqliteConnection)
|
||||
-> Result<Vec<models::Player>, diesel::result::Error> {
|
||||
use schema::players::dsl::*;
|
||||
Ok(players
|
||||
.load::<models::Player>(conn)?)
|
||||
pub use models::Player;
|
||||
|
||||
impl Player {
|
||||
pub fn fetch_list(
|
||||
conn: &SqliteConnection,
|
||||
) -> Result<Vec<models::Player>, diesel::result::Error> {
|
||||
use schema::players::dsl::*;
|
||||
Ok(players.load::<models::Player>(conn)?)
|
||||
}
|
||||
}
|
||||
|
||||
pub type Pool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
|
||||
@@ -33,10 +39,6 @@ pub fn create_pool() -> Pool {
|
||||
.expect("Failed to create pool.")
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::serde_derive::{Serialize};
|
||||
use crate::schema::players;
|
||||
use crate::serde_derive::Serialize;
|
||||
use crate::*;
|
||||
|
||||
#[derive(Debug, Queryable, Serialize)]
|
||||
|
||||
Reference in New Issue
Block a user