Skip to content

Commit 4c2bd42

Browse files
committed
Lowercase keywords before inserting
Fixes #722.
1 parent defd894 commit 4c2bd42

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/keyword.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,22 @@ impl Keyword {
5959
keyword: &'a str,
6060
}
6161

62-
let (lowercase_names, new_keywords): (Vec<_>, Vec<_>) = names.iter()
63-
.map(|s| (s.to_lowercase(), NewKeyword { keyword: *s }))
64-
.unzip();
62+
let lowercase_names: Vec<_> = names.iter()
63+
.map(|s| s.to_lowercase())
64+
.collect();
65+
66+
let new_keywords: Vec<_> = lowercase_names.iter()
67+
.map(|s| NewKeyword { keyword: s })
68+
.collect();
6569

6670
// https://github.com/diesel-rs/diesel/issues/797
6771
if !new_keywords.is_empty() {
68-
diesel::insert(&new_keywords.on_conflict_do_nothing()).into(keywords::table)
72+
diesel::insert(&new_keywords.on_conflict_do_nothing())
73+
.into(keywords::table)
6974
.execute(conn)?;
7075
}
71-
keywords::table.filter(::lower(keywords::keyword).eq(any(lowercase_names)))
76+
keywords::table
77+
.filter(::lower(keywords::keyword).eq(any(&lowercase_names)))
7278
.load(conn)
7379
}
7480

0 commit comments

Comments
 (0)