Skip to content

models/krate: Remove PaginationOptions dependency #10556

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 1 commit into from
Feb 12, 2025
Merged

models/krate: Remove PaginationOptions dependency #10556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/controllers/krate/rev_deps.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ pub async fn list_reverse_dependencies(

let krate = path.load_crate(&mut conn).await?;

let (rev_deps, total) = krate
.reverse_dependencies(&mut conn, pagination_options)
.await?;
let offset = pagination_options.offset().unwrap_or_default();
let limit = pagination_options.per_page;
let (rev_deps, total) = krate.reverse_dependencies(&mut conn, offset, limit).await?;

let rev_deps: Vec<_> = rev_deps
.into_iter()
Expand Down
7 changes: 3 additions & 4 deletions src/models/krate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use diesel_async::{AsyncConnection, AsyncPgConnection, RunQueryDsl};
use secrecy::SecretString;
use thiserror::Error;

use crate::controllers::helpers::pagination::*;
use crate::models::helpers::with_count::*;
use crate::models::version::TopVersions;
use crate::models::{
Expand Down Expand Up @@ -491,17 +490,17 @@ impl Crate {
pub(crate) async fn reverse_dependencies(
&self,
conn: &mut AsyncPgConnection,
options: PaginationOptions,
offset: i64,
limit: i64,
) -> QueryResult<(Vec<ReverseDependency>, i64)> {
use diesel::sql_query;
use diesel::sql_types::{BigInt, Integer};

let offset = options.offset().unwrap_or_default();
let rows: Vec<WithCount<ReverseDependency>> =
sql_query(include_str!("krate_reverse_dependencies.sql"))
.bind::<Integer, _>(self.id)
.bind::<BigInt, _>(offset)
.bind::<BigInt, _>(options.per_page)
.bind::<BigInt, _>(limit)
.load(conn)
.await?;

Expand Down