Skip to content

admin/delete_crate: Replace raw SQL with diesel subquery builder #10005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2024
Merged

admin/delete_crate: Replace raw SQL with diesel subquery builder #10005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0adfb6d
admin/delete_crate: Replace raw SQL with `diesel` subquery builder
Turbo87 Nov 19, 2024
c16a56e
admin/delete_crate: Add missing `#[diesel(check_for_backend(diesel::p…
Turbo87 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/bin/crates-admin/delete_crate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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()
}