Do nothing on conflict #1712
Merged
Do nothing on conflict #1712
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tyt2y3
reviewed
Jun 20, 2023
src/executor/insert.rs
Outdated
| if temp.is_err() | ||
| && temp.as_ref().expect_err("must be error by previous check") | ||
| == &DbErr::RecordNotInserted | ||
| { |
There was a problem hiding this comment.
May be you can try the match syntax:
if matches!(temp, Err(DbErr::RecordNotInserted))
|
Please rebase this branch onto master; |
darkmmon
force-pushed
the
do-nothing-on-conflict
branch
from
0bfc031 to
240ec4f
Compare
billy1624
reviewed
Jun 21, 2023
src/executor/insert.rs
Outdated
Comment on lines
52
to
61
| if self.insert_struct.columns.is_empty() { | ||
| TryInsertResult::Empty | ||
| } else { | ||
| TryInsertResult::Inserted(self.insert_struct.exec(db).await) | ||
| let temp = self.insert_struct.exec(db).await; | ||
| if matches!(temp, Err(DbErr::RecordNotInserted)) { | ||
| TryInsertResult::Conflicted | ||
| } else { | ||
| TryInsertResult::Inserted(temp) | ||
| } | ||
| } |
There was a problem hiding this comment.
Coding Style: maybe an early return over nested if ...?
if self.insert_struct.columns.is_empty() {
return TryInsertResult::Empty
}
let temp = self.insert_struct.exec(db).await;
if matches!(temp, Err(DbErr::RecordNotInserted)) {
TryInsertResult::Conflicted
} else {
TryInsertResult::Inserted(temp)
}Same applied to the methods below
There was a problem hiding this comment.
yeah, that would look slightly better, and temp is better named as res
|
@darkmmon As I said under this situation you should not merge master in, you should rebase on top of master. |
tyt2y3
reviewed
Jun 21, 2023
clippy changes fmt change from basic if statement to matches
darkmmon
force-pushed
the
do-nothing-on-conflict
branch
from
1d1f556 to
959146d
Compare
darkmmon
added a commit
to darkmmon/seaql.github.io
that referenced
this pull request
Jul 12, 2023
billy1624
added a commit
to SeaQL/seaql.github.io
that referenced
this pull request
Jul 19, 2023
* Optional Field SeaQL/sea-orm#1513 * .gitignore SeaQL/sea-orm#1334 * migration table custom name SeaQL/sea-orm#1511 * OR condition relation SeaQL/sea-orm#1433 * DerivePartialModel SeaQL/sea-orm#1597 * space for migration file naming SeaQL/sea-orm#1570 * composite key up to 12 SeaQL/sea-orm#1508 * seaography integration SeaQL/sea-orm#1599 * QuerySelect SimpleExpr SeaQL/sea-orm#1702 * sqlErr SeaQL/sea-orm#1707 * migration check SeaQL/sea-orm#1519 * postgres array SeaQL/sea-orm#1565 * param intoString SeaQL/sea-orm#1439 * **skipped** re-export SeaQL/sea-orm#1661 * ping SeaQL/sea-orm#1627 * on empty do nothing SeaQL/sea-orm#1708 * on conflict do nothing SeaQL/sea-orm#1712 * **skipped** upgrade versions * active enum fail safe SeaQL/sea-orm#1374 * relation generation check SeaQL/sea-orm#1435 * entity generation bug SeaQL/sea-schema#105 * **skipped** bug fix that does not require edits * EnumIter change SeaQL/sea-orm#1535 * completed and fixed a previous todo SeaQL/sea-orm#1570 * amended wordings and structures * Edit * Remove temp file --------- Co-authored-by: Billy Chan <[email protected]>
🎉 Released In 0.12.1 🎉Thank you everyone for the contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Info
New Features
Changes