From 92668ad4c53edcc1a317a16aa5ea30ca502f54ee Mon Sep 17 00:00:00 2001
From: Jokler <jokler.contact@gmail.com>
Date: Sun, 25 Feb 2018 18:54:16 +0100
Subject: Add Mysql as a possible database to the Tell plugin

---
 src/plugins/factoids/database.rs | 15 +++++++++------
 src/plugins/factoids/mod.rs      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/plugins/factoids')

diff --git a/src/plugins/factoids/database.rs b/src/plugins/factoids/database.rs
index 386d3f7..88aa0fd 100644
--- a/src/plugins/factoids/database.rs
+++ b/src/plugins/factoids/database.rs
@@ -1,6 +1,8 @@
 #[cfg(feature = "mysql")]
 extern crate dotenv;
 
+#[cfg(feature = "mysql")]
+use std::sync::Arc;
 use std::collections::HashMap;
 
 #[cfg(feature = "mysql")]
@@ -29,8 +31,6 @@ pub struct Factoid {
     pub created: NaiveDateTime,
 }
 
-#[cfg(feature = "mysql")]
-use self::mysql::factoids;
 #[cfg_attr(feature = "mysql", derive(Insertable))]
 #[cfg_attr(feature = "mysql", table_name = "factoids")]
 pub struct NewFactoid<'a> {
@@ -82,10 +82,10 @@ impl Database for HashMap<(String, i32), Factoid> {
     }
 }
 
-// Diesel automatically define the factoids module as public.
-// For now this is how we keep it private.
+// Diesel automatically defines the factoids module as public.
+// We create a schema module to keep it private.
 #[cfg(feature = "mysql")]
-mod mysql {
+mod schema {
     table! {
         factoids (name, idx) {
             name -> Varchar,
@@ -98,7 +98,10 @@ mod mysql {
 }
 
 #[cfg(feature = "mysql")]
-impl Database for Pool<ConnectionManager<MysqlConnection>> {
+use self::schema::factoids;
+
+#[cfg(feature = "mysql")]
+impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
     fn insert_factoid(&mut self, factoid: &NewFactoid) -> DbResponse {
         use diesel;
 
diff --git a/src/plugins/factoids/mod.rs b/src/plugins/factoids/mod.rs
index c3d19b0..d6abb1d 100644
--- a/src/plugins/factoids/mod.rs
+++ b/src/plugins/factoids/mod.rs
@@ -49,7 +49,7 @@ impl<T: Database> Factoids<T> {
             idx: count,
             content: content,
             author: author,
-            created: NaiveDateTime::from_timestamp(tm.sec, tm.nsec as u32),
+            created: NaiveDateTime::from_timestamp(tm.sec, 0u32),
         };
 
         match try_lock!(self.factoids).insert_factoid(&factoid) {
-- 
cgit v1.2.3-70-g09d2