Bump clap version to 3.2

[smonv]

PR Info

• Closes update clap to last version: clap = { version = "3.1.8", #664

Changes

• sea-orm-cli: bump clap version to 3.1.17
• sea-orm-migration: bump clap version to 3.1.17

[ikrivosheev]

I think it is better to rewrite with the derive clap feature.

[smonv]

I think it is better to rewrite with the derive clap feature.

Currently I don't have much experience with clap derive so this MR just try to bump and resolve all breaking changes, keeping current behavior.

If the decision still is rewrite to derive, I hope we can continue as another issue I'll try to working on it.

[ikrivosheev]

I think it is better to rewrite with the derive clap feature.

Currently I don't have much experience with clap derive so this MR just try to bump and resolve all breaking changes, keeping current behavior.

If the decision still is rewrite to derive, I hope we can continue as another issue I'll try to working on it.

You can push changes with rewrite to derive in this branch. Code is built more maintainable with derive clap feature.
Can i help you with something?

[smonv]

I think it is better to rewrite with the derive clap feature.

Currently I don't have much experience with clap derive so this MR just try to bump and resolve all breaking changes, keeping current behavior.
If the decision still is rewrite to derive, I hope we can continue as another issue I'll try to working on it.

You can push changes with rewrite to derive in this branch. Code is built more maintainable with derive clap feature. Can i help you with something?

I'll try update to use clap derive. Currently I'm not sure what to ask, so I will ping you if necessary but I think it will be around meaning of some flag or env variables because I'm not familiar with functionality of all flags.

[igotfr]

the changes in the files main.rs and sea.rs are overengineering

[igotfr]

in cli.rs, lines 18 .env("DATABASE_URL"), and 29 .env("DATABASE_SCHEMA"),:

no method named `env` found for struct `Arg` in the current scope
method not found in `Arg<'_>`rustc[E0599](https://doc.rust-lang.org/error-index.html#E0599)

You probably don't see that because clap version 2.34 is necessary for sea-schema

[igotfr]

in cli.rs, lines 110 until 113:

for subcommand in get_subcommands() {
    migrate_subcommands =
        migrate_subcommands.subcommand(subcommand.arg(arg_migration_dir.clone()));
}

PS C:\Users\Usuario\prust\sea-orm2\sea-orm-cli> cargo check
    Checking sea-orm-cli v0.7.2 (C:\Users\Usuario\prust\sea-orm2\sea-orm-cli)
error[E0277]: the trait bound `clap::args::arg::Arg<'_, '_>: From<Arg<'_>>` is not satisfied
   --> src\cli.rs:110:59
    |
110 |             migrate_subcommands.subcommand(subcommand.arg(arg_migration_dir.clone()));
    |                                                       --- ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<Arg<'_>>` is not implemented for `clap::args::arg::Arg<'_, '_>`
    |                                                       |
    |                                                       required by a bound introduced by this call
    |
    = help: the following implementations were found:
              <clap::args::arg::Arg<'a, 'b> as From<&'z clap::args::arg::Arg<'a, 'b>>>
    = note: required because of the requirements on the impl of `Into<clap::args::arg::Arg<'_, '_>>`
for `Arg<'_>`
note: required by a bound in `clap::app::App::<'a, 'b>::arg`
   --> C:\Users\Usuario\.cargo\registry\src\github.com-1ecc6299db9ec823\clap-2.34.0\src\app\mod.rs:796:19
    |
796 |     pub fn arg<A: Into<Arg<'a, 'b>>>(mut self, a: A) -> Self {
    |                   ^^^^^^^^^^^^^^^^^ required by this bound in `clap::app::App::<'a, 'b>::arg`

error[E0277]: the trait bound `App<'_>: From<clap::app::App<'_, '_>>` is not satisfied
   --> src\cli.rs:105:44
    |
110 |             migrate_subcommands.subcommand(subcommand.arg(arg_migration_dir.clone()));
    |                                 ---------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait 
`From<clap::app::App<'_, '_>>` is not implemented for `App<'_>`
    |                                 |
    |                                 required by a bound introduced by this call
    |
    = note: required because of the requirements on the impl of `Into<App<'_>>` for `clap::app::App<'_, '_>`
note: required by a bound in `App::<'help>::subcommand`
   --> C:\Users\Usuario\.cargo\registry\src\github.com-1ecc6299db9ec823\clap-3.1.12\src\build\command.rs:367:26
    |
367 |     pub fn subcommand<S: Into<App<'help>>>(mut self, subcmd: S) -> Self {
    |                          ^^^^^^^^^^^^^^^^ required by this bound in `App::<'help>::subcommand`

For more information about this error, try `rustc --explain E0277`.
error: could not compile `sea-orm-cli` due to 2 previous errors

command.rs from clap 3

#[inline]
#[must_use]
pub fn subcommand<S: Into<App<'help>>>(mut self, subcmd: S) -> Self {
    self.subcommands.push(subcmd.into());
    self
}

You probably don't see that because clap version 2.34 is necessary for sea-schema

[smonv]

@cindRoberta thanks for pointing out, I missed the change in sea-schema.

I'll update more code with derive feature too.

[smonv]

@ikrivosheev I just update sea-orm-cli to new code structure using derive, maybe you can review it early.
Also I got some difficult while update testing code with new CLI interface and not sure how to test and make it pass. Can you help or give some insight about that part ?

[ikrivosheev]

@smonv thank you for contribution! Some comments

[ikrivosheev]

@smonv tests are passed. Can we review your PR or do you have some Todo?

[smonv]

@smonv tests are passed. Can we review your PR or do you have some Todo?

Yes, please help me review this. Sorry I update on last weekend so I forgot to request review.

[ikrivosheev]

LGTM!

[billy1624]

Hey @smonv, sorry for the delay. All in all, it looks good!

I found an issue with the updated migration CLI:

sea-orm/examples/tonic_example/migration on  pr/706 [$!] is 📦 v0.1.0 via 𝗥 v1.61.0 via 🅒 base
➜ DATABASE_URL="postgres://root:root@localhost/active_enum_tests" cargo r -- up -v
    Finished dev [unoptimized + debuginfo] target(s) in 0.20s
     Running `/Applications/MAMP/htdocs/sea-orm/examples/tonic_example/target/debug/migration up -v`
error: The argument '--verbose <VERBOSE>' requires a value but none was supplied

USAGE:
    migration up [OPTIONS]

For more information try --help

I updated the code and fixed some clippy warnings, feel free to review and cherrypick it onto this PR:

• smonv/sea-orm@i664...billy1624:pr/706

I changed the Option<bool> to bool for the verbose field. Just like what you did to the sea-orm-cli.

[smonv]

@billy1624 thanks for the help. I just cherry pick all your commit to this PR. Please help review it again.

[smonv]

I just push changes needed to bump clap to 3.2

[tyt2y3]

@billy1624 looks good?

[billy1624]

Thanks! @smonv Looks good!
CC @tyt2y3

[smonv]

Thanks! @smonv Looks good!
CC @tyt2y3

@tyt2y3 @billy1624 thank for helping me.

Happy to help!

[tyt2y3]

Thank you all