Merge pull request #627 from integer32llc/fix-category-query

Fix category query to look up on slug

Author: alexcrichton

src/krate.rs

@@ -672,8 +672,8 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
         query = query.filter(crates::id.eq_any(
             crates_categories::table.select(crates_categories::crate_id)
                 .inner_join(categories::table)
-                .filter(categories::category.eq(cat).or(
-                        categories::category.like(format!("{}::%", cat))))
+                .filter(categories::slug.eq(cat).or(
+                        categories::slug.like(format!("{}::%", cat))))
         ));
     } else if let Some(user_id) = params.get("user_id").and_then(|s| s.parse::<i32>().ok()) {
         query = query.filter(crates::id.eq_any((

src/tests/krate.rs

@@ -143,8 +143,8 @@ fn index_queries() {
     let mut response = ok_resp!(middle.call(req.with_query("keyword=kw2")));
     assert_eq!(::json::<CrateList>(&mut response).crates.len(), 0);
 
-    ::new_category("cat1", "cat1").find_or_create(req.db_conn().unwrap()).unwrap();
-    ::new_category("cat1::bar", "cat1::bar").find_or_create(req.db_conn().unwrap()).unwrap();
+    ::new_category("Category 1", "cat1").find_or_create(req.db_conn().unwrap()).unwrap();
+    ::new_category("Category 1::Ba'r", "cat1::bar").find_or_create(req.db_conn().unwrap()).unwrap();
     Category::update_crate(req.db_conn().unwrap(), &krate, &["cat1"]).unwrap();
     Category::update_crate(req.db_conn().unwrap(), &krate2, &["cat1::bar"]).unwrap();
     let mut response = ok_resp!(middle.call(req.with_query("category=cat1")));