eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Upgrade to sqlx 0.7.2 (#736)

Browse Source 
* Update to sqlx 0.7.2

* Somehow missed one (and remove queries from other branch)
This commit is contained in:
Jackson Kruger
2023-10-23 14:30:39 -05:00
committed by GitHub
parent 9a8f3d7bad
commit 8803e11945
358 changed files with 8352 additions and 7467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/auth/flows.rs
View File

@@ -804,7 +804,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id.and_then(|x| x.parse::<i64>().ok())
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
AuthProvider::Discord => {
@@ -817,7 +817,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id.and_then(|x| x.parse::<i64>().ok())
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
AuthProvider::Microsoft => {
@@ -830,7 +830,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id,
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
AuthProvider::GitLab => {
@@ -843,7 +843,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id.and_then(|x| x.parse::<i64>().ok())
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
AuthProvider::Google => {
@@ -856,7 +856,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id,
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
AuthProvider::Steam => {
@@ -869,7 +869,7 @@ impl AuthProvider {
user_id as crate::database::models::UserId,
id.and_then(|x| x.parse::<i64>().ok())
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
}
}
@@ -1515,7 +1515,7 @@ async fn validate_2fa_code(
user_id as crate::database::models::ids::UserId,
code as i64,
)
.execute(&mut *transaction)
.execute(&mut **transaction)
.await?;
crate::database::models::User::clear_caches(&[(user_id, None)], redis).await?;
@@ -2265,7 +2265,7 @@ pub async fn link_trolley(
RecipientStatus::Incomplete.as_str(),
user.id.0 as i64,
)
.execute(&mut transaction)
.execute(&mut *transaction)
.await?;
transaction.commit().await?;

2
src/auth/session.rs
View File

@@ -112,7 +112,7 @@ pub async fn issue_session(
.insert(transaction)
.await?;
let session = DBSession::get_id(id, &mut *transaction, redis)
let session = DBSession::get_id(id, &mut **transaction, redis)
.await?
.ok_or_else(|| AuthenticationError::InvalidCredentials)?;