From 1770ce3f259bc606440f79f35cb5d0866a9a4cd2 Mon Sep 17 00:00:00 2001 From: Billy Chan Date: Thu, 3 Feb 2022 21:56:45 +0800 Subject: [PATCH] Try restructured sea-query dependency (SeaQL/sea-schema#41) --- examples/rocket_example/migration/Cargo.toml | 2 +- .../migration/src/m20220120_000001_create_post_table.rs | 5 ++++- sea-orm-cli/Cargo.toml | 2 +- sea-orm-cli/template/migration/Cargo.toml | 2 +- .../template/migration/src/m20220101_000001_create_table.rs | 5 ++++- sea-orm-codegen/Cargo.toml | 2 +- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/examples/rocket_example/migration/Cargo.toml b/examples/rocket_example/migration/Cargo.toml index 9e28446dc..3c981c976 100644 --- a/examples/rocket_example/migration/Cargo.toml +++ b/examples/rocket_example/migration/Cargo.toml @@ -9,5 +9,5 @@ name = "migration" path = "src/lib.rs" [dependencies] -sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "schema-manager", default-features = false, features = [ "migration", "debug-print" ] } +sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "restructure-sea-query-dep", default-features = false, features = [ "migration", "debug-print" ] } entity = { path = "../entity" } diff --git a/examples/rocket_example/migration/src/m20220120_000001_create_post_table.rs b/examples/rocket_example/migration/src/m20220120_000001_create_post_table.rs index 084e53605..f22dcdd61 100644 --- a/examples/rocket_example/migration/src/m20220120_000001_create_post_table.rs +++ b/examples/rocket_example/migration/src/m20220120_000001_create_post_table.rs @@ -1,5 +1,8 @@ use entity::post::*; -use sea_schema::{migration::*, sea_query::*}; +use sea_schema::migration::{ + sea_query::{self, *}, + *, +}; pub struct Migration; diff --git a/sea-orm-cli/Cargo.toml b/sea-orm-cli/Cargo.toml index bceb5c46b..2e2a61585 100644 --- a/sea-orm-cli/Cargo.toml +++ b/sea-orm-cli/Cargo.toml @@ -22,7 +22,7 @@ clap = { version = "^2.33.3" } dotenv = { version = "^0.15" } async-std = { version = "^1.9", features = [ "attributes", "tokio1" ] } sea-orm-codegen = { version = "^0.5.0", path = "../sea-orm-codegen" } -sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "schema-manager", default-features = false, features = [ +sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "restructure-sea-query-dep", default-features = false, features = [ "debug-print", "sqlx-mysql", "sqlx-sqlite", diff --git a/sea-orm-cli/template/migration/Cargo.toml b/sea-orm-cli/template/migration/Cargo.toml index 718365b83..c55187a24 100644 --- a/sea-orm-cli/template/migration/Cargo.toml +++ b/sea-orm-cli/template/migration/Cargo.toml @@ -9,4 +9,4 @@ name = "migration" path = "src/lib.rs" [dependencies] -sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "schema-manager", default-features = false, features = [ "migration", "debug-print" ] } +sea-schema = { git = "https://github.com/SeaQL/sea-schema.git", branch = "restructure-sea-query-dep", default-features = false, features = [ "migration", "debug-print" ] } diff --git a/sea-orm-cli/template/migration/src/m20220101_000001_create_table.rs b/sea-orm-cli/template/migration/src/m20220101_000001_create_table.rs index 3cb1b38cf..df6dcf70c 100644 --- a/sea-orm-cli/template/migration/src/m20220101_000001_create_table.rs +++ b/sea-orm-cli/template/migration/src/m20220101_000001_create_table.rs @@ -1,4 +1,7 @@ -use sea_schema::{migration::*, sea_query::*}; +use sea_schema::migration::{ + sea_query::{self, *}, + *, +}; pub struct Migration; diff --git a/sea-orm-codegen/Cargo.toml b/sea-orm-codegen/Cargo.toml index 22ada992a..086a0e170 100644 --- a/sea-orm-codegen/Cargo.toml +++ b/sea-orm-codegen/Cargo.toml @@ -15,7 +15,7 @@ name = "sea_orm_codegen" path = "src/lib.rs" [dependencies] -sea-query = { version = "0.20.0" } +sea-query = { version = "0.21.0" } syn = { version = "^1", default-features = false, features = [ "derive", "parsing",