From e4044b7415b27de21b5fcb8d4b16994de880908a Mon Sep 17 00:00:00 2001 From: Valentin Tolmer Date: Sun, 30 Mar 2025 21:35:13 +0200 Subject: [PATCH] dependencies: Upgrade sea-orm to 1.1.8 --- Cargo.lock | 381 +++++++++++++++---------- Cargo.toml | 4 + crates/auth/Cargo.toml | 3 +- crates/domain-model/Cargo.toml | 3 +- crates/domain-model/src/model/users.rs | 18 +- crates/domain/Cargo.toml | 3 +- crates/domain/src/types.rs | 19 +- server/Cargo.toml | 3 +- server/src/domain/sql_migrations.rs | 16 +- 9 files changed, 262 insertions(+), 188 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4541d73..63f3e87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,7 +113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -250,7 +250,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -276,7 +276,7 @@ checksum = "b6ac1e58cded18cb28ddc17143c4dea5345b3ad575e14f32f66e4054a56eb271" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -443,7 +443,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.66", "time", ] @@ -505,7 +505,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -516,7 +516,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -786,7 +786,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -820,6 +820,15 @@ dependencies = [ "unreachable", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -980,9 +989,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" +checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array", "subtle", @@ -990,9 +999,9 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ "generic-array", "subtle", @@ -1106,17 +1115,6 @@ dependencies = [ "powerfmt", ] -[[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_builder" version = "0.12.0" @@ -1158,7 +1156,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -1178,7 +1176,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", "unicode-xid", ] @@ -1245,7 +1243,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -1329,9 +1327,14 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] name = "failure" @@ -1437,6 +1440,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1540,7 +1549,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -1700,7 +1709,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.66", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1726,7 +1735,7 @@ dependencies = [ "js-sys", "serde", "serde_json", - "thiserror", + "thiserror 1.0.66", "wasm-bindgen", "web-sys", ] @@ -1795,7 +1804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1abd4ce5247dfc04a03ccde70f87a048458c9356c7e41d21ad8c407b3dde6f2" dependencies = [ "combine", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1805,7 +1814,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" dependencies = [ "combine", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -1917,24 +1926,25 @@ name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", - "allocator-api2", -] [[package]] name = "hashbrown" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hashlink" -version = "0.8.4" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -1951,9 +1961,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -1998,7 +2005,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ - "crypto-mac 0.10.1", + "crypto-mac 0.10.0", "digest 0.9.0", ] @@ -2008,7 +2015,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -2233,7 +2240,7 @@ checksum = "0122b7114117e64a63ac49f752a5ca4624d534c7b1c7de796ac196381cd2d947" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -2343,7 +2350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e46349d67dc03bdbdb28da0337a355a53ca1d5156452722c36fe21d0e6389b" dependencies = [ "base64 0.13.1", - "crypto-mac 0.10.1", + "crypto-mac 0.10.0", "digest 0.9.0", "hmac 0.10.1", "serde", @@ -2408,7 +2415,7 @@ dependencies = [ "ring 0.16.20", "rustls 0.21.12", "rustls-native-certs", - "thiserror", + "thiserror 1.0.66", "tokio", "tokio-rustls 0.24.1", "tokio-stream", @@ -2428,7 +2435,7 @@ dependencies = [ "lber", "nom", "peg", - "thiserror", + "thiserror 1.0.66", "tokio-util", "tracing", "uuid 1.11.0", @@ -2454,7 +2461,7 @@ dependencies = [ "once_cell", "quoted_printable", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "socket2 0.4.10", "tokio", @@ -2476,9 +2483,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -2526,7 +2533,7 @@ dependencies = [ "futures-util", "graphql_client 0.11.0", "hmac 0.12.1", - "http 0.2.12", + "http 1.1.0", "itertools", "juniper", "jwt 0.16.0", @@ -2549,15 +2556,15 @@ dependencies = [ "rand_chacha 0.3.1", "reqwest", "rustls 0.20.9", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "sea-orm", "secstr", "serde", "serde_json", "serial_test", "sha2 0.10.8", - "strum", - "thiserror", + "strum 0.25.0", + "thiserror 1.0.66", "time", "tokio", "tokio-rustls 0.23.4", @@ -2623,7 +2630,7 @@ dependencies = [ "sea-orm", "serde", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.66", ] [[package]] @@ -2642,7 +2649,7 @@ dependencies = [ "sea-orm", "serde", "serde_bytes", - "strum", + "strum 0.25.0", "uuid 1.11.0", ] @@ -2679,7 +2686,7 @@ dependencies = [ "sea-orm", "serde", "serde_bytes", - "thiserror", + "thiserror 1.0.66", "uuid 1.11.0", ] @@ -3028,7 +3035,7 @@ dependencies = [ "rand 0.8.5", "serde", "subtle", - "thiserror", + "thiserror 1.0.66", "zeroize", ] @@ -3040,9 +3047,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "ordered-float" -version = "3.9.2" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951" dependencies = [ "num-traits", ] @@ -3062,9 +3069,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.2" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954" +checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59" dependencies = [ "aliasable", "ouroboros_macro", @@ -3073,15 +3080,15 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.2" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8" +checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0" dependencies = [ "heck 0.4.1", - "proc-macro-error", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -3090,6 +3097,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.3" @@ -3139,7 +3152,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -3201,7 +3214,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -3352,14 +3365,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] name = "proc-macro2" -version = "1.0.89" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -3372,7 +3385,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", "version_check", "yansi", ] @@ -3570,7 +3583,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -3715,6 +3728,20 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls" +version = "0.23.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.103.1", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -3722,7 +3749,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -3736,6 +3763,21 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" + [[package]] name = "rustls-webpki" version = "0.100.3" @@ -3756,6 +3798,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.103.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.18" @@ -3809,19 +3862,19 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] name = "sea-orm" -version = "0.12.15" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +checksum = "013d6c9e421b9c44c6eb6ebbee283b2a2c90eab2682088c4a2449706a42d117f" dependencies = [ "async-stream", "async-trait", "chrono", - "futures", + "futures-util", "log", "ouroboros", "sea-orm-macros", @@ -3829,8 +3882,8 @@ dependencies = [ "sea-query-binder", "serde", "sqlx", - "strum", - "thiserror", + "strum 0.26.3", + "thiserror 2.0.12", "tracing", "url", "uuid 1.11.0", @@ -3838,26 +3891,25 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.12.15" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +checksum = "31feeff3ad5e999c64b2b8fd30933b2871911567c4d62dcf70b3effd970c7891" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "sea-bae", - "syn 2.0.86", + "syn 2.0.100", "unicode-ident", ] [[package]] name = "sea-query" -version = "0.30.7" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +checksum = "f5a24d8b9fcd2674a6c878a3d871f4f1380c6c43cc3718728ac96864d888458e" dependencies = [ "chrono", - "derivative", "inherent", "ordered-float", "uuid 1.11.0", @@ -3865,9 +3917,9 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608" dependencies = [ "chrono", "sea-query", @@ -3952,7 +4004,7 @@ checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -4010,7 +4062,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -4117,6 +4169,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smartstring" @@ -4180,21 +4235,11 @@ dependencies = [ "der", ] -[[package]] -name = "sqlformat" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bba3a93db0cc4f7bdece8bb09e77e2e785c20bfebf79eb8340ed80708048790" -dependencies = [ - "nom", - "unicode_categories", -] - [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "4410e73b3c0d8442c5f99b425d7a435b5ee0ae4167b3196771dd3f7a01be745f" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4205,70 +4250,64 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "6a007b6936676aa9ab40207cde35daab0a04b823be8ae004368c0793b96a61e0" dependencies = [ - "ahash", - "atoi", - "byteorder", "bytes", "chrono", "crc", "crossbeam-queue", "either", "event-listener", - "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.15.0", "hashlink", - "hex", "indexmap 2.6.0", "log", "memchr", "once_cell", - "paste", "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile", + "rustls 0.23.25", + "rustls-pemfile 2.2.0", "serde", "serde_json", "sha2 0.10.8", "smallvec", - "sqlformat", - "thiserror", + "thiserror 2.0.12", "tokio", "tokio-stream", "tracing", "url", "uuid 1.11.0", - "webpki-roots 0.25.4", + "webpki-roots 0.26.8", ] [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "3112e2ad78643fef903618d78cf0aec1cb3134b019730edb039b69eaf531f310" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.100", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "4e9f90acc5ab146a99bf5061a7eb4976b573f560bc898ef3bf8435448dd5e7ad" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -4280,7 +4319,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.100", "tempfile", "tokio", "url", @@ -4288,12 +4327,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "4560278f0e00ce64938540546f59f590d60beee33fffbd3b9cd47851e5fff233" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "bytes", @@ -4324,7 +4363,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 2.0.12", "tracing", "uuid 1.11.0", "whoami", @@ -4332,12 +4371,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "c5b98a57f363ed6764d5b3a12bfedf62f07aa16e1856a7ddc2a0bb190a959613" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.6.0", "byteorder", "chrono", @@ -4346,7 +4385,6 @@ dependencies = [ "etcetera", "futures-channel", "futures-core", - "futures-io", "futures-util", "hex", "hkdf 0.12.4", @@ -4364,7 +4402,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 2.0.12", "tracing", "uuid 1.11.0", "whoami", @@ -4372,9 +4410,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "f85ca71d3a5b24e64e1d08dd8fe36c6c95c339a896cc33068148906784620540" dependencies = [ "atoi", "chrono", @@ -4388,10 +4426,10 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "tracing", "url", - "urlencoding", "uuid 1.11.0", ] @@ -4433,6 +4471,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" @@ -4443,14 +4487,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -4465,9 +4509,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.86" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89275301d38033efb81a6e60e3497e734dfcc62571f2854bf4b16690398824c" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -4549,7 +4593,16 @@ version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.66", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -4560,7 +4613,18 @@ checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", ] [[package]] @@ -4645,7 +4709,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -4766,7 +4830,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -4787,7 +4851,7 @@ checksum = "ee40835db14ddd1e3ba414292272eddde9dad04d3d4b65509656414d1c42592f" dependencies = [ "chrono", "smallvec", - "thiserror", + "thiserror 1.0.66", "tokio", "tracing", "tracing-subscriber", @@ -4900,12 +4964,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "unreachable" version = "1.0.0" @@ -5107,7 +5165,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -5141,7 +5199,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5196,6 +5254,15 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "whoami" version = "1.5.2" @@ -5417,7 +5484,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.66", "time", ] @@ -5473,7 +5540,7 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_urlencoded", - "thiserror", + "thiserror 1.0.66", "wasm-bindgen", "web-sys", "yew", @@ -5533,7 +5600,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] @@ -5553,7 +5620,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.86", + "syn 2.0.100", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index ef30043..cb21a15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,3 +23,7 @@ opt-level = 's' [patch.crates-io.lber] git = 'https://github.com/inejge/ldap3/' + +[workspace.dependencies.sea-orm] +version = "1.1.8" +default-features = false diff --git a/crates/auth/Cargo.toml b/crates/auth/Cargo.toml index 06dd932..d4e753b 100644 --- a/crates/auth/Cargo.toml +++ b/crates/auth/Cargo.toml @@ -39,8 +39,7 @@ version = "*" features = ["serde"] [dependencies.sea-orm] -version = "0.12" -default-features = false +workspace = true features = ["macros"] optional = true diff --git a/crates/domain-model/Cargo.toml b/crates/domain-model/Cargo.toml index 1e35938..10ecb34 100644 --- a/crates/domain-model/Cargo.toml +++ b/crates/domain-model/Cargo.toml @@ -35,8 +35,7 @@ features = ["opaque_server", "opaque_client", "sea_orm"] path = "../domain" [dependencies.sea-orm] -version = "0.12" -default-features = false +workspace = true features = [ "macros", "with-chrono", diff --git a/crates/domain-model/src/model/users.rs b/crates/domain-model/src/model/users.rs index 6f17188..50cf377 100644 --- a/crates/domain-model/src/model/users.rs +++ b/crates/domain-model/src/model/users.rs @@ -1,6 +1,6 @@ //! `SeaORM` Entity. Generated by sea-orm-codegen 0.10.3 -use sea_orm::{entity::prelude::*, sea_query::BlobSize}; +use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; use lldap_domain::types::{Email, UserId, Uuid}; @@ -47,15 +47,15 @@ impl ColumnTrait for Column { fn def(&self) -> ColumnDef { match self { - Column::UserId => ColumnType::String(Some(255)), - Column::Email => ColumnType::String(Some(255)), - Column::LowercaseEmail => ColumnType::String(Some(255)), - Column::DisplayName => ColumnType::String(Some(255)), + Column::UserId => ColumnType::String(StringLen::N(255)), + Column::Email => ColumnType::String(StringLen::N(255)), + Column::LowercaseEmail => ColumnType::String(StringLen::N(255)), + Column::DisplayName => ColumnType::String(StringLen::N(255)), Column::CreationDate => ColumnType::DateTime, - Column::PasswordHash => ColumnType::Binary(BlobSize::Medium), - Column::TotpSecret => ColumnType::String(Some(64)), - Column::MfaType => ColumnType::String(Some(64)), - Column::Uuid => ColumnType::String(Some(36)), + Column::PasswordHash => ColumnType::Blob, + Column::TotpSecret => ColumnType::String(StringLen::N(64)), + Column::MfaType => ColumnType::String(StringLen::N(64)), + Column::Uuid => ColumnType::String(StringLen::N(36)), } .def() } diff --git a/crates/domain/Cargo.toml b/crates/domain/Cargo.toml index 8670b57..826cf0a 100644 --- a/crates/domain/Cargo.toml +++ b/crates/domain/Cargo.toml @@ -40,8 +40,7 @@ path = "../auth" features = ["opaque_server", "opaque_client", "sea_orm"] [dependencies.sea-orm] -version = "0.12" -default-features = false +workspace = true features = [ "macros", "with-chrono", diff --git a/crates/domain/src/types.rs b/crates/domain/src/types.rs index 9d93e59..2ef43dd 100644 --- a/crates/domain/src/types.rs +++ b/crates/domain/src/types.rs @@ -5,7 +5,10 @@ use chrono::{NaiveDateTime, TimeZone}; use lldap_auth::types::CaseInsensitiveString; use sea_orm::{ entity::IntoActiveValue, - sea_query::{value::ValueType, ArrayType, BlobSize, ColumnType, Nullable, ValueTypeErr}, + sea_query::{ + extension::mysql::MySqlType, value::ValueType, ArrayType, ColumnType, Nullable, SeaRc, + StringLen, ValueTypeErr, + }, DbErr, DeriveValueType, QueryResult, TryFromU64, TryGetError, TryGetable, Value, }; use serde::{Deserialize, Serialize}; @@ -26,7 +29,7 @@ pub use lldap_auth::types::UserId; derive_more::Display, )] #[serde(try_from = "&str")] -#[sea_orm(column_type = "String(Some(36))")] +#[sea_orm(column_type = "String(StringLen::N(36))")] #[debug(r#""{_0}""#)] #[display("{_0}")] pub struct Uuid(String); @@ -74,7 +77,10 @@ macro_rules! uuid { } #[derive(Clone, PartialEq, Eq, Hash, Serialize, Deserialize, DeriveValueType)] -#[sea_orm(column_type = "Binary(BlobSize::Long)", array_type = "Bytes")] +#[sea_orm( + column_type = "Custom(SeaRc::new(MySqlType::LongBlob))", + array_type = "Bytes" +)] pub struct Serialized(Vec); const SERIALIZED_I64_LEN: usize = 8; @@ -308,7 +314,10 @@ impl AsRef for GroupName { } #[derive(PartialEq, Eq, Clone, Serialize, Deserialize, DeriveValueType, Hash)] -#[sea_orm(column_type = "Binary(BlobSize::Long)", array_type = "Bytes")] +#[sea_orm( + column_type = "Custom(SeaRc::new(MySqlType::LongBlob))", + array_type = "Bytes" +)] pub struct JpegPhoto(#[serde(with = "serde_bytes")] Vec); impl From<&JpegPhoto> for Value { @@ -633,7 +642,7 @@ impl ValueType for AttributeType { } fn column_type() -> ColumnType { - ColumnType::String(Some(64)) + ColumnType::String(StringLen::N(64)) } } diff --git a/server/Cargo.toml b/server/Cargo.toml index 280112c..72b011b 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -132,8 +132,7 @@ features = ["default", "rustls"] version = "3" [dependencies.sea-orm] -version = "0.12" -default-features = false +workspace = true features = [ "macros", "with-chrono", diff --git a/server/src/domain/sql_migrations.rs b/server/src/domain/sql_migrations.rs index 82e4b8f..8ace397 100644 --- a/server/src/domain/sql_migrations.rs +++ b/server/src/domain/sql_migrations.rs @@ -3,8 +3,8 @@ use itertools::Itertools; use lldap_domain::types::{AttributeType, GroupId, JpegPhoto, Serialized, UserId, Uuid}; use sea_orm::{ sea_query::{ - self, all, BinOper, BlobSize::Blob, ColumnDef, Expr, ForeignKey, ForeignKeyAction, Func, - Index, Query, SimpleExpr, Table, Value, + all, BinOper, ColumnDef, Expr, ForeignKey, ForeignKeyAction, Func, Index, Query, + SimpleExpr, Table, Value, }, ConnectionTrait, DatabaseTransaction, DbErr, DeriveIden, FromQueryResult, Iden, Order, Statement, TransactionTrait, @@ -163,7 +163,7 @@ pub async fn upgrade_to_v1(pool: &DbConnection) -> std::result::Result<(), sea_o .col(ColumnDef::new(Users::LastName).string_len(255)) .col(ColumnDef::new(Users::Avatar).binary()) .col(ColumnDef::new(Users::CreationDate).date_time().not_null()) - .col(ColumnDef::new(Users::PasswordHash).binary()) + .col(ColumnDef::new(Users::PasswordHash).blob()) .col(ColumnDef::new(Users::TotpSecret).string_len(64)) .col(ColumnDef::new(Users::MfaType).string_len(64)) .col(ColumnDef::new(Users::Uuid).string_len(36).not_null()), @@ -502,9 +502,7 @@ async fn migrate_to_v3(transaction: DatabaseTransaction) -> Result Result Result Result