Move wildcard adding code into the like_name function

Author: carols10cents

src/controllers/krate/search.rs

@@ -38,12 +38,6 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
     let conn = req.db_conn()?;
     let (offset, limit) = req.pagination(10, 100)?;
     let params = req.query();
-    //extract the search param for loose searching
-    let search_q = if let Some(q) = params.get("q") {
-        format!("%{}%", q)
-    } else {
-        String::new()
-    };
     let sort = params
         .get("sort")
         .map(|s| &**s)
@@ -64,10 +58,11 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
         has_filter = true;
         if !q_string.is_empty() {
             let sort = params.get("sort").map(|s| &**s).unwrap_or("relevance");
+
             let q = plainto_tsquery(q_string);
             query = query.filter(
                 q.matches(crates::textsearchable_index_col)
-                    .or(Crate::like_name(&search_q)),
+                    .or(Crate::like_name(&q_string)),
             );
 
             query = query.select((

src/models/krate.rs

@@ -87,7 +87,7 @@ type CanonCrateName<T> = self::canon_crate_name::HelperType<T>;
 type All = diesel::dsl::Select<crates::table, AllColumns>;
 type WithName<'a> = diesel::dsl::Eq<CanonCrateName<crates::name>, CanonCrateName<&'a str>>;
 /// The result of a loose search
-type LikeName<'a> = diesel::dsl::Like<CanonCrateName<crates::name>, CanonCrateName<&'a str>>;
+type LikeName = diesel::dsl::Like<CanonCrateName<crates::name>, CanonCrateName<String>>;
 type ByName<'a> = diesel::dsl::Filter<All, WithName<'a>>;
 type ByExactName<'a> = diesel::dsl::Filter<All, diesel::dsl::Eq<crates::name, &'a str>>;
 
@@ -236,9 +236,11 @@ impl<'a> NewCrate<'a> {
 }
 
 impl Crate {
-    /// SQL filter with the `like` binary operator
-    pub fn like_name(name: &str) -> LikeName<'_> {
-        canon_crate_name(crates::name).like(canon_crate_name(name))
+    /// SQL filter with the `like` binary operator. Adds wildcards to the beginning and end to get
+    /// substring matches.
+    pub fn like_name(name: &str) -> LikeName {
+        let wildcard_name = format!("%{}%", name);
+        canon_crate_name(crates::name).like(canon_crate_name(wildcard_name))
     }
     /// SQL filter with the = binary operator
     pub fn with_name(name: &str) -> WithName<'_> {