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

feat: expose database connection to ActiveModelBehaviour's methods #1145

Merged
merged 1 commit into from
Dec 22, 2022
Merged

feat: expose database connection to ActiveModelBehaviour's methods #1145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 9 deletions src/entity/active_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,11 @@ pub trait ActiveModelTrait: Clone + Debug {
Self: ActiveModelBehavior + 'a,
C: ConnectionTrait,
{
let am = ActiveModelBehavior::before_save(self, true)?;
let am = ActiveModelBehavior::before_save(self, db, true)?;
let model = <Self::Entity as EntityTrait>::insert(am)
.exec_with_returning(db)
.await?;
Self::after_save(model, true)
Self::after_save(model, db, true)
}

/// Perform the `UPDATE` operation on an ActiveModel
Expand Down Expand Up @@ -400,9 +400,9 @@ pub trait ActiveModelTrait: Clone + Debug {
Self: ActiveModelBehavior + 'a,
C: ConnectionTrait,
{
let am = ActiveModelBehavior::before_save(self, false)?;
let am = ActiveModelBehavior::before_save(self, db, false)?;
let model: <Self::Entity as EntityTrait>::Model = Self::Entity::update(am).exec(db).await?;
Self::after_save(model, false)
Self::after_save(model, db, false)
}

/// Insert the model if primary key is `NotSet`, update otherwise.
Expand Down Expand Up @@ -477,10 +477,10 @@ pub trait ActiveModelTrait: Clone + Debug {
Self: ActiveModelBehavior + 'a,
C: ConnectionTrait,
{
let am = ActiveModelBehavior::before_delete(self)?;
let am = ActiveModelBehavior::before_delete(self, db)?;
let am_clone = am.clone();
let delete_res = Self::Entity::delete(am).exec(db).await?;
ActiveModelBehavior::after_delete(am_clone)?;
ActiveModelBehavior::after_delete(am_clone, db)?;
Ok(delete_res)
}

Expand Down Expand Up @@ -591,25 +591,26 @@ pub trait ActiveModelBehavior: ActiveModelTrait {
}

/// Will be called before saving
fn before_save(self, insert: bool) -> Result<Self, DbErr> {
fn before_save(self, db: &impl ConnectionTrait, insert: bool) -> Result<Self, DbErr> {
Ok(self)
}

/// Will be called after saving
fn after_save(
model: <Self::Entity as EntityTrait>::Model,
db: &impl ConnectionTrait,
insert: bool,
) -> Result<<Self::Entity as EntityTrait>::Model, DbErr> {
Ok(model)
}

/// Will be called before deleting
fn before_delete(self) -> Result<Self, DbErr> {
fn before_delete(self, db: &impl ConnectionTrait) -> Result<Self, DbErr> {
Ok(self)
}

/// Will be called after deleting
fn after_delete(self) -> Result<Self, DbErr> {
fn after_delete(self, db: &impl ConnectionTrait) -> Result<Self, DbErr> {
Ok(self)
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/common/bakery_chain/cake.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use sea_orm::entity::prelude::*;
use sea_orm::{entity::prelude::*, ConnectionTrait};

#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "cake")]
Expand Down Expand Up @@ -58,7 +58,7 @@ impl ActiveModelBehavior for ActiveModel {
}
}

fn before_save(self, insert: bool) -> Result<Self, DbErr> {
fn before_save(self, _db: &impl ConnectionTrait, insert: bool) -> Result<Self, DbErr> {
use rust_decimal_macros::dec;
if self.price.as_ref() == &dec!(0) {
Err(DbErr::Custom(format!(
Expand All @@ -70,7 +70,7 @@ impl ActiveModelBehavior for ActiveModel {
}
}

fn after_save(model: Model, insert: bool) -> Result<Model, DbErr> {
fn after_save(model: Model, _db: &impl ConnectionTrait, insert: bool) -> Result<Model, DbErr> {
use rust_decimal_macros::dec;
if model.price < dec!(0) {
Err(DbErr::Custom(format!(
Expand All @@ -82,7 +82,7 @@ impl ActiveModelBehavior for ActiveModel {
}
}

fn before_delete(self) -> Result<Self, DbErr> {
fn before_delete(self, _db: &impl ConnectionTrait) -> Result<Self, DbErr> {
if self.name.as_ref().contains("(err_on_before_delete)") {
Err(DbErr::Custom(
"[before_delete] Cannot be deleted".to_owned(),
Expand All @@ -92,7 +92,7 @@ impl ActiveModelBehavior for ActiveModel {
}
}

fn after_delete(self) -> Result<Self, DbErr> {
fn after_delete(self, _db: &impl ConnectionTrait) -> Result<Self, DbErr> {
if self.name.as_ref().contains("(err_on_after_delete)") {
Err(DbErr::Custom("[after_delete] Cannot be deleted".to_owned()))
} else {
Expand Down