I hate everything.

hammond-data/src/models/insertables.rs

@@ -3,7 +3,7 @@ use diesel;
 
 use schema::{episode, podcast, source};
 use models::{Podcast, Source};
-use POOL;
+use connection;
 use errors::*;
 
 use dbqueries;
@@ -29,7 +29,7 @@ impl<'a> NewSource<'a> {
     fn index(&self) {
         use schema::source::dsl::*;
 
-        let tempdb = POOL.clone().get().unwrap();
+        let tempdb = connection().get().unwrap();
         // Throw away the result like `insert or ignore`
         // Diesel deos not support `insert or ignore` yet.
         let _ = diesel::insert_into(source).values(self).execute(&*tempdb);
@@ -112,13 +112,13 @@ impl NewPodcast {
 
         match pd {
             Ok(foo) => if foo.link() != self.link {
-                let tempdb = POOL.clone().get().unwrap();
+                let tempdb = connection().get().unwrap();
                 diesel::replace_into(podcast)
                     .values(self)
                     .execute(&*tempdb)?;
             },
             Err(_) => {
-                let tempdb = POOL.clone().get().unwrap();
+                let tempdb = connection().get().unwrap();
                 diesel::insert_into(podcast).values(self).execute(&*tempdb)?;
             }
         }

hammond-data/src/models/queryables.rs

@@ -10,7 +10,7 @@ use feed::Feed;
 use errors::*;
 
 use models::insertables::NewPodcast;
-use POOL;
+use connection;
 
 use std::io::Read;
 use std::str::FromStr;
@@ -129,7 +129,7 @@ impl Episode {
     }
 
     pub fn save(&self) -> QueryResult<Episode> {
-        let tempdb = POOL.clone().get().unwrap();
+        let tempdb = connection().get().unwrap();
         self.save_changes::<Episode>(&*tempdb)
     }
 }
@@ -226,7 +226,7 @@ impl Podcast {
     }
 
     pub fn save(&self) -> QueryResult<Podcast> {
-        let tempdb = POOL.clone().get().unwrap();
+        let tempdb = connection().get().unwrap();
         self.save_changes::<Podcast>(&*tempdb)
     }
 }
@@ -285,7 +285,7 @@ impl<'a> Source {
     }
 
     pub fn save(&self) -> QueryResult<Source> {
-        let tempdb = POOL.clone().get().unwrap();
+        let tempdb = connection().get().unwrap();
         self.save_changes::<Source>(&*tempdb)
     }