diff --git a/Cargo.lock b/Cargo.lock
index 18cd2afe5..d2eba67c3 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.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.3.2"
@@ -961,12 +996,24 @@ 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.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8496eeb328dce26ee9d9b73275d396d9bddb433fa30106cf6056dd8c3c2764c"
+dependencies = [
+ "bigdecimal 0.3.1",
+ "bitflags 2.4.0",
  "byteorder",
  "chrono",
- "diesel_derives",
- "num-bigint 0.2.6",
+ "diesel_derives 2.3.3",
+ "downcast-rs",
+ "itoa",
+ "num-bigint 0.4.4",
  "num-integer",
  "num-traits",
  "pq-sys",
@@ -980,7 +1027,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 +1038,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 +1052,19 @@ dependencies = [
  "syn 1.0.107",
 ]
 
+[[package]]
+name = "diesel_derives"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09af0e983035368439f1383011cd87c46f41da81d0f21dc3727e2857d5a43c8e"
+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 +1075,15 @@ dependencies = [
  "migrations_macros",
 ]
 
+[[package]]
+name = "diesel_table_macro_syntax"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
+dependencies = [
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.12"
@@ -1097,6 +1166,26 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "downcast-rs"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "117240f60069e65410b3ae1bb213295bd828f707b5bec6596a1afc8793ce0cbc"
+
+[[package]]
+name = "dsl_auto_type"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd122633e4bef06db27737f21d3738fb89c8f6d5360d6d9d7635dda142a7757e"
+dependencies = [
+ "darling",
+ "either",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "either"
 version = "1.9.0"
@@ -1542,8 +1631,8 @@ dependencies = [
  "cid",
  "clap",
  "defer",
- "diesel",
- "diesel_derives",
+ "diesel 2.3.2",
+ "diesel_derives 1.4.1",
  "envconfig",
  "ethabi",
  "futures 0.1.31",
@@ -1602,7 +1691,7 @@ name = "graph-chain-arweave"
 version = "0.33.0"
 dependencies = [
  "base64-url",
- "diesel",
+ "diesel 2.3.2",
  "graph",
  "graph-runtime-derive",
  "graph-runtime-wasm",
@@ -1618,7 +1707,7 @@ name = "graph-chain-common"
 version = "0.33.0"
 dependencies = [
  "anyhow",
- "heck",
+ "heck 0.4.1",
  "protobuf 3.3.0",
  "protobuf-parse",
 ]
@@ -1671,7 +1760,7 @@ version = "0.33.0"
 dependencies = [
  "anyhow",
  "base64 0.20.0",
- "diesel",
+ "diesel 2.3.2",
  "graph",
  "graph-runtime-derive",
  "graph-runtime-wasm",
@@ -1780,7 +1869,7 @@ name = "graph-node"
 version = "0.33.0"
 dependencies = [
  "clap",
- "diesel",
+ "diesel 2.3.2",
  "env_logger 0.10.1",
  "futures 0.3.16",
  "git-testament",
@@ -1815,7 +1904,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 +2031,10 @@ dependencies = [
  "blake3 1.5.0",
  "clap",
  "derive_more",
- "diesel",
+ "diesel 2.3.2",
  "diesel-derive-enum",
  "diesel-dynamic-schema",
- "diesel_derives",
+ "diesel_derives 1.4.1",
  "diesel_migrations",
  "fallible-iterator 0.3.0",
  "git-testament",
@@ -2089,6 +2178,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 +2388,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 +2839,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 +3451,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
@@ -3391,7 +3492,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 +4364,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 +4382,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 +4576,7 @@ dependencies = [
 name = "test-store"
 version = "0.33.0"
 dependencies = [
- "diesel",
+ "diesel 2.3.2",
  "graph",
  "graph-chain-ethereum",
  "graph-core",
diff --git a/chain/arweave/Cargo.toml b/chain/arweave/Cargo.toml
index f8b20147a..b6754cae5 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.3.2", features = ["postgres", "serde_json", "numeric", "r2d2"] }
diff --git a/chain/near/Cargo.toml b/chain/near/Cargo.toml
index 9f43c90a4..91882c606 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.3.2", features = ["postgres", "serde_json", "numeric", "r2d2"] }
 trigger-filters.path = "../../substreams/trigger-filters" 
diff --git a/graph/Cargo.toml b/graph/Cargo.toml
index bbb4d6d4b..397ffa3a6 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.3.2", 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..daa93df75 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.3.2"
 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..19adcfabb 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.3.2", features = [
     "postgres",
     "serde_json",
     "numeric",
diff --git a/store/test-store/Cargo.toml b/store/test-store/Cargo.toml
index a733b85e8..fe9f3f513 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.3.2", features = ["postgres", "serde_json", "numeric", "r2d2"] }
 serde = "1.0"
 prost-types = { workspace = true }