Skip to content

Commit 9d90f84

Browse files
committed
Fix TryInsert as well
1 parent 29b7aa7 commit 9d90f84

File tree

10 files changed

+25
-39
lines changed

10 files changed

+25
-39
lines changed

sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/bills.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
55
pub struct Model {
66
#[sea_orm(primary_key)]
77
pub id: i32,
8-
pub user_id: Option<i32> ,
8+
pub user_id: Option<i32>,
99
}
1010

1111
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
1515
from = "Column::UserId",
1616
to = "super::users::Column::Id",
1717
on_update = "NoAction",
18-
on_delete = "NoAction",
18+
on_delete = "NoAction"
1919
)]
2020
Users,
2121
#[sea_orm(has_many = "super::users_saved_bills::Entity")]

sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_saved_bills.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ pub enum Relation {
1616
from = "Column::BillId",
1717
to = "super::bills::Column::Id",
1818
on_update = "Cascade",
19-
on_delete = "Cascade",
19+
on_delete = "Cascade"
2020
)]
2121
Bills,
2222
#[sea_orm(
2323
belongs_to = "super::users::Entity",
2424
from = "Column::UserId",
2525
to = "super::users::Column::Id",
2626
on_update = "Cascade",
27-
on_delete = "Cascade",
27+
on_delete = "Cascade"
2828
)]
2929
Users,
3030
}

sea-orm-codegen/src/tests_cfg/duplicated_many_to_many_paths/users_votes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ pub enum Relation {
1717
from = "Column::BillId",
1818
to = "super::bills::Column::Id",
1919
on_update = "Cascade",
20-
on_delete = "Cascade",
20+
on_delete = "Cascade"
2121
)]
2222
Bills,
2323
#[sea_orm(
2424
belongs_to = "super::users::Entity",
2525
from = "Column::UserId",
2626
to = "super::users::Column::Id",
2727
on_update = "Cascade",
28-
on_delete = "Cascade",
28+
on_delete = "Cascade"
2929
)]
3030
Users,
3131
}

sea-orm-codegen/src/tests_cfg/many_to_many/bills.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
55
pub struct Model {
66
#[sea_orm(primary_key)]
77
pub id: i32,
8-
pub user_id: Option<i32> ,
8+
pub user_id: Option<i32>,
99
}
1010

1111
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
1515
from = "Column::UserId",
1616
to = "super::users::Column::Id",
1717
on_update = "NoAction",
18-
on_delete = "NoAction",
18+
on_delete = "NoAction"
1919
)]
2020
Users,
2121
#[sea_orm(has_many = "super::users_votes::Entity")]

sea-orm-codegen/src/tests_cfg/many_to_many/users_votes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ pub enum Relation {
1717
from = "Column::BillId",
1818
to = "super::bills::Column::Id",
1919
on_update = "Cascade",
20-
on_delete = "Cascade",
20+
on_delete = "Cascade"
2121
)]
2222
Bills,
2323
#[sea_orm(
2424
belongs_to = "super::users::Entity",
2525
from = "Column::UserId",
2626
to = "super::users::Column::Id",
2727
on_update = "Cascade",
28-
on_delete = "Cascade",
28+
on_delete = "Cascade"
2929
)]
3030
Users,
3131
}

sea-orm-codegen/src/tests_cfg/many_to_many_multiple/bills.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
55
pub struct Model {
66
#[sea_orm(primary_key)]
77
pub id: i32,
8-
pub user_id: Option<i32> ,
8+
pub user_id: Option<i32>,
99
}
1010

1111
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
@@ -15,7 +15,7 @@ pub enum Relation {
1515
from = "Column::UserId",
1616
to = "super::users::Column::Id",
1717
on_update = "NoAction",
18-
on_delete = "NoAction",
18+
on_delete = "NoAction"
1919
)]
2020
Users,
2121
}

sea-orm-codegen/src/tests_cfg/many_to_many_multiple/users_votes.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ pub struct Model {
77
pub user_id: i32,
88
#[sea_orm(primary_key, auto_increment = false)]
99
pub bill_id: i32,
10-
pub user_idd: Option<i32> ,
11-
pub bill_idd: Option<i32> ,
10+
pub user_idd: Option<i32>,
11+
pub bill_idd: Option<i32>,
1212
pub vote: bool,
1313
}
1414

@@ -17,25 +17,25 @@ pub enum Relation {
1717
#[sea_orm(
1818
belongs_to = "super::bills::Entity",
1919
from = "Column::BillIdd",
20-
to = "super::bills::Column::Id",
20+
to = "super::bills::Column::Id"
2121
)]
2222
Bills2,
2323
#[sea_orm(
2424
belongs_to = "super::bills::Entity",
2525
from = "Column::BillId",
26-
to = "super::bills::Column::Id",
26+
to = "super::bills::Column::Id"
2727
)]
2828
Bills1,
2929
#[sea_orm(
3030
belongs_to = "super::users::Entity",
3131
from = "Column::UserIdd",
32-
to = "super::users::Column::Id",
32+
to = "super::users::Column::Id"
3333
)]
3434
Users2,
3535
#[sea_orm(
3636
belongs_to = "super::users::Entity",
3737
from = "Column::UserId",
38-
to = "super::users::Column::Id",
38+
to = "super::users::Column::Id"
3939
)]
4040
Users1,
4141
}

sea-orm-codegen/src/tests_cfg/self_referencing/bills.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,12 @@ use sea_orm::entity::prelude::*;
55
pub struct Model {
66
#[sea_orm(primary_key)]
77
pub id: i32,
8-
pub self_id: Option<i32> ,
8+
pub self_id: Option<i32>,
99
}
1010

1111
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
1212
pub enum Relation {
13-
#[sea_orm(
14-
belongs_to = "Entity",
15-
from = "Column::SelfId",
16-
to = "Column::Id",
17-
)]
13+
#[sea_orm(belongs_to = "Entity", from = "Column::SelfId", to = "Column::Id")]
1814
SelfRef,
1915
}
2016

sea-orm-codegen/src/tests_cfg/self_referencing/users.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,15 @@ use sea_orm::entity::prelude::*;
55
pub struct Model {
66
#[sea_orm(primary_key)]
77
pub id: i32,
8-
pub self_id: Option<i32> ,
9-
pub self_idd: Option<i32> ,
8+
pub self_id: Option<i32>,
9+
pub self_idd: Option<i32>,
1010
}
1111

1212
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
1313
pub enum Relation {
14-
#[sea_orm(
15-
belongs_to = "Entity",
16-
from = "Column::SelfId",
17-
to = "Column::Id",
18-
)]
14+
#[sea_orm(belongs_to = "Entity", from = "Column::SelfId", to = "Column::Id")]
1915
SelfRef2,
20-
#[sea_orm(
21-
belongs_to = "Entity",
22-
from = "Column::SelfIdd",
23-
to = "Column::Id",
24-
)]
16+
#[sea_orm(belongs_to = "Entity", from = "Column::SelfIdd", to = "Column::Id")]
2517
SelfRef1,
2618
}
2719

src/query/insert.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,7 @@ where
427427
M: IntoActiveModel<A>,
428428
I: IntoIterator<Item = M>,
429429
{
430-
for model in models.into_iter() {
431-
self.insert_struct = self.insert_struct.add(model);
432-
}
430+
self.insert_struct = self.insert_struct.add_many(models);
433431
self
434432
}
435433

0 commit comments

Comments
 (0)