Merge pull request #10005 from Turbo87/less-raw-sql

admin/delete_crate: Replace raw SQL with diesel subquery builder

Author: Turbo87

src/bin/crates-admin/delete_crate.rs

@@ -6,11 +6,12 @@ use crates_io::models::{NewDeletedCrate, User};
 use crates_io::schema::{crate_downloads, deleted_crates};
 use crates_io::worker::jobs;
 use crates_io::{db, schema::crates};
+use crates_io_database::schema::dependencies;
 use crates_io_worker::BackgroundJob;
-use diesel::dsl::sql;
+use diesel::dsl::{count_star, sql};
 use diesel::expression::SqlLiteral;
 use diesel::prelude::*;
-use diesel::sql_types::{Array, BigInt, Text};
+use diesel::sql_types::{Array, Text};
 use diesel_async::scoped_futures::ScopedFutureExt;
 use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
 use std::fmt::Display;
@@ -139,6 +140,7 @@ async fn delete_from_database(
 }
 
 #[derive(Debug, Clone, Queryable, Selectable)]
+#[diesel(check_for_backend(diesel::pg::Pg))]
 struct CrateInfo {
     #[diesel(select_expression = crates::columns::name)]
     name: String,
@@ -199,12 +201,10 @@ fn owners_subquery() -> SqlLiteral<Array<Text>> {
 /// "default version" per crate. However, it's good enough for our
 /// purposes here.
 #[diesel::dsl::auto_type]
-fn rev_deps_subquery() -> SqlLiteral<BigInt> {
-    sql(r#"
-       (
-            SELECT COUNT(*)
-            FROM dependencies
-            WHERE dependencies.crate_id = crates.id
-        )
-    "#)
+fn rev_deps_subquery() -> _ {
+    dependencies::table
+        .select(count_star())
+        .filter(dependencies::crate_id.eq(crates::id))
+        .single_value()
+        .assume_not_null()
 }