diff options
| author | Nathan Perry <avaglir@gmail.com> | 2018-04-07 06:09:52 -0400 |
|---|---|---|
| committer | Nathan Perry <avaglir@gmail.com> | 2018-04-07 06:09:52 -0400 |
| commit | fdf65962b9610ab0a7b8e91dc1a2d4973f44c169 (patch) | |
| tree | 137568972c2033bf487a70c92d732a459d82c3d5 /src/db/mod.rs | |
| parent | 1e192fc976325f6bbaede91ab25241efa99e4475 (diff) | |
database-based memeing working
Diffstat (limited to 'src/db/mod.rs')
| -rw-r--r-- | src/db/mod.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/db/mod.rs b/src/db/mod.rs index 0862883..ac0e321 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -22,12 +22,14 @@ pub fn connection() -> Result<PgConnection> { pub fn find_meme<T: AsRef<str>>(conn: &PgConnection, search: T) -> Result<Meme> {
use diesel::dsl::sql;
+ use diesel::types::Text;
let search = search.as_ref();
let format_search = format!("%{}%", search);
+ // TODO: check for injection
memes::table
- .filter(memes::title.ilike(&format_search).or(sql(&format!("content ILIKE %{}%", search))))
+ .filter(memes::title.ilike(&format_search).or(sql("content ILIKE ").bind::<Text, _>(&format_search)))
.limit(1)
.first::<Meme>(conn)
.map_err(Error::from)
@@ -35,12 +37,14 @@ pub fn find_meme<T: AsRef<str>>(conn: &PgConnection, search: T) -> Result<Meme> pub fn find_text<T: AsRef<str>>(conn: &PgConnection, search: T) -> Result<Meme> {
use diesel::dsl::sql;
+ use diesel::types::Text;
let search = search.as_ref();
let format_search = format!("%{}%", search);
+ // TODO: check for injection
memes::table
- .filter((memes::title.ilike(&format_search).or(sql(&format!("content ILIKE %{}%", search))))
+ .filter((memes::title.ilike(&format_search).or(sql("content ILIKE ").bind::<Text, _>(&format_search)))
.and(memes::content.is_not_null()))
.limit(1)
.first::<Meme>(conn)
|