From ef27c2bd573bb564e3551f138e7e8101fa11afcc Mon Sep 17 00:00:00 2001 From: Sam Samai Date: Sun, 25 Jul 2021 21:12:38 +1000 Subject: [PATCH] Set sea-query to ~0.12.8 --- Cargo.toml | 20 +++++++++----------- examples/codegen/Cargo.toml | 6 +++--- sea-orm-codegen/Cargo.toml | 25 +++++++++++++++++-------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2ca1129c..f41b037e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,9 +42,8 @@ chrono = { version = "^0", optional = true } futures = { version = "^0.3" } futures-util = { version = "^0.3" } rust_decimal = { version = "^1", optional = true } -sea-query = { version = "^0.12" } +sea-query = { version = "~0.12.8" } # sea-query = { path = "../sea-query" } -# sea-query = { version = "^0.12", git = "https://github.com/samsamai/sea-query.git", branch = "ss/uuid" } sea-orm-macros = { path = "sea-orm-macros", optional = true } sea-orm-codegen = { path = "sea-orm-codegen", optional = true } serde = { version = "^1.0", features = ["derive"] } @@ -64,12 +63,7 @@ tokio = { version = "^1.6", features = ["full"] } actix-rt = { version = "2.2.0" } maplit = { version = "^1" } rust_decimal_macros = { version = "^1" } -sea-orm = { path = ".", features = [ - "sqlx-json", - "sqlx-chrono", - "sqlx-decimal", - "debug-print", -] } +sea-orm = { path = ".", features = ["debug-print"] } [features] debug-print = [] @@ -89,9 +83,13 @@ default = [ macros = ["sea-orm-macros"] codegen = ["sea-orm-codegen"] mock = [] -with-json = ["serde_json", "sea-query/with-json"] -with-chrono = ["chrono", "sea-query/with-chrono"] -with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal"] +with-json = ["serde_json", "sea-query/with-json", "sqlx-json"] +with-chrono = ["chrono", "sea-query/with-chrono", "sqlx-chrono"] +with-rust_decimal = [ + "rust_decimal", + "sea-query/with-rust_decimal", + "sqlx-decimal", +] with-uuid = [ "uuid", "sea-query/with-uuid", diff --git a/examples/codegen/Cargo.toml b/examples/codegen/Cargo.toml index 9b78ad0e..b991c3aa 100644 --- a/examples/codegen/Cargo.toml +++ b/examples/codegen/Cargo.toml @@ -5,10 +5,10 @@ edition = "2018" publish = false [dependencies] -async-std = { version = "^1.9", features = [ "attributes" ] } +async-std = { version = "^1.9", features = ["attributes"] } sea-orm = { path = "../../" } sea-orm-codegen = { path = "../../sea-orm-codegen" } -sea-query = { version = "^0.12" } -strum = { version = "^0.20", features = [ "derive" ] } +sea-query = { version = "~0.12.8" } +strum = { version = "^0.20", features = ["derive"] } serde_json = { version = "^1" } quote = { version = "^1" } diff --git a/sea-orm-codegen/Cargo.toml b/sea-orm-codegen/Cargo.toml index 94433fc2..72b04e0c 100644 --- a/sea-orm-codegen/Cargo.toml +++ b/sea-orm-codegen/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "sea-orm-codegen" version = "0.1.0" -authors = [ "Billy Chan " ] +authors = ["Billy Chan "] edition = "2018" description = "" license = "MIT OR Apache-2.0" documentation = "https://docs.rs/sea-orm" repository = "https://github.com/SeaQL/sea-orm" -categories = [ "database" ] -keywords = [ "orm", "database", "sql", "mysql", "postgres", "sqlite" ] +categories = ["database"] +keywords = ["orm", "database", "sql", "mysql", "postgres", "sqlite"] publish = false [lib] @@ -16,16 +16,25 @@ name = "sea_orm_codegen" path = "src/lib.rs" [dependencies] -sea-schema = { version = "^0.2", default-features = false, features = [ "sqlx-mysql", "discovery", "writer" ] } -sea-query = { version = "^0.12" } -sqlx = { version = "^0.5", default-features = false, features = [ "mysql" ] } -syn = { version = "^1", default-features = false, features = [ "derive", "parsing", "proc-macro", "printing" ] } +sea-schema = { version = "^0.2", default-features = false, features = [ + "sqlx-mysql", + "discovery", + "writer", +] } +sea-query = { version = "~0.12.8" } +sqlx = { version = "^0.5", default-features = false, features = ["mysql"] } +syn = { version = "^1", default-features = false, features = [ + "derive", + "parsing", + "proc-macro", + "printing", +] } quote = "^1" heck = "^0.3" proc-macro2 = "^1" [dev-dependencies] -async-std = { version = "^1.9", features = [ "attributes" ] } +async-std = { version = "^1.9", features = ["attributes"] } sea-orm = { path = "../" } [features]