Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test cases improvement #1811

Merged
merged 23 commits into from
Aug 18, 2023
Merged

Test cases improvement #1811

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
4c99f7a
adds find_with_linked test
darkmmon Aug 15, 2023
cdc75ef
WIP(related test)
darkmmon Aug 15, 2023
ff9baba
mock related test done
darkmmon Aug 16, 2023
b35fe7f
complete relation test
darkmmon Aug 16, 2023
7f5db77
loader update
darkmmon Aug 16, 2023
8592857
find_with/also_related missing test case for empty from other side
darkmmon Aug 16, 2023
e28db21
comments fixup
darkmmon Aug 16, 2023
ba655fa
revert loader test
darkmmon Aug 17, 2023
133e16d
related select test done
darkmmon Aug 17, 2023
4bb7b1e
find with/also linked test cases
darkmmon Aug 17, 2023
80158e1
removed due to it being functionally same as the new one
darkmmon Aug 17, 2023
99c3a57
fmt, remove excess import
darkmmon Aug 17, 2023
946f5cb
improved model generation
darkmmon Aug 17, 2023
0a22f24
issue related test case #1790
darkmmon Aug 18, 2023
2356129
added loader test cases and slight improvement to find_related/linked
darkmmon Aug 18, 2023
b8a07d8
miscellaneous changes
darkmmon Aug 18, 2023
ff6bd17
added empty insert, merge load_one test case
darkmmon Aug 18, 2023
9c5ff07
completed loader many to many test case, fmt
darkmmon Aug 18, 2023
b8282fe
removed empty_insert test case for now
darkmmon Aug 18, 2023
c4b69e3
commented insert_test
darkmmon Aug 18, 2023
3b9f84b
added Cargo.toml for issue 1790's folder
darkmmon Aug 18, 2023
97731f0
buffed salvo version for ci(0.49 yanked)
darkmmon Aug 18, 2023
eea8795
revert version for salvo example
darkmmon Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/entity/base_entity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,6 @@ mod tests {
);
}

delete_by_id("UUID".to_string());
delete_by_id("UUID".to_string());
delete_by_id("UUID");
delete_by_id(Cow::from("UUID"));
Expand Down
294 changes: 294 additions & 0 deletions src/executor/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,3 +1107,297 @@ where
}
acc
}

#[cfg(test)]
mod tests {
use crate::tests_cfg::{cake_filling, cake_filling_price, entity_linked, filling, fruit};
use crate::{DbBackend, ModelTrait, QueryFilter, QueryTrait, RelationTrait};
use pretty_assertions::assert_eq;
use sea_query::{ConditionType, Expr, IntoCondition, JoinType};

fn cake_fruit_model(
cake_id: i32,
cake_name: String,
fruit_id: i32,
fruit_name: String,
) -> (
sea_orm::tests_cfg::cake::Model,
sea_orm::tests_cfg::fruit::Model,
) {
(
cake_model(cake_id, cake_name),
fruit_model(fruit_id, fruit_name, Some(cake_id)),
)
}

fn cake_model(id: i32, name: String) -> sea_orm::tests_cfg::cake::Model {
sea_orm::tests_cfg::cake::Model { id, name }
}

fn fruit_model(
id: i32,
name: String,
cake_id: Option<i32>,
) -> sea_orm::tests_cfg::fruit::Model {
sea_orm::tests_cfg::fruit::Model { id, name, cake_id }
}

#[smol_potat::test]
pub async fn also_related() -> Result<(), sea_orm::DbErr> {
use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect, Statement, Transaction};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[cake_fruit_model(
1,
"apple cake".to_owned(),
1,
"apple".to_owned(),
)]])
.into_connection();

assert_eq!(
Cake::find()
.find_also_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(1, "apple".to_owned(), Some(1)))
)]
);

assert_eq!(
db.into_transaction_log(),
[Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "cake"."name", "fruit"."name""#,
r#"FROM "cake""#,
r#"LEFT JOIN "fruit" ON "cake"."id" = "fruit"."cake_id""#
]
.join(" ")
.as_str(),
[]
),])]
);

Ok(())
}

#[smol_potat::test]
pub async fn also_related_2() -> Result<(), sea_orm::DbErr> {
use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[
cake_fruit_model(1, "apple cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(1, "apple cake".to_owned(), 2, "orange".to_owned()),
]])
.into_connection();

assert_eq!(
Cake::find()
.find_also_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(1, "apple".to_owned(), Some(1)))
),
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(2, "orange".to_owned(), Some(1)))
)
]
);

Ok(())
}

#[smol_potat::test]
pub async fn also_related_3() -> Result<(), sea_orm::DbErr> {
use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[
cake_fruit_model(1, "apple cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(1, "apple cake".to_owned(), 2, "orange".to_owned()),
cake_fruit_model(2, "orange cake".to_owned(), 2, "orange".to_owned()),
]])
.into_connection();

assert_eq!(
Cake::find()
.find_also_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(1, "apple".to_owned(), Some(1)))
),
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(2, "orange".to_owned(), Some(1)))
),
(
cake_model(2, "orange cake".to_owned()),
Some(fruit_model(2, "orange".to_owned(), Some(2)))
)
]
);

Ok(())
}

// fixme: unsure on how to insert a cake with no fruit into query_result
// #[smol_potat::test]
pub async fn also_related_4() -> Result<(), sea_orm::DbErr> {
use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[
cake_fruit_model(1, "apple cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(1, "apple cake".to_owned(), 2, "orange".to_owned()),
cake_fruit_model(2, "orange cake".to_owned(), 2, "orange".to_owned()),
]])
.append_query_results([[
cake_model(3, "chocolate cake".to_owned()), // no fruit in cake
]])
tyt2y3 marked this conversation as resolved.
Show resolved Hide resolved
.into_connection();

assert_eq!(
Cake::find()
.find_also_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(1, "apple".to_owned(), Some(1)))
),
(
cake_model(1, "apple cake".to_owned()),
Some(fruit_model(2, "orange".to_owned(), Some(1)))
),
(
cake_model(2, "orange cake".to_owned()),
Some(fruit_model(2, "orange".to_owned(), Some(2)))
),
(cake_model(3, "chocolate cake".to_owned()), None)
]
);

Ok(())
}

#[smol_potat::test]
#[cfg(any(feature = "mock",))]
pub async fn with_related() -> Result<(), sea_orm::DbErr> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add 1 more case: Cake -> Filling

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see new test cases for Cake -> Vendor but not Cake -> Filling?

use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect, Statement, Transaction};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[
cake_fruit_model(1, "apple cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(1, "apple cake".to_owned(), 2, "orange".to_owned()),
]])
.into_connection();

assert_eq!(
Cake::find()
.find_with_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[(
cake_model(1, "apple cake".to_owned()),
vec![
fruit_model(1, "apple".to_owned(), Some(1)),
fruit_model(2, "orange".to_owned(), Some(1))
]
)]
);

assert_eq!(
db.into_transaction_log(),
[Transaction::many([Statement::from_sql_and_values(
DbBackend::Postgres,
[
r#"SELECT "cake"."name", "fruit"."name""#,
r#"FROM "cake""#,
r#"LEFT JOIN "fruit" ON "cake"."id" = "fruit"."cake_id""#,
r#"ORDER BY "cake"."id" ASC"#
]
.join(" ")
.as_str(),
[]
),])]
);

Ok(())
}

#[smol_potat::test]
#[cfg(any(feature = "mock",))]
pub async fn with_related_2() -> Result<(), sea_orm::DbErr> {
use sea_orm::tests_cfg::*;
use sea_orm::{DbBackend, EntityTrait, MockDatabase, QuerySelect};

let db = MockDatabase::new(DbBackend::Postgres)
.append_query_results([[
cake_fruit_model(1, "apple cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(2, "fruit cake".to_owned(), 1, "apple".to_owned()),
cake_fruit_model(2, "fruit cake".to_owned(), 2, "orange".to_owned()),
cake_fruit_model(2, "fruit cake".to_owned(), 3, "grape".to_owned()),
cake_fruit_model(2, "fruit cake".to_owned(), 4, "melon".to_owned()),
]])
.into_connection();

assert_eq!(
Cake::find()
.find_with_related(Fruit)
.select_only()
.column(cake::Column::Name)
.column(fruit::Column::Name)
.all(&db)
.await?,
[
(
cake_model(1, "apple cake".to_owned()),
vec![fruit_model(1, "apple".to_owned(), Some(1)),]
),
(
cake_model(2, "fruit cake".to_owned()),
vec![
fruit_model(1, "apple".to_owned(), Some(2)),
fruit_model(2, "orange".to_owned(), Some(2)),
fruit_model(3, "grape".to_owned(), Some(2)),
fruit_model(4, "melon".to_owned(), Some(2)),
]
)
]
);

Ok(())
}
}
Loading
Loading