From c8c1458f535e607645b0a3780b3601a07818c6ef Mon Sep 17 00:00:00 2001 From: Eragon Date: Sun, 11 Feb 2024 20:32:19 +0100 Subject: [PATCH] Better logging of migrations --- tokenserver-db-mysql/src/pool.rs | 7 +++++-- tokenserver-db-sqlite/src/pool.rs | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tokenserver-db-mysql/src/pool.rs b/tokenserver-db-mysql/src/pool.rs index 1729c617ce..b781fc6e1a 100644 --- a/tokenserver-db-mysql/src/pool.rs +++ b/tokenserver-db-mysql/src/pool.rs @@ -13,8 +13,11 @@ embed_migrations!(); /// begin_test_transaction during tests. So this runs on its own separate conn. pub fn run_embedded_migrations(database_url: &str) -> DbResult<()> { let conn = MysqlConnection::establish(database_url)?; - + #[cfg(debug_assertions)] + // XXX: this doesn't show the DDL statements + // https://github.com/shssoichiro/diesel-logger/issues/1 embedded_migrations::run(&LoggingConnection::new(conn))?; - + #[cfg(not(debug_assertions))] + embedded_migrations::run(&conn)?; Ok(()) } diff --git a/tokenserver-db-sqlite/src/pool.rs b/tokenserver-db-sqlite/src/pool.rs index 2edd1f38ab..57e7596aee 100644 --- a/tokenserver-db-sqlite/src/pool.rs +++ b/tokenserver-db-sqlite/src/pool.rs @@ -11,7 +11,12 @@ embed_migrations!(); pub fn run_embedded_migrations(database_url: &str) -> DbResult<()> { let conn = SqliteConnection::establish(database_url)?; + #[cfg(debug_assertions)] + // XXX: this doesn't show the DDL statements + // https://github.com/shssoichiro/diesel-logger/issues/1 embedded_migrations::run(&LoggingConnection::new(conn))?; + #[cfg(not(debug_assertions))] + embedded_migrations::run(&conn)?; Ok(()) }