feat: Logging DB queries

create-rust-app/Cargo.toml

@@ -32,6 +32,7 @@ diesel = { version = "2.1.0", default-features = false, features = [
   "chrono",
 ] } # + plugin_dev, plugin_auth
 once_cell = "1.17.1"
+diesel_logger = "0.3.0"
 
 ##
 ## Database

create-rust-app/src/auth/controller.rs

@@ -126,7 +126,7 @@ pub fn get_sessions(
     auth: &Auth,
     info: &PaginationParams,
 ) -> Result<UserSessionResponse, (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let sessions = UserSession::read_all(&mut db, info, auth.user_id);
 
@@ -178,7 +178,7 @@ pub fn destroy_session(
     auth: &Auth,
     item_id: ID,
 ) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let user_session = UserSession::read(&mut db, item_id);
 
@@ -208,7 +208,7 @@ pub fn destroy_session(
 /// - Ok(`()`)
 /// - Err([`StatusCode`], [`Message`])
 pub fn destroy_sessions(db: &Database, auth: &Auth) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     if UserSession::delete_all_for_user(&mut db, auth.user_id).is_err() {
         return Err((500, "Could not delete sessions."));
@@ -234,7 +234,7 @@ pub fn login(
     db: &Database,
     item: &LoginInput,
 ) -> Result<(AccessToken, RefreshToken), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     // verify device
     let mut device = None;
@@ -364,7 +364,7 @@ pub fn create_user_session(
 /// - Ok(`()`)
 /// - Err([`StatusCode`], [`Message`])
 pub fn logout(db: &Database, refresh_token: Option<&'_ str>) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     if refresh_token.is_none() {
         return Err((401, "Invalid session."));
@@ -402,7 +402,7 @@ pub fn refresh(
     db: &Database,
     refresh_token_str: Option<&'_ str>,
 ) -> Result<(AccessToken, RefreshToken), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     if refresh_token_str.is_none() {
         return Err((401, "Invalid session."));
@@ -512,7 +512,7 @@ pub fn register(
     item: &RegisterInput,
     mailer: &Mailer,
 ) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let user = User::find_by_email(&mut db, item.email.to_string());
 
@@ -569,7 +569,7 @@ pub fn activate(
     item: &ActivationInput,
     mailer: &Mailer,
 ) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let token = decode::<RegistrationClaims>(
         &item.activation_token,
@@ -639,7 +639,7 @@ pub fn forgot_password(
     item: &ForgotInput,
     mailer: &Mailer,
 ) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let user_result = User::find_by_email(&mut db, item.email.clone());
 
@@ -697,7 +697,7 @@ pub fn change_password(
         return Err((400, "The new password must be different"));
     }
 
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     let user = User::read(&mut db, auth.user_id);
 
@@ -765,7 +765,7 @@ pub fn reset_password(
     item: &ResetInput,
     mailer: &Mailer,
 ) -> Result<(), (StatusCode, Message)> {
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     if item.new_password.is_empty() {
         return Err((400, "Missing password"));

create-rust-app/src/auth/oidc/controller.rs

@@ -42,7 +42,7 @@ pub async fn oidc_login_url(
     auth_config: &AuthConfig,
     provider_name: String,
 ) -> Result<Option<String>> {
-    let mut db = db.get_connection();
+    let mut db = db.get_connection().unwrap();
 
     let provider_config: Option<_> = auth_config
         .clone()
@@ -102,7 +102,7 @@ pub async fn oauth_login(
     query_param_error: Option<String>,
     query_param_state: Option<String>,
 ) -> Result<(AccessToken, RefreshToken), (StatusCode, Message)> {
-    let db = &mut db.get_connection();
+    let db = &mut db.get_connection().unwrap();
 
     // 1. Make sure this provider is setup
     let provider_config = auth_config

create-rust-app/src/database/mod.rs

@@ -1,4 +1,5 @@
 use diesel::r2d2::{self, ConnectionManager, PooledConnection};
+use diesel_logger::LoggingConnection;
 use once_cell::sync::OnceCell;
 
 #[cfg(feature = "database_postgres")]
@@ -16,7 +17,7 @@ pub type DieselBackend = diesel::pg::Pg;
 pub type DieselBackend = diesel::sqlite::Sqlite;
 
 pub type Pool = r2d2::Pool<ConnectionManager<DbCon>>;
-pub type Connection = PooledConnection<ConnectionManager<DbCon>>;
+pub type Connection = LoggingConnection<PooledConnection<ConnectionManager<DbCon>>>;
 
 #[derive(Clone)]
 /// wrapper function for a database pool
@@ -39,8 +40,8 @@ impl Database {
     }
 
     /// get a [`Connection`] to a database
-    pub fn get_connection(&self) -> Connection {
-        self.pool.get().unwrap()
+    pub fn get_connection(&self) -> Result<Connection, anyhow::Error> {
+        Ok(LoggingConnection::new(self.pool.get()?))
     }
 
     fn get_or_init_pool() -> &'static Pool {

create-rust-app/src/dev/controller.rs

@@ -29,7 +29,7 @@ pub struct HealthCheckResponse {
 /// /db/query
 pub fn query_db(db: &Database, body: &MySqlQuery) -> Result<String, diesel::result::Error> {
     let q = format!("SELECT json_agg(q) as json FROM ({}) q;", body.query);
-    let mut db = db.pool.get().unwrap();
+    let mut db = db.get_connection().unwrap();
 
     Ok(sql_query(q.as_str())
         .get_result::<MyQueryResult>(&mut db)?