aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/factoid/database.rs7
-rw-r--r--src/plugins/remind/database.rs4
-rw-r--r--src/plugins/tell/database.rs3
3 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/factoid/database.rs b/src/plugins/factoid/database.rs
index e82bd27..4adcc39 100644
--- a/src/plugins/factoid/database.rs
+++ b/src/plugins/factoid/database.rs
@@ -102,9 +102,8 @@ use self::schema::factoids;
#[cfg(feature = "mysql")]
impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn insert_factoid(&mut self, factoid: &NewFactoid) -> Result<(), FactoidError> {
- use diesel;
-
let conn = &*self.get().context(ErrorKind::NoConnection)?;
+
diesel::insert_into(factoids::table)
.values(factoid)
.execute(conn)
@@ -123,7 +122,6 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn delete_factoid(&mut self, name: &str, idx: i32) -> Result<(), FactoidError> {
use self::factoids::columns;
- use diesel;
let conn = &*self.get().context(ErrorKind::NoConnection)?;
match diesel::delete(
@@ -145,9 +143,8 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
}
fn count_factoids(&self, name: &str) -> Result<i32, FactoidError> {
- use diesel;
-
let conn = &*self.get().context(ErrorKind::NoConnection)?;
+
let count: Result<i64, _> = factoids::table
.filter(factoids::columns::name.eq(name))
.count()
diff --git a/src/plugins/remind/database.rs b/src/plugins/remind/database.rs
index 97d93e8..f3c1cb9 100644
--- a/src/plugins/remind/database.rs
+++ b/src/plugins/remind/database.rs
@@ -163,7 +163,7 @@ use self::schema::events;
#[cfg(feature = "mysql")]
impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn insert_event(&mut self, event: &NewEvent) -> Result<i64, RemindError> {
- use diesel::{self, dsl::sql, types::Bigint};
+ use diesel::{dsl::sql, types::Bigint};
let conn = &*self.get().context(ErrorKind::NoConnection)?;
diesel::insert_into(events::table)
@@ -180,7 +180,6 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn update_event_time(&mut self, id: i64, time: &NaiveDateTime) -> Result<(), RemindError> {
use self::events::columns;
- use diesel;
let conn = &*self.get().context(ErrorKind::NoConnection)?;
match diesel::update(events::table.filter(columns::id.eq(id)))
@@ -224,7 +223,6 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn delete_event(&mut self, id: i64) -> Result<(), RemindError> {
use self::events::columns;
- use diesel;
let conn = &*self.get().context(ErrorKind::NoConnection)?;
match diesel::delete(events::table.filter(columns::id.eq(id))).execute(conn) {
diff --git a/src/plugins/tell/database.rs b/src/plugins/tell/database.rs
index cdce6c6..363a87f 100644
--- a/src/plugins/tell/database.rs
+++ b/src/plugins/tell/database.rs
@@ -104,8 +104,6 @@ use self::schema::tells;
#[cfg(feature = "mysql")]
impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn insert_tell(&mut self, tell: &NewTellMessage) -> Result<(), TellError> {
- use diesel;
-
let conn = &*self.get().expect("Failed to get connection");
diesel::insert_into(tells::table)
.values(tell)
@@ -142,7 +140,6 @@ impl Database for Arc<Pool<ConnectionManager<MysqlConnection>>> {
fn delete_tells(&mut self, receiver: &str) -> Result<(), TellError> {
use self::tells::columns;
- use diesel;
let conn = &*self.get().context(ErrorKind::NoConnection)?;
diesel::delete(tells::table.filter(columns::receiver.eq(receiver)))