From b622a6e1aa06c018042cea27dca1761f5b961f9f Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Mon, 9 May 2022 18:24:46 +0800 Subject: [PATCH] Tweaks --- sea-orm-migration/src/manager.rs | 4 ++-- sea-orm-migration/tests/main.rs | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/sea-orm-migration/src/manager.rs b/sea-orm-migration/src/manager.rs index 727e8340..ef0f5f38 100644 --- a/sea-orm-migration/src/manager.rs +++ b/sea-orm-migration/src/manager.rs @@ -105,7 +105,7 @@ impl<'c> SchemaManager<'c> { .conn .query_one(builder.build(&stmt)) .await? - .ok_or_else(|| DbErr::Custom("Fail to check table exists".to_owned()))?; + .ok_or_else(|| DbErr::Custom("Failed to check table exists".to_owned()))?; Ok(res.try_get("", "has_table")?) } @@ -126,7 +126,7 @@ impl<'c> SchemaManager<'c> { .conn .query_one(builder.build(&stmt)) .await? - .ok_or_else(|| DbErr::Custom("Fail to check table exists".to_owned()))?; + .ok_or_else(|| DbErr::Custom("Failed to check column exists".to_owned()))?; Ok(res.try_get("", "has_column")?) } diff --git a/sea-orm-migration/tests/main.rs b/sea-orm-migration/tests/main.rs index 4131bae4..13f0b404 100644 --- a/sea-orm-migration/tests/main.rs +++ b/sea-orm-migration/tests/main.rs @@ -10,7 +10,7 @@ async fn main() -> Result<(), DbErr> { let db_name = "sea_orm_migration"; let db = Database::connect(&url).await?; let db = &match db.get_database_backend() { - DbBackend::MySql | DbBackend::Postgres => { + DbBackend::MySql => { db.execute(Statement::from_string( db.get_database_backend(), format!("CREATE DATABASE IF NOT EXISTS `{}`;", db_name), @@ -20,6 +20,21 @@ async fn main() -> Result<(), DbErr> { let url = format!("{}/{}", url, db_name); Database::connect(&url).await? } + DbBackend::Postgres => { + db.execute(Statement::from_string( + db.get_database_backend(), + format!("DROP DATABASE IF EXISTS \"{}\";", db_name), + )) + .await?; + db.execute(Statement::from_string( + db.get_database_backend(), + format!("CREATE DATABASE \"{}\";", db_name), + )) + .await?; + + let url = format!("{}/{}", url, db_name); + Database::connect(&url).await? + } DbBackend::Sqlite => db, }; let manager = SchemaManager::new(db);