From 7b3c445171d9b66b05c366c5e588202267016586 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 06:39:16 +0000 Subject: [PATCH] build(deps): bump diesel from 1.4.8 to 2.2.11 --- updated-dependencies: - dependency-name: diesel dependency-version: 2.2.11 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 146 ++++++++++++++++++++++++++++++------ chain/arweave/Cargo.toml | 2 +- chain/near/Cargo.toml | 2 +- graph/Cargo.toml | 2 +- node/Cargo.toml | 2 +- store/postgres/Cargo.toml | 2 +- store/test-store/Cargo.toml | 2 +- 7 files changed, 129 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18cd2afe5..a975ca9b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -541,7 +541,7 @@ dependencies = [ "clap_lex", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] @@ -552,7 +552,7 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -899,6 +899,41 @@ dependencies = [ "subtle", ] +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.48", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.48", +] + [[package]] name = "data-encoding" version = "2.3.2" @@ -961,12 +996,23 @@ version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" dependencies = [ - "bigdecimal 0.1.2", - "bitflags 1.3.1", + "byteorder", + "diesel_derives 1.4.1", +] + +[[package]] +name = "diesel" +version = "2.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a917a9209950404d5be011c81d081a2692a822f73c3d6af586f0cab5ff50f614" +dependencies = [ + "bigdecimal 0.3.1", + "bitflags 2.4.0", "byteorder", "chrono", - "diesel_derives", - "num-bigint 0.2.6", + "diesel_derives 2.2.6", + "itoa", + "num-bigint 0.4.4", "num-integer", "num-traits", "pq-sys", @@ -980,7 +1026,7 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8910921b014e2af16298f006de12aa08af894b71f0f49a486ab6d74b17bbed" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.107", @@ -991,7 +1037,7 @@ name = "diesel-dynamic-schema" version = "1.0.0" source = "git+https://github.com/diesel-rs/diesel-dynamic-schema?rev=a8ec4fb1#a8ec4fb11de6242488ba3698d74406f4b5073dc4" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -1005,6 +1051,19 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "diesel_derives" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52841e97814f407b895d836fa0012091dff79c6268f39ad8155d384c21ae0d26" +dependencies = [ + "diesel_table_macro_syntax", + "dsl_auto_type", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "diesel_migrations" version = "1.4.0" @@ -1015,6 +1074,15 @@ dependencies = [ "migrations_macros", ] +[[package]] +name = "diesel_table_macro_syntax" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" +dependencies = [ + "syn 2.0.48", +] + [[package]] name = "diff" version = "0.1.12" @@ -1097,6 +1165,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "dsl_auto_type" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b" +dependencies = [ + "darling", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "either" version = "1.9.0" @@ -1542,8 +1624,8 @@ dependencies = [ "cid", "clap", "defer", - "diesel", - "diesel_derives", + "diesel 2.2.11", + "diesel_derives 1.4.1", "envconfig", "ethabi", "futures 0.1.31", @@ -1602,7 +1684,7 @@ name = "graph-chain-arweave" version = "0.33.0" dependencies = [ "base64-url", - "diesel", + "diesel 2.2.11", "graph", "graph-runtime-derive", "graph-runtime-wasm", @@ -1618,7 +1700,7 @@ name = "graph-chain-common" version = "0.33.0" dependencies = [ "anyhow", - "heck", + "heck 0.4.1", "protobuf 3.3.0", "protobuf-parse", ] @@ -1671,7 +1753,7 @@ version = "0.33.0" dependencies = [ "anyhow", "base64 0.20.0", - "diesel", + "diesel 2.2.11", "graph", "graph-runtime-derive", "graph-runtime-wasm", @@ -1780,7 +1862,7 @@ name = "graph-node" version = "0.33.0" dependencies = [ "clap", - "diesel", + "diesel 2.2.11", "env_logger 0.10.1", "futures 0.3.16", "git-testament", @@ -1815,7 +1897,7 @@ dependencies = [ name = "graph-runtime-derive" version = "0.33.0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.107", @@ -1942,10 +2024,10 @@ dependencies = [ "blake3 1.5.0", "clap", "derive_more", - "diesel", + "diesel 2.2.11", "diesel-derive-enum", "diesel-dynamic-schema", - "diesel_derives", + "diesel_derives 1.4.1", "diesel_migrations", "fallible-iterator 0.3.0", "git-testament", @@ -2089,6 +2171,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -2293,6 +2381,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "0.2.3" @@ -2738,7 +2832,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -3350,9 +3444,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -3391,7 +3485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb5320c680de74ba083512704acb90fe00f28f79207286a848e730c45dd73ed6" dependencies = [ "bytes", - "heck", + "heck 0.4.1", "itertools 0.10.5", "lazy_static", "log", @@ -4263,6 +4357,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.21.0" @@ -4275,7 +4375,7 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4469,7 +4569,7 @@ dependencies = [ name = "test-store" version = "0.33.0" dependencies = [ - "diesel", + "diesel 2.2.11", "graph", "graph-chain-ethereum", "graph-core", diff --git a/chain/arweave/Cargo.toml b/chain/arweave/Cargo.toml index f8b20147a..9944fb155 100644 --- a/chain/arweave/Cargo.toml +++ b/chain/arweave/Cargo.toml @@ -18,4 +18,4 @@ graph-runtime-wasm = { path = "../../runtime/wasm" } graph-runtime-derive = { path = "../../runtime/derive" } [dev-dependencies] -diesel = { version = "1.4.7", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.2.11", features = ["postgres", "serde_json", "numeric", "r2d2"] } diff --git a/chain/near/Cargo.toml b/chain/near/Cargo.toml index 9f43c90a4..07499fd4b 100644 --- a/chain/near/Cargo.toml +++ b/chain/near/Cargo.toml @@ -18,5 +18,5 @@ graph-runtime-wasm = { path = "../../runtime/wasm" } graph-runtime-derive = { path = "../../runtime/derive" } [dev-dependencies] -diesel = { version = "1.4.7", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.2.11", features = ["postgres", "serde_json", "numeric", "r2d2"] } trigger-filters.path = "../../substreams/trigger-filters" diff --git a/graph/Cargo.toml b/graph/Cargo.toml index bbb4d6d4b..d0169f92f 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -12,7 +12,7 @@ bigdecimal = { version = "0.1.0", features = ["serde"] } bytes = "1.0.1" cid = "0.11.0" defer = "0.1" -diesel = { version = "1.4.8", features = ["postgres", "serde_json", "numeric", "r2d2", "chrono"] } +diesel = { version = "2.2.11", features = ["postgres", "serde_json", "numeric", "r2d2", "chrono"] } diesel_derives = "1.4" chrono = "0.4.31" envconfig = "0.10.0" diff --git a/node/Cargo.toml b/node/Cargo.toml index 0c8999ea0..8251e1e71 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -39,7 +39,7 @@ graph-store-postgres = { path = "../store/postgres" } serde = { version = "1.0.126", features = ["derive", "rc"] } shellexpand = "3.1.0" termcolor = "1.4.0" -diesel = "1.4.8" +diesel = "2.2.11" http = "0.2.5" # must be compatible with the version rust-web3 uses prometheus = { version = "0.13.3", features = ["push"] } json-structural-diff = { version = "0.1", features = ["colorize"] } diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 0c901abe1..09c17c034 100644 --- a/store/postgres/Cargo.toml +++ b/store/postgres/Cargo.toml @@ -7,7 +7,7 @@ edition.workspace = true async-trait = "0.1.50" blake3 = "1.5" derive_more = { version = "0.99.17" } -diesel = { version = "1.4.8", features = [ +diesel = { version = "2.2.11", features = [ "postgres", "serde_json", "numeric", diff --git a/store/test-store/Cargo.toml b/store/test-store/Cargo.toml index a733b85e8..a80e6a94a 100644 --- a/store/test-store/Cargo.toml +++ b/store/test-store/Cargo.toml @@ -15,7 +15,7 @@ graph-store-postgres = { path = "../postgres" } graph-chain-ethereum = { path = "../../chain/ethereum" } lazy_static = "1.1" hex-literal = "0.4" -diesel = { version = "1.4.8", features = ["postgres", "serde_json", "numeric", "r2d2"] } +diesel = { version = "2.2.11", features = ["postgres", "serde_json", "numeric", "r2d2"] } serde = "1.0" prost-types = { workspace = true }