aboutsummaryrefslogtreecommitdiff
path: root/src/db
diff options
context:
space:
mode:
Diffstat (limited to 'src/db')
-rw-r--r--src/db/mod.rs2
-rw-r--r--src/db/models.rs1
-rw-r--r--src/db/schema.rs32
3 files changed, 18 insertions, 17 deletions
diff --git a/src/db/mod.rs b/src/db/mod.rs
index 476d9d9..1ac44e9 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -235,7 +235,7 @@ pub fn rare_meme(conn: &mut PgConnection, audio: bool) -> Result<Meme> {
}
let mut rng = thread_rng();
- let target_prob = rng.gen_range(0, elems.last().unwrap().1);
+ let target_prob = rng.gen_range(0..elems.last().unwrap().1);
let meme_id = elems.into_iter()
.find(|(_, x)| target_prob < *x)
diff --git a/src/db/models.rs b/src/db/models.rs
index f2127b5..cdcdd99 100644
--- a/src/db/models.rs
+++ b/src/db/models.rs
@@ -5,6 +5,7 @@ use diesel::{
prelude::*,
Queryable,
};
+use sha1::Digest;
use crate::{
db::schema::*,
diff --git a/src/db/schema.rs b/src/db/schema.rs
index 01ec1d0..e89b24a 100644
--- a/src/db/schema.rs
+++ b/src/db/schema.rs
@@ -1,4 +1,4 @@
-table! {
+diesel::table! {
audio (id) {
id -> Int4,
data -> Bytea,
@@ -7,7 +7,7 @@ table! {
}
}
-table! {
+diesel::table! {
audit_records (id) {
id -> Int4,
updated -> Timestamp,
@@ -16,7 +16,7 @@ table! {
}
}
-table! {
+diesel::table! {
images (id) {
id -> Int4,
data -> Bytea,
@@ -26,7 +26,7 @@ table! {
}
}
-table! {
+diesel::table! {
invocation_records (id) {
id -> Int4,
user_id -> Int8,
@@ -37,7 +37,7 @@ table! {
}
}
-table! {
+diesel::table! {
memes (id) {
id -> Int4,
title -> Varchar,
@@ -48,7 +48,7 @@ table! {
}
}
-table! {
+diesel::table! {
metadata (id) {
id -> Int4,
created -> Timestamp,
@@ -56,7 +56,7 @@ table! {
}
}
-table! {
+diesel::table! {
tombstones (id) {
id -> Int4,
meme_id -> Int4,
@@ -66,16 +66,16 @@ table! {
}
}
-joinable!(audio -> metadata (metadata_id));
-joinable!(audit_records -> metadata (metadata_id));
-joinable!(images -> metadata (metadata_id));
-joinable!(memes -> audio (audio_id));
-joinable!(memes -> images (image_id));
-joinable!(memes -> metadata (metadata_id));
-joinable!(tombstones -> metadata (metadata_id));
-joinable!(invocation_records -> memes (meme_id));
+diesel::joinable!(audio -> metadata (metadata_id));
+diesel::joinable!(audit_records -> metadata (metadata_id));
+diesel::joinable!(images -> metadata (metadata_id));
+diesel::joinable!(memes -> audio (audio_id));
+diesel::joinable!(memes -> images (image_id));
+diesel::joinable!(memes -> metadata (metadata_id));
+diesel::joinable!(tombstones -> metadata (metadata_id));
+diesel::joinable!(invocation_records -> memes (meme_id));
-allow_tables_to_appear_in_same_query!(
+diesel::allow_tables_to_appear_in_same_query!(
audio,
audit_records,
images,