Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
19 changes: 17 additions & 2 deletions sea-orm-sync/src/query/select.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
ColumnTrait, EntityTrait, Iterable, Order, PrimaryKeyToColumn, QueryFilter, QueryOrder,
QuerySelect, QueryTrait,
ColumnTrait, EntityTrait, IdenStatic, Iterable, Order, PrimaryKeyToColumn, QueryFilter,
QueryOrder, QuerySelect, QueryTrait,
};
use core::fmt::Debug;
use core::marker::PhantomData;
Expand Down Expand Up @@ -317,6 +317,21 @@ where
}
self
}

/// Select all columns of this entity except the given ones.
pub fn select_except<I>(mut self, except: I) -> Self
Comment thread
WookiesRpeople2 marked this conversation as resolved.
Outdated
where
I: IntoIterator<Item = E::Column>,
{
let except: Vec<&str> = except.into_iter().map(|col| col.as_str()).collect();
self.query.clear_selects();
for col in E::Column::iter() {
if !except.contains(&col.as_str()) {
self.query.expr(col.select_as(col.into_expr()));
}
}
self
}
}

impl<E> QueryTrait for Select<E>
Expand Down
19 changes: 17 additions & 2 deletions src/query/select.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
ColumnTrait, EntityTrait, Iterable, Order, PrimaryKeyToColumn, QueryFilter, QueryOrder,
QuerySelect, QueryTrait,
ColumnTrait, EntityTrait, IdenStatic, Iterable, Order, PrimaryKeyToColumn, QueryFilter,
QueryOrder, QuerySelect, QueryTrait,
};
use core::fmt::Debug;
use core::marker::PhantomData;
Expand Down Expand Up @@ -317,6 +317,21 @@ where
}
self
}

/// Select all columns of this entity except the given ones.
pub fn select_except<I>(mut self, except: I) -> Self
where
I: IntoIterator<Item = E::Column>,
{
let except: Vec<&str> = except.into_iter().map(|col| col.as_str()).collect();
self.query.clear_selects();
for col in E::Column::iter() {
if !except.contains(&col.as_str()) {
self.query.expr(col.select_as(col.into_expr()));
}
}
self
}
}

impl<E> QueryTrait for Select<E>
Expand Down
59 changes: 59 additions & 0 deletions tests/query_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,62 @@ pub async fn select_only_exclude_option_fields() {

ctx.delete().await;
}

#[sea_orm_macros::test]
pub async fn select_except_excludes_option_fields() {
let ctx = TestContext::new("select_except_excludes_option_fields").await;
create_bakery_table(&ctx.db).await.unwrap();
create_baker_table(&ctx.db).await.unwrap();

let bakery = bakery::ActiveModel {
name: Set("Sweet Treats".to_owned()),
profit_margin: Set(0.5),
..Default::default()
}
.save(&ctx.db)
.await
.expect("could not insert bakery");

let _ = baker::ActiveModel {
name: Set("Alice".to_owned()),
contact_details: Set(serde_json::json!({
"phone": "555-1234",
"email": "alice@example.com"
})),
bakery_id: Set(Some(bakery.id.clone().unwrap())),
..Default::default()
}
.save(&ctx.db)
.await
.expect("could not insert baker");

let bakers = Baker::find()
.select_except([baker::Column::BakeryId])
.all(&ctx.db)
.await
.unwrap();

assert_eq!(bakers.len(), 1);
assert_eq!(bakers[0].name, "Alice");
assert_eq!(
bakers[0].contact_details,
serde_json::json!({
"phone": "555-1234",
"email": "alice@example.com"
})
);
assert_eq!(bakers[0].bakery_id, None);

let bakery_id: Option<i32> = Baker::find_by_id(bakers[0].id)
.select_only()
.column(baker::Column::BakeryId)
.into_tuple()
.one(&ctx.db)
.await
.unwrap()
.unwrap();

assert_eq!(bakery_id, Some(bakery.id.unwrap()));

ctx.delete().await;
}
Loading