Merge branch 'pull_1560'

Author: rfm

src/controllers/krate/search.rs

@@ -37,6 +37,12 @@ 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)
@@ -57,7 +63,7 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
             let q = plainto_tsquery(q_string);
             query = query.filter(
                 q.matches(crates::textsearchable_index_col)
-                    .or(Crate::with_name(q_string)),
+                    .or(Crate::like_name(&search_q)),
             );
 
             query = query.select((

src/models/krate.rs

@@ -87,6 +87,11 @@ pub const MAX_NAME_LENGTH: usize = 64;
 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::pg::expression::helper_types::ILike<
+    CanonCrateName<crates::name>,
+    CanonCrateName<&'a str>,
+>;
 type ByName<'a> = diesel::dsl::Filter<All, WithName<'a>>;
 type ByExactName<'a> = diesel::dsl::Filter<All, diesel::dsl::Eq<crates::name, &'a str>>;
 
@@ -235,6 +240,21 @@ impl<'a> NewCrate<'a> {
 }
 
 impl Crate {
+    /// SQL filter with the `like` binary operator
+    /// ```sql
+    /// SELECT *
+    /// FROM crates
+    /// WHERE name like $1
+    /// ```
+    pub fn like_name(name: &str) -> LikeName<'_> {
+        canon_crate_name(crates::name).ilike(canon_crate_name(name))
+    }
+    /// SQL filter with the = binary operator
+    /// ```sql
+    /// SELECT *
+    /// FROM crates
+    /// WHERE name = $1
+    /// ```
     pub fn with_name(name: &str) -> WithName<'_> {
         canon_crate_name(crates::name).eq(canon_crate_name(name))
     }

src/tests/krate.rs

@@ -414,6 +414,69 @@ fn exact_match_on_queries_with_sort() {
     assert_eq!(json.crates[3].name, "other_sort");
 }
 
+#[test]
+fn loose_search_order() {
+    let (app, anon, user) = TestApp::init().with_user();
+    let user = user.as_model();
+
+    let ordered = app.db(|conn| {
+        // exact match should be first
+        let one = CrateBuilder::new("temp", user.id)
+            .readme("readme")
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        // file shouldn't match at all
+        CrateBuilder::new("file", user.id)
+            .readme("readme")
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        // temp_udp should match second
+        let two = CrateBuilder::new("temp_utp", user.id)
+            .readme("readme")
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        // evalrs should match 3rd because of readme
+        let three = CrateBuilder::new("evalrs", user.id)
+            .readme(
+                r#"$ echo 'println!("Hello World!")' | evalrs
+   Compiling evalrs_temp v0.0.0 (file:///tmp/evalrs_temp.daiPxHtjV2VR)
+    Finished debug [unoptimized + debuginfo] target(s) in 0.51 secs
+     Running `target\debug\evalrs_temp.exe`
+Hello World!"#,
+            )
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        // tempfile should appear 4th
+        let four = CrateBuilder::new("tempfile", user.id)
+            .readme("readme")
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        // mkstemp should appear 5th
+        let five = CrateBuilder::new("mkstemp", user.id)
+            .readme("readme")
+            .description("description")
+            .keyword("kw1")
+            .expect_build(conn);
+        vec![one, two, three, four, five]
+    });
+    let search_temp = anon.search("q=temp");
+    assert_eq!(search_temp.meta.total, 5);
+    assert_eq!(search_temp.crates.len(), 5);
+    for (lhs, rhs) in search_temp.crates.iter().zip(ordered) {
+        assert_eq!(lhs.name, rhs.name);
+    }
+    let search_file = anon.search("q=file");
+    assert_eq!(search_file.meta.total, 2);
+    assert_eq!(search_file.crates.len(), 2);
+    assert_eq!(&search_file.crates[0].name, "file");
+    assert_eq!(&search_file.crates[1].name, "tempfile");
+}
+
 #[test]
 fn show() {
     let (app, anon, user) = TestApp::init().with_user();