Skip to content

Commit e5a7246

Browse files
langyolangyo
committed
Revert "Fix CI."
This reverts commit 2495b40.
1 parent 3356023 commit e5a7246

File tree

6 files changed

+57
-165
lines changed

6 files changed

+57
-165
lines changed

‎examples/basic/src/operation.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,9 @@ pub async fn insert_and_update(db: &DbConn) -> Result<(), DbErr> {
2222
};
2323
let res = Fruit::insert(pear).exec(db).await?;
2424

25-
println!(
26-
"Inserted: last_insert_id = {}",
27-
res.last_insert_id.ok_or(DbErr::UnpackInsertId)?
28-
);
29-
30-
let pear: Option<fruit::Model> =
31-
Fruit::find_by_id(res.last_insert_id.ok_or(DbErr::UnpackInsertId)?)
32-
.one(db)
33-
.await?;
25+
println!("Inserted: last_insert_id = {}", res.last_insert_id);
26+
27+
let pear: Option<fruit::Model> = Fruit::find_by_id(res.last_insert_id).one(db).await?;
3428

3529
println!("Pear: {pear:?}");
3630

‎examples/graphql_example/service/src/mutation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ impl Mutation {
1313
let res = Note::insert(active_model).exec(db).await?;
1414

1515
Ok(note::Model {
16-
id: res.last_insert_id.ok_or(DbErr::UnpackInsertId)?,
16+
id: res.last_insert_id,
1717
..form_data
1818
})
1919
}

‎examples/proxy_gluesql_example/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ impl ProxyDatabaseTrait for ProxyDb {
132132
});
133133

134134
Ok(ProxyExecResult {
135-
last_insert_id: Some(1),
135+
last_insert_id: 1,
136136
rows_affected: 1,
137137
})
138138
}

‎examples/seaography_example/migration/src/m20230102_000001_seed_bakery_data.rs

+16-80
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,30 @@ impl MigrationTrait for Migration {
1515
profit_margin: Set(10.4),
1616
..Default::default()
1717
};
18-
let sea = Bakery::insert(bakery)
19-
.exec(db)
20-
.await?
21-
.last_insert_id
22-
.ok_or(DbErr::UnpackInsertId)?;
18+
let sea = Bakery::insert(bakery).exec(db).await?.last_insert_id;
2319

2420
let bakery = bakery::ActiveModel {
2521
name: Set("LakeSide Bakery".to_owned()),
2622
profit_margin: Set(5.8),
2723
..Default::default()
2824
};
29-
let lake = Bakery::insert(bakery)
30-
.exec(db)
31-
.await?
32-
.last_insert_id
33-
.ok_or(DbErr::UnpackInsertId)?;
25+
let lake = Bakery::insert(bakery).exec(db).await?.last_insert_id;
3426

3527
let alice = baker::ActiveModel {
3628
name: Set("Alice".to_owned()),
3729
contact: Set("+44 15273388".to_owned()),
3830
bakery_id: Set(Some(sea)),
3931
..Default::default()
4032
};
41-
let alice = Baker::insert(alice)
42-
.exec(db)
43-
.await?
44-
.last_insert_id
45-
.ok_or(DbErr::UnpackInsertId)?;
33+
let alice = Baker::insert(alice).exec(db).await?.last_insert_id;
4634

4735
let bob = baker::ActiveModel {
4836
name: Set("Bob".to_owned()),
4937
contact: Set("+852 12345678".to_owned()),
5038
bakery_id: Set(Some(lake)),
5139
..Default::default()
5240
};
53-
let bob = Baker::insert(bob)
54-
.exec(db)
55-
.await?
56-
.last_insert_id
57-
.ok_or(DbErr::UnpackInsertId)?;
41+
let bob = Baker::insert(bob).exec(db).await?.last_insert_id;
5842

5943
let cake = cake::ActiveModel {
6044
name: Set("Chocolate Cake".to_owned()),
@@ -63,11 +47,7 @@ impl MigrationTrait for Migration {
6347
bakery_id: Set(Some(sea)),
6448
..Default::default()
6549
};
66-
let choco = Cake::insert(cake)
67-
.exec(db)
68-
.await?
69-
.last_insert_id
70-
.ok_or(DbErr::UnpackInsertId)?;
50+
let choco = Cake::insert(cake).exec(db).await?.last_insert_id;
7151

7252
let mut cake = cake::ActiveModel {
7353
name: Set("Double Chocolate".to_owned()),
@@ -76,17 +56,9 @@ impl MigrationTrait for Migration {
7656
bakery_id: Set(Some(sea)),
7757
..Default::default()
7858
};
79-
let double_1 = Cake::insert(cake.clone())
80-
.exec(db)
81-
.await?
82-
.last_insert_id
83-
.ok_or(DbErr::UnpackInsertId)?;
59+
let double_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
8460
cake.bakery_id = Set(Some(lake));
85-
let double_2 = Cake::insert(cake)
86-
.exec(db)
87-
.await?
88-
.last_insert_id
89-
.ok_or(DbErr::UnpackInsertId)?;
61+
let double_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
9062

9163
let mut cake = cake::ActiveModel {
9264
name: Set("Lemon Cake".to_owned()),
@@ -95,17 +67,9 @@ impl MigrationTrait for Migration {
9567
bakery_id: Set(Some(sea)),
9668
..Default::default()
9769
};
98-
let lemon_1 = Cake::insert(cake.clone())
99-
.exec(db)
100-
.await?
101-
.last_insert_id
102-
.ok_or(DbErr::UnpackInsertId)?;
70+
let lemon_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
10371
cake.bakery_id = Set(Some(lake));
104-
let lemon_2 = Cake::insert(cake)
105-
.exec(db)
106-
.await?
107-
.last_insert_id
108-
.ok_or(DbErr::UnpackInsertId)?;
72+
let lemon_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
10973

11074
let mut cake = cake::ActiveModel {
11175
name: Set("Strawberry Cake".to_owned()),
@@ -114,17 +78,9 @@ impl MigrationTrait for Migration {
11478
bakery_id: Set(Some(sea)),
11579
..Default::default()
11680
};
117-
let straw_1 = Cake::insert(cake.clone())
118-
.exec(db)
119-
.await?
120-
.last_insert_id
121-
.ok_or(DbErr::UnpackInsertId)?;
81+
let straw_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
12282
cake.bakery_id = Set(Some(lake));
123-
let straw_2 = Cake::insert(cake)
124-
.exec(db)
125-
.await?
126-
.last_insert_id
127-
.ok_or(DbErr::UnpackInsertId)?;
83+
let straw_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
12884

12985
let cake = cake::ActiveModel {
13086
name: Set("Orange Cake".to_owned()),
@@ -133,11 +89,7 @@ impl MigrationTrait for Migration {
13389
bakery_id: Set(Some(lake)),
13490
..Default::default()
13591
};
136-
let orange = Cake::insert(cake)
137-
.exec(db)
138-
.await?
139-
.last_insert_id
140-
.ok_or(DbErr::UnpackInsertId)?;
92+
let orange = Cake::insert(cake).exec(db).await?.last_insert_id;
14193

14294
let mut cake = cake::ActiveModel {
14395
name: Set("New York Cheese".to_owned()),
@@ -146,17 +98,9 @@ impl MigrationTrait for Migration {
14698
bakery_id: Set(Some(sea)),
14799
..Default::default()
148100
};
149-
let cheese_1 = Cake::insert(cake.clone())
150-
.exec(db)
151-
.await?
152-
.last_insert_id
153-
.ok_or(DbErr::UnpackInsertId)?;
101+
let cheese_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
154102
cake.bakery_id = Set(Some(lake));
155-
let cheese_2 = Cake::insert(cake)
156-
.exec(db)
157-
.await?
158-
.last_insert_id
159-
.ok_or(DbErr::UnpackInsertId)?;
103+
let cheese_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
160104

161105
let mut cake = cake::ActiveModel {
162106
name: Set("Blueburry Cheese".to_owned()),
@@ -165,17 +109,9 @@ impl MigrationTrait for Migration {
165109
bakery_id: Set(Some(sea)),
166110
..Default::default()
167111
};
168-
let blue_1 = Cake::insert(cake.clone())
169-
.exec(db)
170-
.await?
171-
.last_insert_id
172-
.ok_or(DbErr::UnpackInsertId)?;
112+
let blue_1 = Cake::insert(cake.clone()).exec(db).await?.last_insert_id;
173113
cake.bakery_id = Set(Some(lake));
174-
let blue_2 = Cake::insert(cake)
175-
.exec(db)
176-
.await?
177-
.last_insert_id
178-
.ok_or(DbErr::UnpackInsertId)?;
114+
let blue_2 = Cake::insert(cake).exec(db).await?.last_insert_id;
179115

180116
let rel = cake_baker::ActiveModel {
181117
cake_id: Set(choco),

‎issues/1357/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async fn main() -> Result<()> {
2424
.await?;
2525

2626
assert_eq!(Entity::find().one(&db).await?, Some(model.clone()));
27-
assert_eq!(res.last_insert_id, Some(model.id));
27+
assert_eq!(res.last_insert_id, model.id);
2828

2929
let model = Model {
3030
id: -10,
@@ -36,7 +36,7 @@ async fn main() -> Result<()> {
3636
.await?;
3737

3838
assert_eq!(Entity::find().one(&db).await?, Some(model.clone()));
39-
assert_eq!(res.last_insert_id, Some(model.id));
39+
assert_eq!(res.last_insert_id, model.id);
4040

4141
Ok(())
4242
}

0 commit comments

Comments
 (0)