diff --git a/Cargo.lock b/Cargo.lock index 3854c66b..b1d923eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1572,6 +1572,18 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +[[package]] +name = "educe" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "either" version = "1.9.0" @@ -1619,6 +1631,26 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "env_filter" version = "0.1.0" @@ -4161,9 +4193,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "0.12.15" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +checksum = "f9d4ec1cdd8bdd3553d3c946079f58efa33fedc477f32603652652abcef96fe6" dependencies = [ "async-stream", "async-trait", @@ -4189,9 +4221,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "0.12.15" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620bc560062ae251b1366bde43b3f1508445cab5c2c8cbdb397034638ab1b357" +checksum = "d525eee597817631f800857b0c2fe8645ec9c65b4304176a44bf14b93366009e" dependencies = [ "chrono", "clap", @@ -4206,9 +4238,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.12.15" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +checksum = "f363ead48b625a6f8f905322a820464f728fa4fe4f1c222bed5234ccf8fb8555" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4220,9 +4252,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "0.12.15" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8269bc6ff71afd6b78aa4333ac237a69eebd2cdb439036291e64fb4b8db23c" +checksum = "5df62369752f91b9295f8d71c146d84f818301a9ae7295106ebe8bbaa989a072" dependencies = [ "async-trait", "clap", @@ -4237,13 +4269,13 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.30.7" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +checksum = "7e5073b2cfed767511a57d18115f3b3d8bcb5690bf8c89518caec6cb22c0cd74" dependencies = [ "bigdecimal", "chrono", - "derivative", + "educe", "inherent", "ordered-float", "rust_decimal", @@ -4255,9 +4287,9 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +checksum = "754965d4aee6145bec25d0898e5c931e6c22859789ce62fd85a42a15ed5a8ce3" dependencies = [ "bigdecimal", "chrono", @@ -4284,9 +4316,9 @@ dependencies = [ [[package]] name = "sea-schema" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d148608012d25222442d1ebbfafd1228dbc5221baf4ec35596494e27a2394e" +checksum = "ad52149fc81836ea7424c3425d8f6ed8ad448dd16d2e4f6a3907ba46f3f2fd78" dependencies = [ "futures", "sea-query", @@ -4295,14 +4327,14 @@ dependencies = [ [[package]] name = "sea-schema-derive" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f686050f76bffc4f635cda8aea6df5548666b830b52387e8bc7de11056d11e" +checksum = "debdc8729c37fdbf88472f97fd470393089f997a909e535ff67c544d18cfccf0" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -4892,9 +4924,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" -version = "0.25.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "subtle" diff --git a/Cargo.toml b/Cargo.toml index fe136f89..18da09fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ default-features = false features = ["pkce-plain"] [dependencies.sea-orm] -version = "0.12.15" +version = "1.0.0" features = [ "runtime-tokio-rustls", "macros", diff --git a/migration/Cargo.toml b/migration/Cargo.toml index 627b3574..40a5f9cf 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -12,7 +12,7 @@ path = "src/lib.rs" [dependencies] async-std = { version = "1", features = ["attributes", "tokio1"] } clap = { version = "4.5.15", features = ["env", "derive"] } -sea-orm = "0.12.15" +sea-orm = "1.0.0" serde_json = "1.0.124" thiserror = "1.0.63" time = "0.3.36" @@ -20,8 +20,8 @@ tracing = "0.1.40" tracing-subscriber = "0.3.18" [dependencies.sea-orm-migration] -version = "0.12.15" +version = "1.0.0" features = ["runtime-tokio-rustls", "sqlx-postgres"] [dev-dependencies] -sea-orm = { version = "0.12.15", features = ["sqlx-sqlite"] } +sea-orm = { version = "1.0.0", features = ["sqlx-sqlite"] } diff --git a/src/entity/aggregator/protocol.rs b/src/entity/aggregator/protocol.rs index 8cfb422c..9590c03a 100644 --- a/src/entity/aggregator/protocol.rs +++ b/src/entity/aggregator/protocol.rs @@ -1,5 +1,5 @@ use rand::{distributions::Standard, prelude::Distribution}; -use sea_orm::{DeriveActiveEnum, EnumIter}; +use sea_orm::{prelude::StringLen, DeriveActiveEnum, EnumIter}; use serde::{Deserialize, Serialize}; use std::{ error::Error, @@ -8,7 +8,7 @@ use std::{ }; #[derive(Debug, Clone, Copy, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)] -#[sea_orm(rs_type = "String", db_type = "String(None)")] +#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")] pub enum Protocol { #[sea_orm(string_value = "DAP-09")] #[serde(rename = "DAP-09")] diff --git a/src/entity/codec.rs b/src/entity/codec.rs index 8231f355..14c9ced7 100644 --- a/src/entity/codec.rs +++ b/src/entity/codec.rs @@ -2,7 +2,7 @@ use janus_messages::codec::{Decode, Encode}; use prio::codec::CodecError; use sea_orm::{ entity::ColumnType, - sea_query::{ArrayType, BlobSize, Nullable, ValueType, ValueTypeErr}, + sea_query::{ArrayType, Nullable, ValueType, ValueTypeErr}, ColIdx, DbErr, QueryResult, TryGetError, TryGetable, Value, }; use serde::{Deserialize, Serialize}; @@ -92,7 +92,7 @@ impl ValueType for Codec { } fn column_type() -> ColumnType { - ColumnType::Binary(BlobSize::Blob(None)) + ColumnType::Blob } } diff --git a/src/entity/session.rs b/src/entity/session.rs index c568c283..e8665045 100644 --- a/src/entity/session.rs +++ b/src/entity/session.rs @@ -1,6 +1,6 @@ use sea_orm::{ - ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EntityTrait, - EnumIter, PrimaryKeyTrait, + ActiveModelBehavior, DeriveEntityModel, DerivePrimaryKey, DeriveRelation, EnumIter, + PrimaryKeyTrait, }; use serde::{Deserialize, Serialize}; use serde_json::Value; diff --git a/src/entity/url.rs b/src/entity/url.rs index 943d950f..f6bbed50 100644 --- a/src/entity/url.rs +++ b/src/entity/url.rs @@ -1,3 +1,4 @@ +use sea_orm::prelude::StringLen; use serde::{Deserialize, Serialize}; use std::{ fmt::{self, Display, Formatter}, @@ -104,7 +105,7 @@ impl sea_orm::sea_query::ValueType for Url { } fn column_type() -> sea_orm::entity::ColumnType { - sea_orm::entity::ColumnType::String(None) + sea_orm::entity::ColumnType::String(StringLen::None) } } diff --git a/test-support/Cargo.toml b/test-support/Cargo.toml index 5baad54c..a7a05b83 100644 --- a/test-support/Cargo.toml +++ b/test-support/Cargo.toml @@ -28,7 +28,7 @@ trillium-rustls = "0.8.1" trillium-tokio = "0.4.0" url = "2.5.2" uuid = { version = "1.10.0", features = ["v4", "fast-rng", "serde"] } -sea-orm = { version = "0.12.15", features = ["sqlx-sqlite"] } +sea-orm = { version = "1.0.0", features = ["sqlx-sqlite"] } pretty_assertions = "1.4.0" rand = "0.8.5" base64 = "0.22.1"