diff --git a/tests/basic.rs b/tests/basic.rs index 5efe6ea2..797d3b90 100644 --- a/tests/basic.rs +++ b/tests/basic.rs @@ -1,6 +1,5 @@ -use sea_orm::{entity::*, error::*, sea_query, tests_cfg::*, DbBackend, DbConn, Statement}; - -mod setup; +#[allow(unused_imports)] +use sea_orm::{entity::*, error::*, sea_query, tests_cfg::*, Database, DbConn}; // cargo test --test basic -- --nocapture #[cfg_attr(feature = "runtime-async-std", async_std::test)] @@ -8,13 +7,17 @@ mod setup; #[cfg_attr(feature = "runtime-tokio", tokio::test)] #[cfg(feature = "sqlx-sqlite")] async fn main() { - let db: DbConn = setup::setup().await; + use std::env; + let base_url = env::var("DATABASE_URL").expect("Enviroment variable 'DATABASE_URL' not set"); + + let db: DbConn = Database::connect(&base_url).await.unwrap(); setup_schema(&db).await; crud_cake(&db).await.unwrap(); } +#[cfg(feature = "sqlx-sqlite")] async fn setup_schema(db: &DbConn) { use sea_query::*; @@ -28,14 +31,14 @@ async fn setup_schema(db: &DbConn) { .primary_key(), ) .col(ColumnDef::new(cake::Column::Name).string()) - .build(SqliteQueryBuilder); + .to_owned(); - let result = db - .execute(Statement::from_string(DbBackend::Sqlite, stmt)) - .await; + let builder = db.get_database_backend(); + let result = db.execute(builder.build(&stmt)).await; println!("Create table cake: {:?}", result); } +#[cfg(feature = "sqlx-sqlite")] async fn crud_cake(db: &DbConn) -> Result<(), DbErr> { let apple = cake::ActiveModel { name: Set("Apple Pie".to_owned()), diff --git a/tests/setup/mod.rs b/tests/setup/mod.rs deleted file mode 100644 index ab3a9e8e..00000000 --- a/tests/setup/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -use sea_orm::{Database, DatabaseConnection}; - -pub async fn setup() -> DatabaseConnection { - Database::connect("sqlite::memory:").await.unwrap() -}