Merge pull request #12051 from Turbo87/select-returning

Add missing `.select()` and `.returning()` calls

Author: Turbo87

crates/crates_io_database/src/models/action.rs

@@ -54,7 +54,10 @@ pub struct VersionOwnerAction {
 
 impl VersionOwnerAction {
     pub async fn all(conn: &mut AsyncPgConnection) -> QueryResult<Vec<Self>> {
-        version_owner_actions::table.load(conn).await
+        version_owner_actions::table
+            .select(Self::as_select())
+            .load(conn)
+            .await
     }
 
     pub fn by_version<'a>(
@@ -100,6 +103,7 @@ impl NewVersionOwnerAction {
     pub async fn insert(&self, conn: &mut AsyncPgConnection) -> QueryResult<VersionOwnerAction> {
         diesel::insert_into(version_owner_actions::table)
             .values(self)
+            .returning(VersionOwnerAction::as_select())
             .get_result(conn)
             .await
     }

crates/crates_io_database/src/models/category.rs

@@ -55,6 +55,7 @@ impl Category {
             async move {
                 let categories: Vec<Category> = categories::table
                     .filter(categories::slug.eq_any(slugs))
+                    .select(Category::as_select())
                     .load(conn)
                     .await?;
 
@@ -400,6 +401,7 @@ mod tests {
             .unwrap();
 
         let cat: Category = Category::by_slug("cat1::sub1")
+            .select(Category::as_select())
             .first(&mut conn)
             .await
             .unwrap();

crates/crates_io_database/src/models/cloudfront_invalidation_queue.rs

@@ -39,6 +39,7 @@ impl CloudFrontInvalidationQueueItem {
         cloudfront_invalidation_queue::table
             .order(cloudfront_invalidation_queue::created_at.asc())
             .limit(limit)
+            .select(Self::as_select())
             .load(conn)
             .await
     }

crates/crates_io_database/src/models/keyword.rs

@@ -32,6 +32,7 @@ impl Keyword {
     pub async fn find_by_keyword(conn: &mut AsyncPgConnection, name: &str) -> QueryResult<Keyword> {
         keywords::table
             .filter(keywords::keyword.eq(lower(name)))
+            .select(Keyword::as_select())
             .first(conn)
             .await
     }
@@ -55,6 +56,7 @@ impl Keyword {
 
         keywords::table
             .filter(keywords::keyword.eq_any(&lowercase_names))
+            .select(Keyword::as_select())
             .load(conn)
             .await
     }

crates/crates_io_database/src/models/team.rs

@@ -45,6 +45,7 @@ impl NewTeam<'_> {
             .on_conflict(teams::github_id)
             .do_update()
             .set(self)
+            .returning(Team::as_returning())
             .get_result(conn)
             .await
     }

crates/crates_io_database/src/models/trustpub/gitlab_config.rs

@@ -73,6 +73,7 @@ mod tests {
         // Retrieve the config
         let retrieved_config = trustpub_configs_gitlab::table
             .filter(trustpub_configs_gitlab::id.eq(inserted_config.id))
+            .select(GitLabConfig::as_select())
             .first::<GitLabConfig>(&mut conn)
             .await
             .unwrap();

src/controllers/category.rs

@@ -97,7 +97,10 @@ pub async fn find_category(
 ) -> AppResult<Json<GetResponse>> {
     let mut conn = state.db_read().await?;
 
-    let cat: Category = Category::by_slug(&slug).first(&mut conn).await?;
+    let cat: Category = Category::by_slug(&slug)
+        .select(Category::as_select())
+        .first(&mut conn)
+        .await?;
     let (subcats, parents) = tokio::try_join!(
         cat.subcategories(&mut conn),
         cat.parent_categories(&mut conn).boxed(),

src/controllers/crate_owner_invitation.rs

@@ -196,7 +196,8 @@ async fn prepare_list(
             crate_owner_invitations::invited_user_id,
         ))
         // We fetch one element over the page limit to then detect whether there is a next page.
-        .limit(pagination.per_page + 1);
+        .limit(pagination.per_page + 1)
+        .select(CrateOwnerInvitation::as_select());
 
     // Load and paginate the results.
     let mut raw_invitations: Vec<CrateOwnerInvitation> = match pagination.page {

src/controllers/keyword.rs

@@ -53,7 +53,7 @@ pub async fn list_keywords(
 ) -> AppResult<Json<ListResponse>> {
     use crate::schema::keywords;
 
-    let mut query = keywords::table.into_boxed();
+    let mut query = keywords::table.select(Keyword::as_select()).into_boxed();
 
     query = match &params.sort {
         Some(sort) if sort == "crates" => query.order(keywords::crates_cnt.desc()),

src/controllers/summary.rs

@@ -118,6 +118,7 @@ pub async fn get_summary(state: AppState) -> AppResult<Json<SummaryResponse>> {
         keywords::table
             .order(keywords::crates_cnt.desc())
             .limit(10)
+            .select(Keyword::as_select())
             .load(&mut conn)
             .boxed(),
     )?;