Add SQLx operation tracing (#5223)
* wip: vendor sqlx-tracing * (compiles) standardize pg types used * more standardization * general log message improvements * wip: improve sqlx-tracing architecture * unify sqlx::Executor type * wip: try fix sqlx tracing * wip: sqlx-tracing compiles * so close * it compiles * fix ci
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
use crate::auth::checks::is_visible_collection;
|
||||
use crate::auth::{filter_visible_collections, get_user_from_headers};
|
||||
use crate::database::PgPool;
|
||||
use crate::database::models::{
|
||||
collection_item, generate_collection_id, project_item,
|
||||
};
|
||||
@@ -24,7 +25,6 @@ use chrono::Utc;
|
||||
use eyre::eyre;
|
||||
use itertools::Itertools;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::PgPool;
|
||||
use std::sync::Arc;
|
||||
use validator::Validate;
|
||||
|
||||
@@ -96,7 +96,7 @@ pub async fn collection_create(
|
||||
|
||||
let initial_project_ids = project_item::DBProject::get_many(
|
||||
&collection_create_data.projects,
|
||||
&mut *transaction,
|
||||
&mut transaction,
|
||||
&redis,
|
||||
)
|
||||
.await?
|
||||
@@ -274,7 +274,7 @@ pub async fn collection_edit(
|
||||
name.trim(),
|
||||
id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -288,7 +288,7 @@ pub async fn collection_edit(
|
||||
description.as_ref(),
|
||||
id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -311,7 +311,7 @@ pub async fn collection_edit(
|
||||
status.to_string(),
|
||||
id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ pub async fn collection_edit(
|
||||
",
|
||||
collection_item.id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
let collection_item_ids = new_project_ids
|
||||
@@ -352,7 +352,7 @@ pub async fn collection_edit(
|
||||
&collection_item_ids[..],
|
||||
&validated_project_ids[..],
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
sqlx::query!(
|
||||
@@ -363,7 +363,7 @@ pub async fn collection_edit(
|
||||
",
|
||||
collection_item.id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
}
|
||||
|
||||
@@ -458,7 +458,7 @@ pub async fn collection_icon_edit(
|
||||
upload_result.color.map(|x| x as i32),
|
||||
collection_item.id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
transaction.commit().await?;
|
||||
@@ -517,7 +517,7 @@ pub async fn delete_collection_icon(
|
||||
",
|
||||
collection_item.id as database::models::ids::DBCollectionId,
|
||||
)
|
||||
.execute(&mut *transaction)
|
||||
.execute(&mut transaction)
|
||||
.await?;
|
||||
|
||||
transaction.commit().await?;
|
||||
|
||||
Reference in New Issue
Block a user