db: run migrations in db connect, upgrade diesel

1 files changed, 12 insertions, 12 deletions

diff --git a/src/db/models.rs b/src/db/models.rs
index 95acb16..54e8ce2 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -24,15 +24,15 @@ pub struct Meme {
 }
 
 impl Meme {
-    pub fn image(&self, conn: &PgConnection) -> Option<Result<Image>> {
+    pub fn image(&self, conn: &mut PgConnection) -> Option<Result<Image>> {
         self.image_id.map(|x: i32| images::table.filter(images::id.eq(x)).first(conn).map_err(Error::from))
     }
 
-    pub fn audio(&self, conn: &PgConnection) -> Option<Result<Audio>> {
+    pub fn audio(&self, conn: &mut PgConnection) -> Option<Result<Audio>> {
         self.audio_id.map(|x: i32| audio::table.filter(audio::id.eq(x)).first(conn).map_err(Error::from))
     }
 
-    pub fn find(conn: &PgConnection, id: i32) -> Result<Meme> {
+    pub fn find(conn: &mut PgConnection, id: i32) -> Result<Meme> {
         memes::table.find(id).get_result(conn).map_err(Error::from)
     }
 }
@@ -48,7 +48,7 @@ pub struct NewMeme {
 }
 
 impl NewMeme {
-    pub fn save(mut self, conn: &PgConnection, by_user: u64) -> Result<Meme> {
+    pub fn save(mut self, conn: &mut PgConnection, by_user: u64) -> Result<Meme> {
         let metadata = Metadata::create(conn, by_user)?;
 
         self.metadata_id = metadata.id;
@@ -71,7 +71,7 @@ pub struct Audio {
 }
 
 impl Audio {
-    pub fn create(conn: &PgConnection, data: Vec<u8>, by_user: u64) -> Result<i32> {
+    pub fn create(conn: &mut PgConnection, data: Vec<u8>, by_user: u64) -> Result<i32> {
         let mut data_hash = ::sha1::Sha1::new();
         data_hash.update(&data);
         let data_hash = data_hash.digest().bytes().to_vec();
@@ -121,7 +121,7 @@ pub struct Image {
 }
 
 impl Image {
-    pub fn create(conn: &PgConnection, filename: &str, data: Vec<u8>, by_user: u64) -> Result<i32> {
+    pub fn create(conn: &mut PgConnection, filename: &str, data: Vec<u8>, by_user: u64) -> Result<i32> {
         let mut data_hash = ::sha1::Sha1::new();
         data_hash.update(&data);
         let data_hash = data_hash.digest().bytes().to_vec();
@@ -171,7 +171,7 @@ pub struct Metadata {
 }
 
 impl Metadata {
-    pub fn create(conn: &PgConnection, by_user: u64) -> Result<Metadata> {
+    pub fn create(conn: &mut PgConnection, by_user: u64) -> Result<Metadata> {
         ::diesel::insert_into(metadata::table)
             .values(&NewMetadata {
                 created_by: by_user as i64,
@@ -180,7 +180,7 @@ impl Metadata {
             .map_err(Error::from)
     }
 
-    pub fn find(conn: &PgConnection, id: i32) -> Result<Metadata> {
+    pub fn find(conn: &mut PgConnection, id: i32) -> Result<Metadata> {
         metadata::table.find(id)
             .get_result::<Metadata>(conn)
             .map_err(Error::from)
@@ -204,7 +204,7 @@ pub struct AuditRecord {
 }
 
 impl AuditRecord {
-    pub fn create(conn: &PgConnection, metadata: i32, by_user: u64) -> Result<AuditRecord> {
+    pub fn create(conn: &mut PgConnection, metadata: i32, by_user: u64) -> Result<AuditRecord> {
         ::diesel::insert_into(audit_records::table)
             .values(&NewAuditRecord {
                 updated_by: by_user as i64,
@@ -262,7 +262,7 @@ pub struct NewInvocationRecord {
 }
 
 impl InvocationRecord {
-    pub fn create(conn: &PgConnection, user_id: u64, message_id: u64, meme_id: i32, random: bool) -> Result<Self> {
+    pub fn create(conn: &mut PgConnection, user_id: u64, message_id: u64, meme_id: i32, random: bool) -> Result<Self> {
         ::diesel::insert_into(invocation_records::table)
             .values(&NewInvocationRecord {
                 user_id: user_id as i64,
@@ -274,14 +274,14 @@ impl InvocationRecord {
             .map_err(Error::from)
     }
 
-    pub fn last(conn: &PgConnection) -> Result<Self> {
+    pub fn last(conn: &mut PgConnection) -> Result<Self> {
         invocation_records::table
             .order(invocation_records::time.desc())
             .first(conn)
             .map_err(Error::from)
     }
 
-    pub fn last_n(conn: &PgConnection, n: usize) -> Result<Vec<Self>> {
+    pub fn last_n(conn: &mut PgConnection, n: usize) -> Result<Vec<Self>> {
         invocation_records::table
             .order(invocation_records::time.desc())
             .limit(n as i64)