From f2156961d09cffe226fc617b1620a3b922e871ed Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 6 May 2023 21:07:44 +0300 Subject: [PATCH 01/16] Add Serialize/Deserialize Add Serialize/Deserialize for ActiveValue behind the "with-json" feature flag --- Cargo.toml | 2 +- src/entity/active_model.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 39a5fc1a0..eb6de919f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ default = [ ] macros = ["sea-orm-macros/derive", "sea-query/derive"] mock = [] -with-json = ["serde_json", "sea-query/with-json", "chrono?/serde", "time?/serde", "uuid?/serde", "sea-query-binder?/with-json", "sqlx?/json"] +with-json = ["serde_json", "sea-query/with-json", "chrono?/serde", "time?/serde", "uuid?/serde", "sea-query-binder?/with-json", "sqlx?/json", "serde/derive"] with-chrono = ["chrono", "sea-query/with-chrono", "sea-query-binder?/with-chrono", "sqlx?/chrono"] with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal", "sea-query-binder?/with-rust_decimal", "sqlx?/decimal"] with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder?/with-bigdecimal", "sqlx?/bigdecimal"] diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 656fc1853..5e3a18e32 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -2,7 +2,9 @@ use crate::{ error::*, ConnectionTrait, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, Value, }; use async_trait::async_trait; +use serde::{Serialize, Deserialize}; use sea_query::{Nullable, ValueTuple}; + use std::fmt::Debug; pub use ActiveValue::NotSet; @@ -36,6 +38,8 @@ pub use ActiveValue::NotSet; /// ); /// ``` #[derive(Clone, Debug)] +#[cfg(feature = "with-json")] +#[derive(Serialize, Deserialize)] pub enum ActiveValue where V: Into, From 926537498774b72d5b7ad60e8b4a8794a74c2f17 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 6 May 2023 21:19:52 +0300 Subject: [PATCH 02/16] Cargo fmt --- src/entity/active_model.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 5e3a18e32..587e03eac 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -2,8 +2,8 @@ use crate::{ error::*, ConnectionTrait, DeleteResult, EntityTrait, Iterable, PrimaryKeyToColumn, Value, }; use async_trait::async_trait; -use serde::{Serialize, Deserialize}; use sea_query::{Nullable, ValueTuple}; +use serde::{Deserialize, Serialize}; use std::fmt::Debug; From c2045ea850f9aa657c9d944384190f3de201ef01 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 7 May 2023 21:35:11 +0300 Subject: [PATCH 03/16] It just works --- sea-orm-macros/Cargo.toml | 1 + sea-orm-macros/src/derives/active_model.rs | 2 +- sea-orm-migration/Cargo.toml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sea-orm-macros/Cargo.toml b/sea-orm-macros/Cargo.toml index e11ea2ba3..f92e21c31 100644 --- a/sea-orm-macros/Cargo.toml +++ b/sea-orm-macros/Cargo.toml @@ -24,6 +24,7 @@ quote = { version = "1", default-features = false } heck = { version = "0.4", default-features = false } proc-macro2 = { version = "1", default-features = false } unicode-ident = { version = "1" } +serde = { version = "1.0", features = ["derive"] } [dev-dependencies] sea-orm = { path = "../", features = ["macros", "tests-cfg"] } diff --git a/sea-orm-macros/src/derives/active_model.rs b/sea-orm-macros/src/derives/active_model.rs index dbea86f1a..58cf32c38 100644 --- a/sea-orm-macros/src/derives/active_model.rs +++ b/sea-orm-macros/src/derives/active_model.rs @@ -78,7 +78,7 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result Ok(quote!( #[doc = " Generated by sea-orm-macros"] - #[derive(Clone, Debug, PartialEq)] + #[derive(Clone, Debug, PartialEq, serde::Serialize, serde::Deserialize)] pub struct ActiveModel { #( diff --git a/sea-orm-migration/Cargo.toml b/sea-orm-migration/Cargo.toml index 60da77ce2..e56433998 100644 --- a/sea-orm-migration/Cargo.toml +++ b/sea-orm-migration/Cargo.toml @@ -29,6 +29,7 @@ sea-schema = { version = "0.12.0-rc.1" } tracing = { version = "0.1", default-features = false, features = ["log"] } tracing-subscriber = { version = "0.3.17", default-features = false, features = ["env-filter", "fmt"] } futures = { version = "0.3", default-features = false, features = ["std"] } +serde = { version = "1.0", features = ["derive"] } [dev-dependencies] async-std = { version = "1", features = ["attributes", "tokio1"] } From 4322cd506508434ff8dc7c35bb06add94378e554 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 28 Oct 2023 19:14:04 +0200 Subject: [PATCH 04/16] Flatten ActiveValue --- sea-orm-macros/src/derives/active_model.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/sea-orm-macros/src/derives/active_model.rs b/sea-orm-macros/src/derives/active_model.rs index 87d36c2a1..18fbd65a8 100644 --- a/sea-orm-macros/src/derives/active_model.rs +++ b/sea-orm-macros/src/derives/active_model.rs @@ -75,6 +75,7 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result #( #[doc = " Generated by sea-orm-macros"] + #[serde(flatten)] pub #field: sea_orm::ActiveValue<#ty> ),* } From eb293e51b4c43f2367820b60d5adef8d5deda868 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 28 Oct 2023 19:25:21 +0200 Subject: [PATCH 05/16] replace flatten with default --- sea-orm-macros/src/derives/active_model.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sea-orm-macros/src/derives/active_model.rs b/sea-orm-macros/src/derives/active_model.rs index 18fbd65a8..608eb6a39 100644 --- a/sea-orm-macros/src/derives/active_model.rs +++ b/sea-orm-macros/src/derives/active_model.rs @@ -75,7 +75,7 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result #( #[doc = " Generated by sea-orm-macros"] - #[serde(flatten)] + #[serde(default)] pub #field: sea_orm::ActiveValue<#ty> ),* } From b44013b4fd3fdbc7575345f83e23fdd9118512e5 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 28 Oct 2023 19:29:30 +0200 Subject: [PATCH 06/16] fix active value --- src/entity/active_model.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 587e03eac..85ec88060 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -37,9 +37,8 @@ pub use ActiveValue::NotSet; /// r#"UPDATE "fruit" SET "name" = 'Orange' WHERE "fruit"."id" = 1"# /// ); /// ``` -#[derive(Clone, Debug)] -#[cfg(feature = "with-json")] -#[derive(Serialize, Deserialize)] +#[derive(Clone, Debug, Default)] +#[cfg(feature = "with-json", derive(Serialize, Deserialize))] pub enum ActiveValue where V: Into, @@ -49,6 +48,7 @@ where /// A defined [Value] remain unchanged Unchanged(V), /// An undefined [Value] + #[default] NotSet, } From c67abcd82a3f293a085f7375f31afbfc6d2b28ab Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 28 Oct 2023 19:31:49 +0200 Subject: [PATCH 07/16] fix derive default --- src/entity/active_model.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 85ec88060..40aeabff9 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -37,7 +37,7 @@ pub use ActiveValue::NotSet; /// r#"UPDATE "fruit" SET "name" = 'Orange' WHERE "fruit"."id" = 1"# /// ); /// ``` -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug)] #[cfg(feature = "with-json", derive(Serialize, Deserialize))] pub enum ActiveValue where @@ -48,7 +48,6 @@ where /// A defined [Value] remain unchanged Unchanged(V), /// An undefined [Value] - #[default] NotSet, } From 1bc942c6837c50dd10eef20aa60d3fd6a65c146e Mon Sep 17 00:00:00 2001 From: videobitva Date: Sat, 28 Oct 2023 19:32:56 +0200 Subject: [PATCH 08/16] fix cfg attr --- src/entity/active_model.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs index 40aeabff9..e89d142ee 100644 --- a/src/entity/active_model.rs +++ b/src/entity/active_model.rs @@ -38,7 +38,7 @@ pub use ActiveValue::NotSet; /// ); /// ``` #[derive(Clone, Debug)] -#[cfg(feature = "with-json", derive(Serialize, Deserialize))] +#[cfg_attr(feature = "with-json", derive(Serialize, Deserialize))] pub enum ActiveValue where V: Into, From 8548422ed3797608321cc37d1019760866f5c8be Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 08:42:31 +0200 Subject: [PATCH 09/16] Add with-ipnetwork to features --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index ab466cd0c..4af7c9bc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,6 +82,7 @@ with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal", "sea-query-b with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder?/with-bigdecimal", "sqlx?/bigdecimal"] with-uuid = ["uuid", "sea-query/with-uuid", "sea-query-binder?/with-uuid", "sqlx?/uuid"] with-time = ["time", "sea-query/with-time", "sea-query-binder?/with-time", "sqlx?/time"] +with-ipnetwork = ["sea-query/with-ipnetwork"] postgres-array = ["sea-query/postgres-array", "sea-query-binder?/postgres-array", "sea-orm-macros/postgres-array"] sea-orm-internal = [] sqlx-dep = [] From c47e7a8f323cfdd865aed5efea0bd8428316e7f6 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 09:15:46 +0200 Subject: [PATCH 10/16] Enable ipnetwork support --- Cargo.toml | 5 +++-- src/executor/query.rs | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4af7c9bc1..1fe7bbd45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ tracing = { version = "0.1", default-features = false, features = ["attributes", rust_decimal = { version = "1", default-features = false, optional = true } bigdecimal = { version = "0.3", default-features = false, optional = true } sea-orm-macros = { version = "0.12.0-rc.3", path = "sea-orm-macros", default-features = false, features = ["strum"] } -sea-query = { version = "0.29.0-rc.2", features = ["thread-safe"] } +sea-query = { version = "0.29.0-rc.2", features = ["thread-safe", "with-ipnetwork"] } sea-query-binder = { version = "0.4.0-rc.2", default-features = false, optional = true } strum = { version = "0.24", default-features = false } serde = { version = "1.0", default-features = false } @@ -44,6 +44,7 @@ uuid = { version = "1", default-features = false, optional = true } ouroboros = { version = "0.15", default-features = false } url = { version = "2.2", default-features = false } thiserror = { version = "1", default-features = false } +ipnetwork = {version = "0.19", features = ["serde"], optional = true} [dev-dependencies] smol = { version = "1.2" } @@ -82,7 +83,7 @@ with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal", "sea-query-b with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder?/with-bigdecimal", "sqlx?/bigdecimal"] with-uuid = ["uuid", "sea-query/with-uuid", "sea-query-binder?/with-uuid", "sqlx?/uuid"] with-time = ["time", "sea-query/with-time", "sea-query-binder?/with-time", "sqlx?/time"] -with-ipnetwork = ["sea-query/with-ipnetwork"] +with-ipnetwork = ["sea-query/with-ipnetwork", "ipnetwork", "sea-query-binder/with-ipnetwork"] postgres-array = ["sea-query/postgres-array", "sea-query-binder?/postgres-array", "sea-orm-macros/postgres-array"] sea-orm-internal = [] sqlx-dep = [] diff --git a/src/executor/query.rs b/src/executor/query.rs index 28093822b..5f25ff232 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -8,6 +8,8 @@ use crate::debug_print; use crate::driver::*; #[cfg(feature = "sqlx-dep")] use sqlx::Row; +#[cfg(feature = "with-ipnetwork")] +use ipnetwork::IpNetwork; /// Defines the result of a query operation on a Model #[derive(Debug)] @@ -531,6 +533,28 @@ impl TryGetable for BigDecimal { } } +#[cfg(feature = "with-ipnetwork")] +impl TryGetable for IpNetwork { + #[allow(unused_variables)] + fn try_get_by(res: &QueryResult, idx: I) -> Result { + match &res.row { + #[cfg(feature = "sqlx-postgres")] + QueryResultRow::SqlxPostgres(row) => row + .try_get::, _>(idx.as_sqlx_postgres_index()) + .map_err(|e| sqlx_error_to_query_err(e).into()) + .and_then(|opt| opt.ok_or_else(|| err_null_idx_col(idx))), + #[cfg(feature = "mock")] + #[allow(unused_variables)] + QueryResultRow::Mock(row) => row.try_get(idx).map_err(|e| { + debug_print!("{:#?}", e.to_string()); + err_null_idx_col(idx) + }), + #[allow(unreachable_patterns)] + _ => unreachable!(), + } + } +} + #[allow(unused_macros)] macro_rules! try_getable_uuid { ( $type: ty, $conversion_fn: expr ) => { From 0c250552e49c5d679b4b3483ba235f63589ff7ea Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:20:19 +0200 Subject: [PATCH 11/16] Enable mac_address support --- Cargo.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1fe7bbd45..3328b5da5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,8 @@ uuid = { version = "1", default-features = false, optional = true } ouroboros = { version = "0.15", default-features = false } url = { version = "2.2", default-features = false } thiserror = { version = "1", default-features = false } -ipnetwork = {version = "0.19", features = ["serde"], optional = true} +ipnetwork = {version = "0.19", default-features = false, optional = true} +mac_address = { version = "1.1.5", default-features = false, optional = true} [dev-dependencies] smol = { version = "1.2" } @@ -77,13 +78,14 @@ default = [ ] macros = ["sea-orm-macros/derive", "sea-query/derive"] mock = [] -with-json = ["serde_json", "sea-query/with-json", "chrono?/serde", "time?/serde", "uuid?/serde", "sea-query-binder?/with-json", "sqlx?/json", "serde/derive"] +with-json = ["serde_json", "sea-query/with-json", "chrono?/serde", "time?/serde", "uuid?/serde", "sea-query-binder?/with-json", "sqlx?/json", "serde/derive", "ipnetwork?/serde", "mac_address?/serde"] with-chrono = ["chrono", "sea-query/with-chrono", "sea-query-binder?/with-chrono", "sqlx?/chrono"] with-rust_decimal = ["rust_decimal", "sea-query/with-rust_decimal", "sea-query-binder?/with-rust_decimal", "sqlx?/decimal"] with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder?/with-bigdecimal", "sqlx?/bigdecimal"] with-uuid = ["uuid", "sea-query/with-uuid", "sea-query-binder?/with-uuid", "sqlx?/uuid"] with-time = ["time", "sea-query/with-time", "sea-query-binder?/with-time", "sqlx?/time"] with-ipnetwork = ["sea-query/with-ipnetwork", "ipnetwork", "sea-query-binder/with-ipnetwork"] +with-mac_address = ["sea-query/mac_address", "sea-query-binder/mac_address", "mac_address"] postgres-array = ["sea-query/postgres-array", "sea-query-binder?/postgres-array", "sea-orm-macros/postgres-array"] sea-orm-internal = [] sqlx-dep = [] From bce50bbbbcdd7de77ab0c096811964ede9f4e1fc Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:29:04 +0200 Subject: [PATCH 12/16] Enable mac_address support --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3328b5da5..8548f055c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ tracing = { version = "0.1", default-features = false, features = ["attributes", rust_decimal = { version = "1", default-features = false, optional = true } bigdecimal = { version = "0.3", default-features = false, optional = true } sea-orm-macros = { version = "0.12.0-rc.3", path = "sea-orm-macros", default-features = false, features = ["strum"] } -sea-query = { version = "0.29.0-rc.2", features = ["thread-safe", "with-ipnetwork"] } +sea-query = { version = "0.29.0-rc.2", features = ["thread-safe", "with-ipnetwork", "with-mac_address"], optional = true } sea-query-binder = { version = "0.4.0-rc.2", default-features = false, optional = true } strum = { version = "0.24", default-features = false } serde = { version = "1.0", default-features = false } @@ -85,7 +85,7 @@ with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder? with-uuid = ["uuid", "sea-query/with-uuid", "sea-query-binder?/with-uuid", "sqlx?/uuid"] with-time = ["time", "sea-query/with-time", "sea-query-binder?/with-time", "sqlx?/time"] with-ipnetwork = ["sea-query/with-ipnetwork", "ipnetwork", "sea-query-binder/with-ipnetwork"] -with-mac_address = ["sea-query/mac_address", "sea-query-binder/mac_address", "mac_address"] +with-mac_address = ["sea-query/with-mac_address", "sea-query-binder/with-mac_address", "mac_address"] postgres-array = ["sea-query/postgres-array", "sea-query-binder?/postgres-array", "sea-orm-macros/postgres-array"] sea-orm-internal = [] sqlx-dep = [] From f7c8770bbcd58c029abd7bc5d225c78a9cda53ac Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:30:56 +0200 Subject: [PATCH 13/16] Enable mac_address support --- src/executor/query.rs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/executor/query.rs b/src/executor/query.rs index 5f25ff232..b8ab9d522 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -10,6 +10,8 @@ use crate::driver::*; use sqlx::Row; #[cfg(feature = "with-ipnetwork")] use ipnetwork::IpNetwork; +#[cfg(feature = "with-mac_address")] +use mac_address::MacAddress; /// Defines the result of a query operation on a Model #[derive(Debug)] @@ -555,6 +557,28 @@ impl TryGetable for IpNetwork { } } +#[cfg(feature = "with-mac_address")] +impl TryGetable for MacAddress { + #[allow(unused_variables)] + fn try_get_by(res: &QueryResult, idx: I) -> Result { + match &res.row { + #[cfg(feature = "sqlx-postgres")] + QueryResultRow::SqlxPostgres(row) => row + .try_get::, _>(idx.as_sqlx_postgres_index()) + .map_err(|e| sqlx_error_to_query_err(e).into()) + .and_then(|opt| opt.ok_or_else(|| err_null_idx_col(idx))), + #[cfg(feature = "mock")] + #[allow(unused_variables)] + QueryResultRow::Mock(row) => row.try_get(idx).map_err(|e| { + debug_print!("{:#?}", e.to_string()); + err_null_idx_col(idx) + }), + #[allow(unreachable_patterns)] + _ => unreachable!(), + } + } +} + #[allow(unused_macros)] macro_rules! try_getable_uuid { ( $type: ty, $conversion_fn: expr ) => { From bbd8f40a3de789d14c2c1b459c738c407ab616e6 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:32:58 +0200 Subject: [PATCH 14/16] Enable mac_address support --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 8548f055c..d9ef9b8ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,7 +85,7 @@ with-bigdecimal = ["bigdecimal", "sea-query/with-bigdecimal", "sea-query-binder? with-uuid = ["uuid", "sea-query/with-uuid", "sea-query-binder?/with-uuid", "sqlx?/uuid"] with-time = ["time", "sea-query/with-time", "sea-query-binder?/with-time", "sqlx?/time"] with-ipnetwork = ["sea-query/with-ipnetwork", "ipnetwork", "sea-query-binder/with-ipnetwork"] -with-mac_address = ["sea-query/with-mac_address", "sea-query-binder/with-mac_address", "mac_address"] +with-mac_address = ["mac_address", "sea-query/with-mac_address", "sea-query-binder?/with-mac_address"] postgres-array = ["sea-query/postgres-array", "sea-query-binder?/postgres-array", "sea-orm-macros/postgres-array"] sea-orm-internal = [] sqlx-dep = [] From e6db66688bf7dabbfe1e18fc3eb67fb9d83ebf42 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:34:01 +0200 Subject: [PATCH 15/16] Enable mac_address support --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d9ef9b8ca..c48902905 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ tracing = { version = "0.1", default-features = false, features = ["attributes", rust_decimal = { version = "1", default-features = false, optional = true } bigdecimal = { version = "0.3", default-features = false, optional = true } sea-orm-macros = { version = "0.12.0-rc.3", path = "sea-orm-macros", default-features = false, features = ["strum"] } -sea-query = { version = "0.29.0-rc.2", features = ["thread-safe", "with-ipnetwork", "with-mac_address"], optional = true } +sea-query = { version = "0.29.0-rc.2", features = ["thread-safe"], optional = true } sea-query-binder = { version = "0.4.0-rc.2", default-features = false, optional = true } strum = { version = "0.24", default-features = false } serde = { version = "1.0", default-features = false } From 01fc1ffeeb5d283cf432199990153a7d49b5b1b8 Mon Sep 17 00:00:00 2001 From: videobitva Date: Sun, 11 Feb 2024 23:34:57 +0200 Subject: [PATCH 16/16] Enable mac_address support --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c48902905..4bae24805 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ tracing = { version = "0.1", default-features = false, features = ["attributes", rust_decimal = { version = "1", default-features = false, optional = true } bigdecimal = { version = "0.3", default-features = false, optional = true } sea-orm-macros = { version = "0.12.0-rc.3", path = "sea-orm-macros", default-features = false, features = ["strum"] } -sea-query = { version = "0.29.0-rc.2", features = ["thread-safe"], optional = true } +sea-query = { version = "0.29.0-rc.2", features = ["thread-safe"] } sea-query-binder = { version = "0.4.0-rc.2", default-features = false, optional = true } strum = { version = "0.24", default-features = false } serde = { version = "1.0", default-features = false }