Inline NewCategory::create_or_update()

The function is only used in our test suite, the update behavior isn't actually needed there and the return value is also not used anywhere. This makes it possible to significantly simplify the function to the point where there is no point anymore to keep the function. Inlining it then also allows us to merge a couple of calls into single queries that insert multiple rows at once.

Author: Turbo87

src/models/category.rs

@@ -131,18 +131,6 @@ pub struct NewCategory<'a> {
     pub description: &'a str,
 }
 
-impl<'a> NewCategory<'a> {
-    /// Inserts the category into the database, or updates an existing one.
-    pub fn create_or_update(&self, conn: &mut impl Conn) -> QueryResult<Category> {
-        insert_into(categories::table)
-            .values(self)
-            .on_conflict(categories::slug)
-            .do_update()
-            .set(self)
-            .get_result(conn)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/tests/krate/publish/categories.rs

@@ -1,6 +1,8 @@
 use crate::tests::builders::PublishBuilder;
 use crate::tests::new_category;
 use crate::tests::util::{RequestHelper, TestApp};
+use crates_io_database::schema::categories;
+use diesel::{insert_into, RunQueryDsl};
 use googletest::prelude::*;
 use http::StatusCode;
 use insta::{assert_json_snapshot, assert_snapshot};
@@ -10,8 +12,9 @@ async fn good_categories() {
     let (app, _, _, token) = TestApp::full().with_token();
 
     app.db(|conn| {
-        new_category("Category 1", "cat1", "Category 1 crates")
-            .create_or_update(conn)
+        insert_into(categories::table)
+            .values(new_category("Category 1", "cat1", "Category 1 crates"))
+            .execute(conn)
             .unwrap();
     });
 

src/tests/routes/categories/get.rs

@@ -2,6 +2,8 @@ use crate::models::Category;
 use crate::tests::builders::CrateBuilder;
 use crate::tests::new_category;
 use crate::tests::util::{MockAnonymousUser, RequestHelper, TestApp};
+use crates_io_database::schema::categories;
+use diesel::{insert_into, RunQueryDsl};
 use insta::assert_json_snapshot;
 use serde_json::Value;
 
@@ -15,10 +17,12 @@ async fn show() {
 
     // Create a category and a subcategory
     app.db(|conn| {
-        assert_ok!(new_category("Foo Bar", "foo-bar", "Foo Bar crates").create_or_update(conn));
-        assert_ok!(
-            new_category("Foo Bar::Baz", "foo-bar::baz", "Baz crates").create_or_update(conn)
-        );
+        let cats = vec![
+            new_category("Foo Bar", "foo-bar", "Foo Bar crates"),
+            new_category("Foo Bar::Baz", "foo-bar::baz", "Baz crates"),
+        ];
+
+        assert_ok!(insert_into(categories::table).values(cats).execute(conn));
     });
 
     // The category and its subcategories should be in the json
@@ -41,10 +45,12 @@ async fn update_crate() {
     let user = user.as_model();
 
     let krate = app.db(|conn| {
-        assert_ok!(new_category("cat1", "cat1", "Category 1 crates").create_or_update(conn));
-        assert_ok!(
-            new_category("Category 2", "category-2", "Category 2 crates").create_or_update(conn)
-        );
+        let cats = vec![
+            new_category("cat1", "cat1", "Category 1 crates"),
+            new_category("Category 2", "category-2", "Category 2 crates"),
+        ];
+
+        assert_ok!(insert_into(categories::table).values(cats).execute(conn));
 
         CrateBuilder::new("foo_crate", user.id).expect_build(conn)
     });
@@ -101,7 +107,10 @@ async fn update_crate() {
 
     // Add a category and its subcategory
     app.db(|conn| {
-        assert_ok!(new_category("cat1::bar", "cat1::bar", "bar crates").create_or_update(conn));
+        assert_ok!(insert_into(categories::table)
+            .values(new_category("cat1::bar", "cat1::bar", "bar crates"))
+            .execute(conn));
+
         Category::update_crate(conn, &krate, &["cat1", "cat1::bar"]).unwrap();
     });
 

src/tests/routes/categories/list.rs

@@ -1,5 +1,7 @@
 use crate::tests::new_category;
 use crate::tests::util::{RequestHelper, TestApp};
+use crates_io_database::schema::categories;
+use diesel::{insert_into, RunQueryDsl};
 use insta::assert_json_snapshot;
 use serde_json::Value;
 
@@ -13,11 +15,14 @@ async fn index() {
 
     // Create a category and a subcategory
     app.db(|conn| {
-        new_category("foo", "foo", "Foo crates")
-            .create_or_update(conn)
-            .unwrap();
-        new_category("foo::bar", "foo::bar", "Bar crates")
-            .create_or_update(conn)
+        let cats = vec![
+            new_category("foo", "foo", "Foo crates"),
+            new_category("foo::bar", "foo::bar", "Bar crates"),
+        ];
+
+        insert_into(categories::table)
+            .values(cats)
+            .execute(conn)
             .unwrap();
     });
 

src/tests/routes/category_slugs/list.rs

@@ -1,17 +1,22 @@
 use crate::tests::new_category;
 use crate::tests::util::{RequestHelper, TestApp};
+use crates_io_database::schema::categories;
+use diesel::{insert_into, RunQueryDsl};
 use insta::assert_json_snapshot;
 use serde_json::Value;
 
 #[tokio::test(flavor = "multi_thread")]
 async fn category_slugs_returns_all_slugs_in_alphabetical_order() {
     let (app, anon) = TestApp::init().empty();
     app.db(|conn| {
-        new_category("Foo", "foo", "For crates that foo")
-            .create_or_update(conn)
-            .unwrap();
-        new_category("Bar", "bar", "For crates that bar")
-            .create_or_update(conn)
+        let cats = vec![
+            new_category("Foo", "foo", "For crates that foo"),
+            new_category("Bar", "bar", "For crates that bar"),
+        ];
+
+        insert_into(categories::table)
+            .values(cats)
+            .execute(conn)
             .unwrap();
     });
 

src/tests/routes/crates/list.rs

@@ -3,6 +3,7 @@ use crate::schema::crates;
 use crate::tests::builders::{CrateBuilder, VersionBuilder};
 use crate::tests::util::{RequestHelper, TestApp};
 use crate::tests::{new_category, new_user};
+use crates_io_database::schema::categories;
 use diesel::{dsl::*, prelude::*, update};
 use googletest::prelude::*;
 use http::StatusCode;
@@ -154,12 +155,16 @@ async fn index_queries() {
     }
 
     app.db(|conn| {
-        new_category("Category 1", "cat1", "Category 1 crates")
-            .create_or_update(conn)
-            .unwrap();
-        new_category("Category 1::Ba'r", "cat1::bar", "Ba'r crates")
-            .create_or_update(conn)
+        let cats = vec![
+            new_category("Category 1", "cat1", "Category 1 crates"),
+            new_category("Category 1::Ba'r", "cat1::bar", "Ba'r crates"),
+        ];
+
+        insert_into(categories::table)
+            .values(cats)
+            .execute(conn)
             .unwrap();
+
         Category::update_crate(conn, &krate, &["cat1"]).unwrap();
         Category::update_crate(conn, &krate2, &["cat1::bar"]).unwrap();
     });
@@ -873,9 +878,11 @@ async fn test_default_sort_recent() {
     }
 
     app.db(|conn| {
-        new_category("Animal", "animal", "animal crates")
-            .create_or_update(conn)
+        insert_into(categories::table)
+            .values(new_category("Animal", "animal", "animal crates"))
+            .execute(conn)
             .unwrap();
+
         Category::update_crate(conn, &green_crate, &["animal"]).unwrap();
         Category::update_crate(conn, &potato_crate, &["animal"]).unwrap();
     });

src/tests/routes/summary.rs

@@ -4,7 +4,8 @@ use crate::tests::new_category;
 use crate::tests::util::{RequestHelper, TestApp};
 use crate::views::{EncodableCategory, EncodableCrate, EncodableKeyword};
 use chrono::Utc;
-use diesel::{update, Connection, ExpressionMethods, RunQueryDsl};
+use crates_io_database::schema::categories;
+use diesel::{insert_into, update, Connection, ExpressionMethods, RunQueryDsl};
 
 #[derive(Deserialize)]
 struct SummaryResponse {
@@ -33,8 +34,9 @@ async fn summary_new_crates() {
             let now_ = Utc::now().naive_utc();
             let now_plus_two = now_ + chrono::Duration::seconds(2);
 
-            new_category("Category 1", "cat1", "Category 1 crates")
-                .create_or_update(conn)
+            insert_into(categories::table)
+                .values(new_category("Category 1", "cat1", "Category 1 crates"))
+                .execute(conn)
                 .unwrap();
 
             CrateBuilder::new("some_downloads", user.id)