You've already forked AstralRinth
forked from didirus/AstralRinth
Upgrade to sqlx 0.7.2 (#736)
* Update to sqlx 0.7.2 * Somehow missed one (and remove queries from other branch)
This commit is contained in:
@@ -35,7 +35,7 @@ impl CollectionBuilder {
|
||||
status: self.status,
|
||||
projects: self.projects,
|
||||
};
|
||||
collection_struct.insert(&mut *transaction).await?;
|
||||
collection_struct.insert(transaction).await?;
|
||||
|
||||
Ok(self.collection_id)
|
||||
}
|
||||
@@ -78,7 +78,7 @@ impl Collection {
|
||||
self.icon_url.as_ref(),
|
||||
self.status.to_string(),
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let (collection_ids, project_ids): (Vec<_>, Vec<_>) =
|
||||
@@ -92,7 +92,7 @@ impl Collection {
|
||||
&collection_ids[..],
|
||||
&project_ids[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -103,7 +103,7 @@ impl Collection {
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
redis: &RedisPool,
|
||||
) -> Result<Option<()>, DatabaseError> {
|
||||
let collection = Self::get(id, &mut *transaction, redis).await?;
|
||||
let collection = Self::get(id, &mut **transaction, redis).await?;
|
||||
|
||||
if let Some(collection) = collection {
|
||||
sqlx::query!(
|
||||
@@ -113,7 +113,7 @@ impl Collection {
|
||||
",
|
||||
id as CollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -123,7 +123,7 @@ impl Collection {
|
||||
",
|
||||
id as CollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
models::Collection::clear_cache(collection.id, redis).await?;
|
||||
|
||||
@@ -21,7 +21,7 @@ macro_rules! generate_ids {
|
||||
// Check if ID is unique
|
||||
loop {
|
||||
let results = sqlx::query!($select_stmnt, id as i64)
|
||||
.fetch_one(&mut *con)
|
||||
.fetch_one(&mut **con)
|
||||
.await?;
|
||||
|
||||
if results.exists.unwrap_or(true) || censor.check(&*to_base62(id)) {
|
||||
|
||||
@@ -48,7 +48,7 @@ impl Image {
|
||||
self.thread_message_id.map(|x| x.0),
|
||||
self.report_id.map(|x| x.0),
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -59,7 +59,7 @@ impl Image {
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
redis: &RedisPool,
|
||||
) -> Result<Option<()>, DatabaseError> {
|
||||
let image = Self::get(id, &mut *transaction, redis).await?;
|
||||
let image = Self::get(id, &mut **transaction, redis).await?;
|
||||
|
||||
if let Some(image) = image {
|
||||
sqlx::query!(
|
||||
@@ -69,7 +69,7 @@ impl Image {
|
||||
",
|
||||
id as ImageId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Image::clear_cache(image.id, redis).await?;
|
||||
@@ -134,7 +134,7 @@ impl Image {
|
||||
report_id.map(|x| x.0),
|
||||
|
||||
)
|
||||
.fetch_many(transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async {
|
||||
Ok(e.right().map(|row| {
|
||||
let id = ImageId(row.id);
|
||||
|
||||
@@ -88,7 +88,7 @@ impl Notification {
|
||||
&user_ids[..],
|
||||
&bodies[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Notification::clear_user_notifications_cache(
|
||||
@@ -262,7 +262,7 @@ impl Notification {
|
||||
",
|
||||
¬ification_ids_parsed
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|x| UserId(x.user_id))) })
|
||||
.try_collect::<Vec<_>>()
|
||||
.await?;
|
||||
@@ -294,7 +294,7 @@ impl Notification {
|
||||
",
|
||||
¬ification_ids_parsed
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let affected_users = sqlx::query!(
|
||||
@@ -305,7 +305,7 @@ impl Notification {
|
||||
",
|
||||
¬ification_ids_parsed
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|x| UserId(x.user_id))) })
|
||||
.try_collect::<Vec<_>>()
|
||||
.await?;
|
||||
|
||||
@@ -46,7 +46,7 @@ impl Organization {
|
||||
self.icon_url,
|
||||
self.color.map(|x| x as i32),
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -252,7 +252,7 @@ impl Organization {
|
||||
) -> Result<Option<()>, super::DatabaseError> {
|
||||
use futures::TryStreamExt;
|
||||
|
||||
let organization = Self::get_id(id, &mut *transaction, redis).await?;
|
||||
let organization = Self::get_id(id, &mut **transaction, redis).await?;
|
||||
|
||||
if let Some(organization) = organization {
|
||||
let projects: Vec<ProjectId> = sqlx::query!(
|
||||
@@ -263,7 +263,7 @@ impl Organization {
|
||||
",
|
||||
id as OrganizationId,
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|m| ProjectId(m.id))) })
|
||||
.try_collect::<Vec<ProjectId>>()
|
||||
.await?;
|
||||
@@ -282,7 +282,7 @@ impl Organization {
|
||||
",
|
||||
id as OrganizationId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
TeamMember::clear_cache(organization.team_id, redis).await?;
|
||||
@@ -294,7 +294,7 @@ impl Organization {
|
||||
",
|
||||
organization.team_id as TeamId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -304,7 +304,7 @@ impl Organization {
|
||||
",
|
||||
organization.team_id as TeamId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -45,7 +45,7 @@ impl PersonalAccessToken {
|
||||
self.user_id as UserId,
|
||||
self.expires
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -259,7 +259,7 @@ impl PersonalAccessToken {
|
||||
",
|
||||
id as PatId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -42,7 +42,7 @@ impl DonationUrl {
|
||||
&platform_ids[..],
|
||||
&urls[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -99,7 +99,7 @@ impl GalleryItem {
|
||||
&descriptions[..] as &[Option<String>],
|
||||
&orderings[..]
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -131,7 +131,7 @@ impl ModCategory {
|
||||
&category_ids[..],
|
||||
&is_additionals[..]
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -332,7 +332,7 @@ impl Project {
|
||||
self.color.map(|x| x as i32),
|
||||
self.monetization_status.as_str(),
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -343,7 +343,7 @@ impl Project {
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
redis: &RedisPool,
|
||||
) -> Result<Option<()>, DatabaseError> {
|
||||
let project = Self::get_id(id, &mut *transaction, redis).await?;
|
||||
let project = Self::get_id(id, &mut **transaction, redis).await?;
|
||||
|
||||
if let Some(project) = project {
|
||||
Project::clear_cache(id, project.inner.slug, Some(true), redis).await?;
|
||||
@@ -355,7 +355,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -365,7 +365,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -375,7 +375,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -385,7 +385,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -395,7 +395,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -405,7 +405,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
for version in project.versions {
|
||||
@@ -418,7 +418,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -429,7 +429,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
models::Thread::remove_full(project.thread_id, transaction).await?;
|
||||
@@ -441,7 +441,7 @@ impl Project {
|
||||
",
|
||||
id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
models::TeamMember::clear_cache(project.inner.team_id, redis).await?;
|
||||
@@ -454,7 +454,7 @@ impl Project {
|
||||
",
|
||||
project.inner.team_id as TeamId,
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|x| UserId(x.user_id))) })
|
||||
.try_collect::<Vec<_>>()
|
||||
.await?;
|
||||
@@ -468,7 +468,7 @@ impl Project {
|
||||
",
|
||||
project.inner.team_id as TeamId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
@@ -787,7 +787,7 @@ impl Project {
|
||||
id as ProjectId,
|
||||
&*crate::models::projects::VersionStatus::iterator().filter(|x| x.is_hidden()).map(|x| x.to_string()).collect::<Vec<String>>()
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -812,7 +812,7 @@ impl Project {
|
||||
id as ProjectId,
|
||||
&*crate::models::projects::VersionStatus::iterator().filter(|x| x.is_hidden()).map(|x| x.to_string()).collect::<Vec<String>>()
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
|
||||
@@ -50,7 +50,7 @@ impl Report {
|
||||
self.body,
|
||||
self.reporter as UserId
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -117,7 +117,7 @@ impl Report {
|
||||
",
|
||||
id as ReportId
|
||||
)
|
||||
.fetch_one(&mut *transaction)
|
||||
.fetch_one(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
if !result.exists.unwrap_or(false) {
|
||||
@@ -131,7 +131,7 @@ impl Report {
|
||||
",
|
||||
id as ReportId
|
||||
)
|
||||
.fetch_optional(&mut *transaction)
|
||||
.fetch_optional(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
if let Some(thread_id) = thread_id {
|
||||
@@ -145,7 +145,7 @@ impl Report {
|
||||
",
|
||||
id as ReportId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -28,7 +28,7 @@ impl SessionBuilder {
|
||||
&self,
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
) -> Result<SessionId, DatabaseError> {
|
||||
let id = generate_session_id(&mut *transaction).await?;
|
||||
let id = generate_session_id(transaction).await?;
|
||||
|
||||
sqlx::query!(
|
||||
"
|
||||
@@ -51,7 +51,7 @@ impl SessionBuilder {
|
||||
self.ip,
|
||||
self.user_agent,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(id)
|
||||
@@ -302,7 +302,7 @@ impl Session {
|
||||
",
|
||||
id as SessionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -27,7 +27,7 @@ impl TeamBuilder {
|
||||
self,
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
) -> Result<TeamId, super::DatabaseError> {
|
||||
let team_id = generate_team_id(&mut *transaction).await?;
|
||||
let team_id = generate_team_id(transaction).await?;
|
||||
|
||||
let team = Team { id: team_id };
|
||||
|
||||
@@ -38,12 +38,12 @@ impl TeamBuilder {
|
||||
",
|
||||
team.id as TeamId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let mut team_member_ids = Vec::new();
|
||||
for _ in self.members.iter() {
|
||||
team_member_ids.push(generate_team_member_id(&mut *transaction).await?.0);
|
||||
team_member_ids.push(generate_team_member_id(transaction).await?.0);
|
||||
}
|
||||
let TeamBuilder { members } = self;
|
||||
let (
|
||||
@@ -94,7 +94,7 @@ impl TeamBuilder {
|
||||
&payouts_splits[..],
|
||||
&orderings[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(team_id)
|
||||
@@ -411,7 +411,7 @@ impl TeamMember {
|
||||
self.organization_permissions.map(|p| p.bits() as i64),
|
||||
self.accepted,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -431,7 +431,7 @@ impl TeamMember {
|
||||
user_id as UserId,
|
||||
crate::models::teams::OWNER_ROLE,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -460,7 +460,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -475,7 +475,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -490,7 +490,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -505,7 +505,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
}
|
||||
@@ -521,7 +521,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -536,7 +536,7 @@ impl TeamMember {
|
||||
id as TeamId,
|
||||
user_id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ impl ThreadMessageBuilder {
|
||||
&self,
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
) -> Result<ThreadMessageId, DatabaseError> {
|
||||
let thread_message_id = generate_thread_message_id(&mut *transaction).await?;
|
||||
let thread_message_id = generate_thread_message_id(transaction).await?;
|
||||
|
||||
sqlx::query!(
|
||||
"
|
||||
@@ -60,7 +60,7 @@ impl ThreadMessageBuilder {
|
||||
serde_json::value::to_value(self.body.clone())?,
|
||||
self.thread_id as ThreadId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(thread_message_id)
|
||||
@@ -87,7 +87,7 @@ impl ThreadBuilder {
|
||||
self.project_id.map(|x| x.0),
|
||||
self.report_id.map(|x| x.0),
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let (thread_ids, members): (Vec<_>, Vec<_>) =
|
||||
@@ -102,7 +102,7 @@ impl ThreadBuilder {
|
||||
&thread_ids[..],
|
||||
&members[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(thread_id)
|
||||
@@ -179,7 +179,7 @@ impl Thread {
|
||||
",
|
||||
id as ThreadId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
sqlx::query!(
|
||||
"
|
||||
@@ -188,7 +188,7 @@ impl Thread {
|
||||
",
|
||||
id as ThreadId
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
sqlx::query!(
|
||||
"
|
||||
@@ -197,7 +197,7 @@ impl Thread {
|
||||
",
|
||||
id as ThreadId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
@@ -264,7 +264,7 @@ impl ThreadMessage {
|
||||
id as ThreadMessageId,
|
||||
serde_json::to_value(MessageBody::Deleted).unwrap_or(serde_json::json!({}))
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -77,7 +77,7 @@ impl User {
|
||||
self.email_verified,
|
||||
self.password,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -394,7 +394,7 @@ impl User {
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
redis: &RedisPool,
|
||||
) -> Result<Option<()>, DatabaseError> {
|
||||
let user = Self::get_id(id, &mut *transaction, redis).await?;
|
||||
let user = Self::get_id(id, &mut **transaction, redis).await?;
|
||||
|
||||
if let Some(delete_user) = user {
|
||||
User::clear_caches(&[(id, Some(delete_user.username))], redis).await?;
|
||||
@@ -411,7 +411,7 @@ impl User {
|
||||
id as UserId,
|
||||
crate::models::teams::OWNER_ROLE
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|m| ProjectId(m.id))) })
|
||||
.try_collect::<Vec<ProjectId>>()
|
||||
.await?;
|
||||
@@ -432,7 +432,7 @@ impl User {
|
||||
id as UserId,
|
||||
crate::models::teams::OWNER_ROLE
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -445,7 +445,7 @@ impl User {
|
||||
deleted_user as UserId,
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
use futures::TryStreamExt;
|
||||
@@ -456,7 +456,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.fetch_many(&mut *transaction)
|
||||
.fetch_many(&mut **transaction)
|
||||
.try_filter_map(|e| async { Ok(e.right().map(|m| m.id)) })
|
||||
.try_collect::<Vec<i64>>()
|
||||
.await?;
|
||||
@@ -468,7 +468,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -478,7 +478,7 @@ impl User {
|
||||
",
|
||||
¬ifications
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -488,7 +488,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -498,7 +498,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -508,7 +508,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -518,7 +518,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -528,7 +528,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -540,7 +540,7 @@ impl User {
|
||||
id as UserId,
|
||||
deleted_user as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -550,7 +550,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -560,7 +560,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -570,7 +570,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -580,7 +580,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -590,7 +590,7 @@ impl User {
|
||||
",
|
||||
id as UserId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(Some(()))
|
||||
|
||||
@@ -81,7 +81,7 @@ impl DependencyBuilder {
|
||||
&project_ids[..] as &[Option<i64>],
|
||||
&filenames[..] as &[Option<String>],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -100,7 +100,7 @@ impl DependencyBuilder {
|
||||
",
|
||||
version_id as VersionId,
|
||||
)
|
||||
.fetch_optional(&mut *transaction)
|
||||
.fetch_optional(&mut **transaction)
|
||||
.await?
|
||||
.map(|x| ProjectId(x.mod_id))
|
||||
} else {
|
||||
@@ -125,7 +125,7 @@ impl VersionFileBuilder {
|
||||
version_id: VersionId,
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
) -> Result<FileId, DatabaseError> {
|
||||
let file_id = generate_file_id(&mut *transaction).await?;
|
||||
let file_id = generate_file_id(transaction).await?;
|
||||
|
||||
let (file_ids, version_ids, urls, filenames, primary, sizes, file_types): (
|
||||
Vec<_>,
|
||||
@@ -162,7 +162,7 @@ impl VersionFileBuilder {
|
||||
&sizes[..],
|
||||
&file_types[..] as &[Option<String>],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let (file_ids, algorithms, hashes): (Vec<_>, Vec<_>, Vec<_>) = version_files
|
||||
@@ -182,7 +182,7 @@ impl VersionFileBuilder {
|
||||
&algorithms[..],
|
||||
&hashes[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(file_id)
|
||||
@@ -216,7 +216,7 @@ impl VersionBuilder {
|
||||
requested_status: self.requested_status,
|
||||
};
|
||||
|
||||
version.insert(&mut *transaction).await?;
|
||||
version.insert(transaction).await?;
|
||||
|
||||
sqlx::query!(
|
||||
"
|
||||
@@ -226,7 +226,7 @@ impl VersionBuilder {
|
||||
",
|
||||
self.project_id as ProjectId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
let VersionBuilder {
|
||||
@@ -245,13 +245,13 @@ impl VersionBuilder {
|
||||
.iter()
|
||||
.map(|l| LoaderVersion::new(*l, version_id))
|
||||
.collect_vec();
|
||||
LoaderVersion::insert_many(loader_versions, &mut *transaction).await?;
|
||||
LoaderVersion::insert_many(loader_versions, transaction).await?;
|
||||
|
||||
let game_version_versions = game_versions
|
||||
.iter()
|
||||
.map(|v| VersionVersion::new(*v, version_id))
|
||||
.collect_vec();
|
||||
VersionVersion::insert_many(game_version_versions, &mut *transaction).await?;
|
||||
VersionVersion::insert_many(game_version_versions, transaction).await?;
|
||||
|
||||
Ok(self.version_id)
|
||||
}
|
||||
@@ -280,7 +280,7 @@ impl LoaderVersion {
|
||||
&loader_ids[..],
|
||||
&version_ids[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -310,7 +310,7 @@ impl VersionVersion {
|
||||
&game_version_ids[..],
|
||||
&version_ids[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -364,7 +364,7 @@ impl Version {
|
||||
self.featured,
|
||||
self.status.as_str()
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
@@ -375,7 +375,7 @@ impl Version {
|
||||
redis: &RedisPool,
|
||||
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||
) -> Result<Option<()>, DatabaseError> {
|
||||
let result = Self::get(id, &mut *transaction, redis).await?;
|
||||
let result = Self::get(id, &mut **transaction, redis).await?;
|
||||
|
||||
let result = if let Some(result) = result {
|
||||
result
|
||||
@@ -392,7 +392,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -402,7 +402,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -412,7 +412,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -426,7 +426,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -436,7 +436,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
// Sync dependencies
|
||||
@@ -447,7 +447,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.fetch_one(&mut *transaction)
|
||||
.fetch_one(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -459,7 +459,7 @@ impl Version {
|
||||
id as VersionId,
|
||||
project_id.mod_id,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -467,7 +467,7 @@ impl Version {
|
||||
DELETE FROM dependencies WHERE mod_dependency_id = NULL AND dependency_id = NULL AND dependency_file_name = NULL
|
||||
",
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -476,7 +476,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
// delete version
|
||||
@@ -487,7 +487,7 @@ impl Version {
|
||||
",
|
||||
id as VersionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut **transaction)
|
||||
.await?;
|
||||
|
||||
crate::database::models::Project::update_game_versions(
|
||||
|
||||
Reference in New Issue
Block a user