Skip to content
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.

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

switch to using sqlx::query! macro in web::features #2428

Merged
merged 1 commit into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 10 additions & 9 deletions src/web/features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use crate::{
use anyhow::anyhow;
use axum::{extract::Path, response::IntoResponse};
use serde::Serialize;
use sqlx::Row as _;
use std::collections::{HashMap, VecDeque};

const DEFAULT_NAME: &str = "default";
Expand Down Expand Up @@ -57,22 +56,24 @@ pub(crate) async fn build_features_handler(

let metadata = MetaData::from_crate(&mut conn, &name, &version, &version_or_latest).await?;

let row = sqlx::query(
"SELECT releases.features FROM releases
INNER JOIN crates ON crates.id = releases.crate_id
WHERE crates.name = $1 AND releases.version = $2",
let row = sqlx::query!(
r#"
SELECT releases.features as "features?: Vec<Feature>"
FROM releases
INNER JOIN crates ON crates.id = releases.crate_id
WHERE crates.name = $1 AND releases.version = $2"#,
name,
version
)
.bind(&name)
.bind(&version)
.fetch_optional(&mut *conn)
.await?
.ok_or_else(|| anyhow!("missing release"))?;

let mut features = None;
let mut default_len = 0;

if let Some(raw) = row.get(0) {
let result = order_features_and_count_default_len(raw);
if let Some(raw_features) = row.features {
let result = order_features_and_count_default_len(raw_features);
features = Some(result.0);
default_len = result.1;
}
Expand Down
Loading