Skip to content

Remove conflicting implementation of 'Expr'#2604

Merged
tyt2y3 merged 6 commits intoSeaQL:masterfrom
Huliiiiii:new-expr
May 28, 2025
Merged

Remove conflicting implementation of 'Expr'#2604
tyt2y3 merged 6 commits intoSeaQL:masterfrom
Huliiiiii:new-expr

Conversation

@Huliiiiii
Copy link
Copy Markdown
Member

PR Info

  • Closes
  • Dependents:

New Features

Bug Fixes

Breaking Changes

Changes

Copy link
Copy Markdown
Member

@Expurple Expurple left a comment

Choose a reason for hiding this comment

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

Thank you.

Testing

For testing, one needs to append this to the workspace Cargo.toml:

[patch.crates-io]
sea-query = { git = "https://github.com/Huliiiiii/sea-query.git", branch = "expr-1" }

Actually, I'd temporarily include this change in the PR, while it's a draft and while SeaQL/sea-query#889 isn't merged. This would allow running CI checks on your PR. We need that.

My review

Everything seems OK. cargo test --workspace passes, but prints new warnings:

use of deprecated associated function `sea_query::SimpleExpr::expr`: Please use the [`SimpleExpr::new`] method

Could you fix the warnings, please?

I haven't run the other test configurations locally. I'd let the CI do that, after you include [patch.crates-io] in the PR.

@Huliiiiii
Copy link
Copy Markdown
Member Author

Regarding the warning, I am not sure whether SimpleExpr::expr should be deprecated yet, I am waiting for a response from the maintainer.

@Expurple
Copy link
Copy Markdown
Member

Expurple commented May 24, 2025

@tyt2y3, can you trigger a CI run, please? Both PRs look ready overall and only need your input on some details

@tyt2y3
Copy link
Copy Markdown
Member

tyt2y3 commented May 27, 2025

it looks small enough, nice.
I have branched off 1.1.x.
I will merge this onto master.

@Expurple
Copy link
Copy Markdown
Member

Expurple commented May 27, 2025

Apart from unrelated clippy complaints, the CI passes on both PRs 🎉

Now we can proceed with the merge:

  1. Merge the sea_query PR.
  2. Here, in the Cargo.toml, bump the sea_query dependency to version 1.0.0-rc.1 and patch sea_query to the upstream sea-query = { git = "https://github.com/SeaQL/sea-query.git", branch = "master" }. Check that the build works locally (or re-run the CI).
  3. Remove the draft status from this PR.
  4. Merge this PR.

@Huliiiiii Huliiiiii marked this pull request as ready for review May 27, 2025 10:38
@tyt2y3
Copy link
Copy Markdown
Member

tyt2y3 commented May 28, 2025

I'll fix it on master

@tyt2y3 tyt2y3 merged commit e87e6cb into SeaQL:master May 28, 2025
9 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants