diff --git a/Cargo.lock b/Cargo.lock index 2696913a31..04f61fa501 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -65,7 +65,6 @@ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -243,7 +242,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", "thiserror", "tokio", "util", @@ -1505,13 +1504,16 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ + "autocfg", + "libm", "num-bigint", "num-integer", "num-traits", + "serde", ] [[package]] @@ -2517,7 +2519,7 @@ dependencies = [ "settings", "sha2", "sqlx", - "strum", + "strum 0.25.0", "subtle", "supermaven_api", "telemetry_events", @@ -2766,7 +2768,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "task", "theme", "ui", @@ -3345,17 +3347,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" version = "0.99.18" @@ -3625,6 +3616,18 @@ dependencies = [ "workspace", ] +[[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.72", +] + [[package]] name = "either" version = "1.13.0" @@ -3716,6 +3719,26 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" +[[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.72", +] + [[package]] name = "enumflags2" version = "0.7.10" @@ -4815,7 +4838,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", ] [[package]] @@ -4913,7 +4936,7 @@ dependencies = [ "slotmap", "smallvec", "smol", - "strum", + "strum 0.25.0", "sum_tree", "taffy", "thiserror", @@ -5048,9 +5071,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -5618,7 +5641,7 @@ dependencies = [ "paths", "pretty_assertions", "serde", - "strum", + "strum 0.25.0", "util", ] @@ -6123,7 +6146,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "text", "theme", "tiktoken-rs", @@ -6329,9 +6352,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -7411,7 +7434,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", ] [[package]] @@ -9231,7 +9254,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "strum", + "strum 0.25.0", "tracing", "util", "zstd", @@ -9568,9 +9591,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +checksum = "1ef282b794f7d3426f61f530854705963b1941e7584ea84fb98528e504fac7c7" dependencies = [ "async-stream", "async-trait", @@ -9586,7 +9609,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "strum", + "strum 0.26.3", "thiserror", "time", "tracing", @@ -9596,9 +9619,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +checksum = "07aadcb2ee9fad78a3bf74f6430ba94865ab4d8ad237f978e99dafa97ee0df57" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -9610,13 +9633,13 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.30.7" +version = "0.32.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +checksum = "6fba498acd58ce434669f273505cd07737065472eb541c3f813c7f4ce33993f5" dependencies = [ "bigdecimal", "chrono", - "derivative", + "educe", "inherent", "ordered-float 3.9.2", "rust_decimal", @@ -9627,9 +9650,9 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.5.0" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +checksum = "edc3296903e60ddc7c9f4601cd6ef31a4b1584bf22480587e00b9ef743071b57" dependencies = [ "bigdecimal", "chrono", @@ -10371,9 +10394,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c" dependencies = [ "sqlx-core", "sqlx-macros", @@ -10384,11 +10407,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" dependencies = [ - "ahash 0.8.11", "atoi", "bigdecimal", "byteorder", @@ -10396,14 +10418,14 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap 2.3.0", @@ -10432,26 +10454,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -10463,7 +10485,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.72", "tempfile", "tokio", "url", @@ -10471,12 +10493,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10518,12 +10540,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10549,7 +10571,6 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -10563,9 +10584,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" dependencies = [ "atoi", "chrono", @@ -10579,6 +10600,7 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "time", "tracing", @@ -10629,7 +10651,7 @@ dependencies = [ "settings", "simplelog", "story", - "strum", + "strum 0.25.0", "theme", "title_bar", "ui", @@ -10696,6 +10718,12 @@ dependencies = [ "strum_macros", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.25.3" @@ -11266,7 +11294,7 @@ dependencies = [ "serde_json", "serde_json_lenient", "simplelog", - "strum", + "strum 0.25.0", "theme", "vscode_theme", ] @@ -12158,7 +12186,7 @@ dependencies = [ "settings", "smallvec", "story", - "strum", + "strum 0.25.0", "theme", "windows 0.58.0", ] @@ -13114,12 +13142,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "weezl" diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index eb68fd96ad..f8ba847ab2 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -50,14 +50,14 @@ rand.workspace = true reqwest = { version = "0.11", features = ["json"] } rpc.workspace = true scrypt = "0.11" -sea-orm = { version = "0.12.x", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] } +sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls", "with-uuid"] } semantic_version.workspace = true semver.workspace = true serde.workspace = true serde_derive.workspace = true serde_json.workspace = true sha2.workspace = true -sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] } +sqlx = { version = "0.8", features = ["runtime-tokio-rustls", "postgres", "json", "time", "uuid", "any"] } strum.workspace = true subtle.workspace = true rustc-demangle.workspace = true @@ -109,11 +109,11 @@ remote = { workspace = true, features = ["test-support"] } remote_server.workspace = true dev_server_projects.workspace = true rpc = { workspace = true, features = ["test-support"] } -sea-orm = { version = "0.12.x", features = ["sqlx-sqlite"] } +sea-orm = { version = "1.1.0-rc.1", features = ["sqlx-sqlite"] } serde_json.workspace = true session = { workspace = true, features = ["test-support"] } settings = { workspace = true, features = ["test-support"] } -sqlx = { version = "0.7", features = ["sqlite"] } +sqlx = { version = "0.8", features = ["sqlite"] } theme.workspace = true unindent.workspace = true util.workspace = true diff --git a/crates/collab/src/db/ids.rs b/crates/collab/src/db/ids.rs index 4443938844..e52043bee2 100644 --- a/crates/collab/src/db/ids.rs +++ b/crates/collab/src/db/ids.rs @@ -99,7 +99,7 @@ id_type!(UserId); #[derive( Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash, Serialize, )] -#[sea_orm(rs_type = "String", db_type = "String(None)")] +#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")] pub enum ChannelRole { /// Admin can read/write and change permissions. #[sea_orm(string_value = "admin")] @@ -239,7 +239,7 @@ impl Into for ChannelRole { /// ChannelVisibility controls whether channels are public or private. #[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash)] -#[sea_orm(rs_type = "String", db_type = "String(None)")] +#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")] pub enum ChannelVisibility { /// Public channels are visible to anyone with the link. People join with the Guest role by default. #[sea_orm(string_value = "public")] diff --git a/crates/collab/src/db/tables/billing_subscription.rs b/crates/collab/src/db/tables/billing_subscription.rs index b2b345d475..5eb0e427de 100644 --- a/crates/collab/src/db/tables/billing_subscription.rs +++ b/crates/collab/src/db/tables/billing_subscription.rs @@ -39,7 +39,7 @@ impl ActiveModelBehavior for ActiveModel {} #[derive( Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Default, Hash, Serialize, )] -#[sea_orm(rs_type = "String", db_type = "String(None)")] +#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")] #[serde(rename_all = "snake_case")] pub enum StripeSubscriptionStatus { #[default] diff --git a/crates/sqlez/Cargo.toml b/crates/sqlez/Cargo.toml index 6f25ba982c..461017dd8d 100644 --- a/crates/sqlez/Cargo.toml +++ b/crates/sqlez/Cargo.toml @@ -13,7 +13,7 @@ anyhow.workspace = true collections.workspace = true futures.workspace = true indoc.workspace = true -libsqlite3-sys = { version = "0.26", features = ["bundled"] } +libsqlite3-sys = { version = "0.28", features = ["bundled"] } parking_lot.workspace = true smol.workspace = true thread_local = "1.1.4"