From 792abdadfe99e11357fc668d2c2cbb10f2a981f5 Mon Sep 17 00:00:00 2001 From: David Skrundz Date: Fri, 29 Aug 2025 23:10:24 -0600 Subject: [PATCH] Update sea-orm to 2.0.0-rc.5 --- Cargo.lock | 160 ++++++++---------- Cargo.toml | 48 ++---- README.md | 2 +- seamantic/Cargo.toml | 36 ++++ seamantic/README.md | 5 + .../examples}/migrations/m_01.rs | 0 .../examples}/migrations/main.rs | 0 {src => seamantic/src}/lib.rs | 0 {src => seamantic/src}/model/duration.rs | 0 {src => seamantic/src}/model/id.rs | 0 {src => seamantic/src}/model/mod.rs | 0 {src => seamantic/src}/model/path.rs | 0 {src => seamantic/src}/schema/mod.rs | 0 {src => seamantic/src}/schema/sqlite.rs | 0 14 files changed, 125 insertions(+), 126 deletions(-) create mode 100644 seamantic/Cargo.toml create mode 100644 seamantic/README.md rename {examples => seamantic/examples}/migrations/m_01.rs (100%) rename {examples => seamantic/examples}/migrations/main.rs (100%) rename {src => seamantic/src}/lib.rs (100%) rename {src => seamantic/src}/model/duration.rs (100%) rename {src => seamantic/src}/model/id.rs (100%) rename {src => seamantic/src}/model/mod.rs (100%) rename {src => seamantic/src}/model/path.rs (100%) rename {src => seamantic/src}/schema/mod.rs (100%) rename {src => seamantic/src}/schema/sqlite.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 65f3cdd..9fdc60e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,9 +124,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.9.2" +version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" +checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" [[package]] name = "block-buffer" @@ -151,18 +151,18 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.33" +version = "1.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f" +checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" dependencies = [ "shlex", ] [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "chrono" @@ -352,9 +352,9 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -634,9 +634,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" dependencies = [ "equivalent", "hashbrown", @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" dependencies = [ "bitflags", "cfg-if", @@ -748,11 +748,11 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -869,9 +869,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" @@ -893,9 +893,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ "zerovec", ] @@ -964,47 +964,30 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" [[package]] name = "ring" @@ -1093,9 +1076,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "1.1.14" +version = "2.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34963b2d68331ef5fbc8aa28a53781471c15f90ba1ad4f2689d21ce8b9a9d1f1" +checksum = "1047e8c5983ab1a0e951aa5b0e36f7c87a5f1606536135b97e2fe147f69b6b32" dependencies = [ "async-stream", "async-trait", @@ -1104,7 +1087,7 @@ dependencies = [ "ouroboros", "sea-orm-macros", "sea-query", - "sea-query-binder", + "sea-query-sqlx", "serde", "sqlx", "strum", @@ -1115,9 +1098,9 @@ dependencies = [ [[package]] name = "sea-orm-cli" -version = "1.1.14" +version = "2.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc17cb2b24e93fc1d56de7751a12222f2303c06e83ed4d7a1e929e39f30c7d7" +checksum = "f643c22fac3f806fa018c9826888839b9f095aadac3f7ab437e9aba8a50e0c16" dependencies = [ "chrono", "glob", @@ -1131,9 +1114,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "1.1.14" +version = "2.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a489127c872766445b4e28f846825f89a076ac3af2591d1365503a68f93e974c" +checksum = "0d6f933a26b89cc181eb93e61a7a95029525f44dd8df7a579f3ec7bb15507008" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1145,9 +1128,9 @@ dependencies = [ [[package]] name = "sea-orm-migration" -version = "1.1.14" +version = "2.0.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695e830a1332a4e3e57b5972eee00574a36060e1938afca7041a524e0955d5ba" +checksum = "c643c6c48db6b91f872dc01765948d294cfbc1672ede4fb80b8837539c363ef7" dependencies = [ "async-trait", "sea-orm", @@ -1159,30 +1142,20 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.32.7" +version = "1.0.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a5d1c518eaf5eda38e5773f902b26ab6d5e9e9e2bb2349ca6c64cf96f80448c" +checksum = "ab621a8d8b03a3e513ea075f71aa26830a55c977d7b40f09e825bb91910db823" dependencies = [ "inherent", "ordered-float", "sea-query-derive", ] -[[package]] -name = "sea-query-binder" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0019f47430f7995af63deda77e238c17323359af241233ec768aba1faea7608" -dependencies = [ - "sea-query", - "sqlx", -] - [[package]] name = "sea-query-derive" -version = "0.4.3" +version = "1.0.0-rc.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae0cbad6ab996955664982739354128c58d16e126114fe88c2a493642502aab" +checksum = "217e9422de35f26c16c5f671fce3c075a65e10322068dbc66078428634af6195" dependencies = [ "darling", "heck 0.4.1", @@ -1193,14 +1166,24 @@ dependencies = [ ] [[package]] -name = "sea-schema" -version = "0.16.2" +name = "sea-query-sqlx" +version = "0.8.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2239ff574c04858ca77485f112afea1a15e53135d3097d0c86509cef1def1338" +checksum = "ed5eb19495858d8ae3663387a4f5298516c6f0171a7ca5681055450f190236b8" +dependencies = [ + "sea-query", + "sqlx", +] + +[[package]] +name = "sea-schema" +version = "0.17.0-rc.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291a75100408e8d224f7d9f0aad26c526bd723a45dad44e09d42940cd613cad7" dependencies = [ "futures", "sea-query", - "sea-query-binder", + "sea-query-sqlx", "sea-schema-derive", "sqlx", ] @@ -1219,7 +1202,7 @@ dependencies = [ [[package]] name = "seamantic" -version = "0.0.3" +version = "0.0.4" dependencies = [ "sea-orm", "sea-orm-migration", @@ -1250,9 +1233,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.142" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", "memchr", @@ -1458,9 +1441,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strum" -version = "0.26.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" [[package]] name = "subtle" @@ -1492,18 +1475,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", @@ -1603,13 +1586,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "once_cell", - "regex", + "regex-automata", "sharded-slab", "thread_local", "tracing", @@ -1636,13 +1619,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 21a80d5..3209654 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,23 +1,18 @@ -[package] -name = "seamantic" -version = "0.0.3" - -categories = [] -description = "A library to enhance SeaORM" -repository = "https://github.com/QuantumShade/seamantic" +[workspace] +members = ["seamantic"] +resolver = "2" +[workspace.package] authors = [] edition = "2024" license-file = "LICENSE.md" -resolver = "2" rust-version = "1.85.0" -[lints.rust] +[workspace.lints.rust] arithmetic_overflow = "forbid" -missing_docs = "forbid" unsafe_code = "forbid" -[lints.clippy] +[workspace.lints.clippy] arithmetic_side_effects = "forbid" as_conversions = "forbid" checked_conversions = "forbid" @@ -37,31 +32,10 @@ opt-level = 3 overflow-checks = true strip = "debuginfo" -[[example]] -name = "migrations" -path = "examples/migrations/main.rs" -required-features = ["sqlite"] +[workspace.dependencies] +sea-orm = { version = "2.0.0-rc.5", default-features = false } +sea-orm-migration = { version = "2.0.0-rc.5", default-features = false } -[features] -default = [] -serde = ["dep:serde"] -sqlite = ["sea-orm-migration/sqlx-sqlite"] - -[dependencies] -sea-orm = { version = "^1", default-features = false } -sea-orm-migration = { version = "^1", default-features = false } - -serde = { version = "^1", default-features = false, features = [ - "derive", - "std", -], optional = true } - -[dev-dependencies] -sea-orm-migration = { version = "^1", default-features = false, features = [ - "runtime-tokio-rustls", -] } +serde = { version = "^1", default-features = false } serde_test = { version = "^1", default-features = false } -tokio = { version = "^1", default-features = false, features = [ - "rt", - "macros", -] } +tokio = { version = "^1", default-features = false } diff --git a/README.md b/README.md index e4bf843..ade812e 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ A library to enhance SeaORM - example: `cargo run --example=migrations --features=sqlite` - fmt: `cargo fmt --check` - docs: `RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features` -- publish: `cargo publish --dry-run` +- publish: `cargo publish --dry-run -p seamantic` diff --git a/seamantic/Cargo.toml b/seamantic/Cargo.toml new file mode 100644 index 0000000..9ef4b6c --- /dev/null +++ b/seamantic/Cargo.toml @@ -0,0 +1,36 @@ +[package] +name = "seamantic" +version = "0.0.4" + +categories = [] +description = "A library to enhance SeaORM" +repository = "https://github.com/QuantumShade/seamantic" + +authors.workspace = true +edition.workspace = true +license-file.workspace = true +rust-version.workspace = true + +[lints] +workspace = true + +[[example]] +name = "migrations" +path = "examples/migrations/main.rs" +required-features = ["sqlite"] + +[features] +default = [] +serde = ["dep:serde"] +sqlite = ["sea-orm-migration/sqlx-sqlite"] + +[dependencies] +sea-orm = { workspace = true } +sea-orm-migration = { workspace = true } + +serde = { workspace = true, features = ["derive", "std"], optional = true } + +[dev-dependencies] +sea-orm-migration = { workspace = true, features = ["runtime-tokio-rustls"] } +serde_test = { workspace = true } +tokio = { workspace = true, features = ["rt", "macros"] } diff --git a/seamantic/README.md b/seamantic/README.md new file mode 100644 index 0000000..ff79c9f --- /dev/null +++ b/seamantic/README.md @@ -0,0 +1,5 @@ +# Seamantic + +[![Crates Version](https://img.shields.io/crates/v/seamantic.svg)](https://crates.io/crates/seamantic) + +A library to enhance SeaORM diff --git a/examples/migrations/m_01.rs b/seamantic/examples/migrations/m_01.rs similarity index 100% rename from examples/migrations/m_01.rs rename to seamantic/examples/migrations/m_01.rs diff --git a/examples/migrations/main.rs b/seamantic/examples/migrations/main.rs similarity index 100% rename from examples/migrations/main.rs rename to seamantic/examples/migrations/main.rs diff --git a/src/lib.rs b/seamantic/src/lib.rs similarity index 100% rename from src/lib.rs rename to seamantic/src/lib.rs diff --git a/src/model/duration.rs b/seamantic/src/model/duration.rs similarity index 100% rename from src/model/duration.rs rename to seamantic/src/model/duration.rs diff --git a/src/model/id.rs b/seamantic/src/model/id.rs similarity index 100% rename from src/model/id.rs rename to seamantic/src/model/id.rs diff --git a/src/model/mod.rs b/seamantic/src/model/mod.rs similarity index 100% rename from src/model/mod.rs rename to seamantic/src/model/mod.rs diff --git a/src/model/path.rs b/seamantic/src/model/path.rs similarity index 100% rename from src/model/path.rs rename to seamantic/src/model/path.rs diff --git a/src/schema/mod.rs b/seamantic/src/schema/mod.rs similarity index 100% rename from src/schema/mod.rs rename to seamantic/src/schema/mod.rs diff --git a/src/schema/sqlite.rs b/seamantic/src/schema/sqlite.rs similarity index 100% rename from src/schema/sqlite.rs rename to seamantic/src/schema/sqlite.rs