caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix transaction metrics (#1165)

Browse Source
This commit is contained in:
Marco Napetti 2022-10-27 19:00:04 +02:00 committed by GitHub
parent 2e398716de
commit 9f2a6dc40b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/database/transaction.rs
View File

@ -310,23 +310,29 @@ impl ConnectionTrait for DatabaseTransaction {
#[cfg(feature = "sqlx-mysql")] #[cfg(feature = "sqlx-mysql")]
InnerConnection::MySql(conn) => { InnerConnection::MySql(conn) => {
let query = crate::driver::sqlx_mysql::sqlx_query(&stmt); let query = crate::driver::sqlx_mysql::sqlx_query(&stmt);
Self::map_err_ignore_not_found( crate::metric::metric!(self.metric_callback, &stmt, {
query.fetch_one(conn).await.map(|row| Some(row.into())), Self::map_err_ignore_not_found(
) query.fetch_one(conn).await.map(|row| Some(row.into())),
)
})
} }
#[cfg(feature = "sqlx-postgres")] #[cfg(feature = "sqlx-postgres")]
InnerConnection::Postgres(conn) => { InnerConnection::Postgres(conn) => {
let query = crate::driver::sqlx_postgres::sqlx_query(&stmt); let query = crate::driver::sqlx_postgres::sqlx_query(&stmt);
Self::map_err_ignore_not_found( crate::metric::metric!(self.metric_callback, &stmt, {
query.fetch_one(conn).await.map(|row| Some(row.into())), Self::map_err_ignore_not_found(
) query.fetch_one(conn).await.map(|row| Some(row.into())),
)
})
} }
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
InnerConnection::Sqlite(conn) => { InnerConnection::Sqlite(conn) => {
let query = crate::driver::sqlx_sqlite::sqlx_query(&stmt); let query = crate::driver::sqlx_sqlite::sqlx_query(&stmt);
Self::map_err_ignore_not_found( crate::metric::metric!(self.metric_callback, &stmt, {
query.fetch_one(conn).await.map(|row| Some(row.into())), Self::map_err_ignore_not_found(
) query.fetch_one(conn).await.map(|row| Some(row.into())),
)
})
} }
#[cfg(feature = "mock")] #[cfg(feature = "mock")]
InnerConnection::Mock(conn) => return conn.query_one(stmt), InnerConnection::Mock(conn) => return conn.query_one(stmt),
@ -344,29 +350,35 @@ impl ConnectionTrait for DatabaseTransaction {
#[cfg(feature = "sqlx-mysql")] #[cfg(feature = "sqlx-mysql")]
InnerConnection::MySql(conn) => { InnerConnection::MySql(conn) => {
let query = crate::driver::sqlx_mysql::sqlx_query(&stmt); let query = crate::driver::sqlx_mysql::sqlx_query(&stmt);
query crate::metric::metric!(self.metric_callback, &stmt, {
.fetch_all(conn) query
.await .fetch_all(conn)
.map(|rows| rows.into_iter().map(|r| r.into()).collect()) .await
.map_err(sqlx_error_to_query_err) .map(|rows| rows.into_iter().map(|r| r.into()).collect())
.map_err(sqlx_error_to_query_err)
})
} }
#[cfg(feature = "sqlx-postgres")] #[cfg(feature = "sqlx-postgres")]
InnerConnection::Postgres(conn) => { InnerConnection::Postgres(conn) => {
let query = crate::driver::sqlx_postgres::sqlx_query(&stmt); let query = crate::driver::sqlx_postgres::sqlx_query(&stmt);
query crate::metric::metric!(self.metric_callback, &stmt, {
.fetch_all(conn) query
.await .fetch_all(conn)
.map(|rows| rows.into_iter().map(|r| r.into()).collect()) .await
.map_err(sqlx_error_to_query_err) .map(|rows| rows.into_iter().map(|r| r.into()).collect())
.map_err(sqlx_error_to_query_err)
})
} }
#[cfg(feature = "sqlx-sqlite")] #[cfg(feature = "sqlx-sqlite")]
InnerConnection::Sqlite(conn) => { InnerConnection::Sqlite(conn) => {
let query = crate::driver::sqlx_sqlite::sqlx_query(&stmt); let query = crate::driver::sqlx_sqlite::sqlx_query(&stmt);
query crate::metric::metric!(self.metric_callback, &stmt, {
.fetch_all(conn) query
.await .fetch_all(conn)
.map(|rows| rows.into_iter().map(|r| r.into()).collect()) .await
.map_err(sqlx_error_to_query_err) .map(|rows| rows.into_iter().map(|r| r.into()).collect())
.map_err(sqlx_error_to_query_err)
})
} }
#[cfg(feature = "mock")] #[cfg(feature = "mock")]
InnerConnection::Mock(conn) => return conn.query_all(stmt), InnerConnection::Mock(conn) => return conn.query_all(stmt),