Sets up connection pooling, closes issue #9

Cargo.toml

@@ -8,11 +8,11 @@ edition = "2018"
 rocket = "0.4.2"
 dotenv = "0.9.0"
 
-bowtie_routes = { path = "crates/routes" }
+bowtie_data   = { path = "crates/data" }
 bowtie_models = { path = "crates/models" }
-
+bowtie_routes = { path = "crates/routes" }
 
 [dependencies.rocket_contrib]
 version = "0.4.2"
 default-features = false
-features = ["serve"]
+features = ["serve","diesel_postgres_pool"]

crates/data/Cargo.toml

@@ -6,4 +6,6 @@ edition = "2018"
 
 [dependencies]
 rocket = "0.4.2"
+r2d2 = "0.8.7"
+r2d2-diesel = "1.0.0"
 diesel = { version = "1.0.0", features = ["postgres"] }

crates/data/src/database.rs

@@ -1,4 +1,20 @@
 
+extern crate r2d2;
+extern crate r2d2_diesel;
+extern crate diesel;
+use std::env;
+
+use diesel::pg::PgConnection;
+use r2d2_diesel::ConnectionManager;
+
+use rocket::{
+    State,
+    request::{FromRequest,Request,Outcome},
+    http::{Status}
+};
+
+use std::ops::Deref;
+
 #[macro_export]
 macro_rules! db {
     () => {
@@ -21,4 +37,39 @@ macro_rules! db {
             None => return $r
         }
     }
+}
+
+type Pool = r2d2::Pool<ConnectionManager<PgConnection>>;
+
+pub struct Conn(pub r2d2::PooledConnection<ConnectionManager<PgConnection>>);
+
+impl Conn {
+
+    pub fn initialize( t_variable: &str ) -> Pool {
+        Pool::new(ConnectionManager::<PgConnection>::new(
+            env::var(t_variable)
+            .expect("No Url Variable")))
+            .expect("No Connection")
+    }
+
+}
+
+impl<'a, 'r> FromRequest<'a, 'r> for Conn {
+    type Error = ();
+
+    fn from_request(request: &'a Request<'r>) -> Outcome<Conn, Self::Error> {
+        let pool = request.guard::<State<Pool>>()?;
+        match pool.get() {
+            Ok(conn) => Outcome::Success(Conn(conn)),
+            Err(_) => Outcome::Failure((Status::ServiceUnavailable, ())),
+        }
+    }
+}
+
+impl Deref for Conn {
+    type Target = PgConnection;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
 }

crates/data/src/lib.rs

@@ -5,4 +5,6 @@ pub mod schema;
 pub mod models;
 pub mod queries;
 pub mod database;
-pub mod traits;
+pub mod traits;
+
+pub use database::Conn;

crates/data/src/queries.rs

@@ -14,11 +14,11 @@ macro_rules! queries {
         impl $mn {
             paste::item! {
                 $(
-                    pub fn [<for_ $fn>](t_value: $ft) -> Option<Self> {
+                    pub fn [<for_ $fn>](t_conn: &PgConnection, t_value: $ft) -> Option<Self> {
                         let conn = db!(None);
                         match $tn::table
                         .filter($fp.eq(t_value))
-                        .first::<[<$mn Model>]>(&conn) {
+                        .first::<[<$mn Model>]>(t_conn) {
                             Ok(m) => Some(m.into()),
                             Err(e) => {
                                 warn!("Error during query: {}",e);