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.

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

chore(meta): bump sea-orm to 1.0 #19207

Merged
merged 5 commits into from
Nov 4, 2024
Merged

chore(meta): bump sea-orm to 1.0 #19207

merged 5 commits into from
Nov 4, 2024

Conversation

BugenZhao
Copy link
Member

@BugenZhao BugenZhao commented Oct 30, 2024

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Bump sea-orm to 1.0, along with its dependencies.

The motivation is #19156, where the necessary fix (SeaQL/sea-orm#2244) is only included since 1.0.

The only worth-noting breaking change is that, there is no longer a backend-agnostic method to specify longblob for MySQL, blob for SQLite, and bytea for Postgres simultaneously (SeaQL/sea-query#743, a regression to me). As a workaround, add a helper method which dispatches the type based on the backend variant.

Although the latest version of sea-orm is 1.1, we are not upgrading to it in this PR because it depends on a new major version of sqlx, for which we are maintaining our own forks to make it compatible with madsim. We may further bump it in following PRs.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • All checks passed in ./risedev check (or alias, ./risedev c)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

Copy link
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @BugenZhao and the rest of your teammates on Graphite Graphite

@BugenZhao BugenZhao force-pushed the bz/bump-sea-ql branch 2 times, most recently from 362c3ec to c7a7bdc Compare October 30, 2024 09:28
Signed-off-by: Bugen Zhao <[email protected]>
Signed-off-by: Bugen Zhao <[email protected]>
@BugenZhao BugenZhao marked this pull request as ready for review November 1, 2024 09:42
@BugenZhao BugenZhao requested a review from a team as a code owner November 1, 2024 09:42
Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#19145 🥵

@kwannoel
Copy link
Contributor

kwannoel commented Nov 4, 2024

#19145 🥵

I think we made similar changes. Shall I include your changes in my PR? I think the trait extension changes are more ergonomic.

@kwannoel
Copy link
Contributor

kwannoel commented Nov 4, 2024

#19145 🥵

I think we made similar changes. Shall I include your changes in my PR? I think the trait extension changes are more ergonomic.

I think we can also merge in your PR, then my PR will just contain Cargo.lock and Cargo.toml patches.

@@ -4489,6 +4489,18 @@ dependencies = [
"zeroize",
]

[[package]]
name = "educe"
version = "0.5.11"
Copy link
Contributor

@kwannoel kwannoel Nov 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just making sure the duplicated dependency of a different version for educe here is expected.

@kwannoel kwannoel self-requested a review November 4, 2024 03:22
Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rubber stamp for Cargo.lock

@BugenZhao
Copy link
Member Author

#19145 🥵

I think we made similar changes. Shall I include your changes in my PR? I think the trait extension changes are more ergonomic.

I think we can also merge in your PR, then my PR will just contain Cargo.lock and Cargo.toml patches.

Sorry, I just noticed your work. 🥵

Comment on lines +4 to +5
#[easy_ext::ext(ColumnDefExt)]
impl ColumnDef {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may consider disallowing other constructors like blob and binary with the help of clippy.

@BugenZhao BugenZhao added this pull request to the merge queue Nov 4, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 4, 2024
@BugenZhao BugenZhao added this pull request to the merge queue Nov 4, 2024
Merged via the queue into main with commit f559d34 Nov 4, 2024
35 of 36 checks passed
@BugenZhao BugenZhao deleted the bz/bump-sea-ql branch November 4, 2024 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants