build(deps): bump diesel to 2.2.3 and sqlx to 0.8.1 (#5688)

This commit is contained in:
Sanchith Hegde
2024-08-26 18:59:09 +05:30
committed by GitHub
parent 8b4d0967ae
commit 138134dfb6
17 changed files with 272 additions and 223 deletions

View File

@ -13,4 +13,4 @@ name = "rust"
enabled = true enabled = true
[analyzers.meta] [analyzers.meta]
msrv = "1.76.0" msrv = "1.80.0"

456
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
resolver = "2" resolver = "2"
members = ["crates/*"] members = ["crates/*"]
package.edition = "2021" package.edition = "2021"
package.rust-version = "1.76.0" package.rust-version = "1.80.0"
package.license = "Apache-2.0" package.license = "Apache-2.0"
[workspace.dependencies] [workspace.dependencies]

View File

@ -9,7 +9,7 @@ if [[ "${TRACE-0}" == "1" ]]; then
set -o xtrace set -o xtrace
fi fi
RUST_MSRV=1.76.0 RUST_MSRV=1.80.0
_DB_NAME="hyperswitch_db" _DB_NAME="hyperswitch_db"
_DB_USER="db_user" _DB_USER="db_user"
_DB_PASS="db_password" _DB_PASS="db_password"

View File

@ -29,7 +29,7 @@ async-trait = "0.1.79"
aws-config = { version = "1.1.9", features = ["behavior-version-latest"] } aws-config = { version = "1.1.9", features = ["behavior-version-latest"] }
aws-sdk-lambda = { version = "1.18.0" } aws-sdk-lambda = { version = "1.18.0" }
aws-smithy-types = { version = "1.1.8" } aws-smithy-types = { version = "1.1.8" }
bigdecimal = { version = "0.3.1", features = ["serde"] } bigdecimal = { version = "0.4.5", features = ["serde"] }
error-stack = "0.4.1" error-stack = "0.4.1"
futures = "0.3.30" futures = "0.3.30"
once_cell = "1.19.0" once_cell = "1.19.0"
@ -37,7 +37,7 @@ opensearch = { version = "2.2.0", features = ["aws-auth"] }
reqwest = { version = "0.11.27", features = ["serde_json"] } reqwest = { version = "0.11.27", features = ["serde_json"] }
serde = { version = "1.0.197", features = ["derive", "rc"] } serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115" serde_json = "1.0.115"
sqlx = { version = "0.7.3", features = ["postgres", "runtime-tokio", "runtime-tokio-native-tls", "time", "bigdecimal"] } sqlx = { version = "0.8.1", features = ["postgres", "runtime-tokio", "runtime-tokio-native-tls", "time", "bigdecimal"] }
strum = { version = "0.26.2", features = ["derive"] } strum = { version = "0.26.2", features = ["derive"] }
thiserror = "1.0.58" thiserror = "1.0.58"
time = { version = "0.3.35", features = ["serde", "serde-well-known", "std"] } time = { version = "0.3.35", features = ["serde", "serde-well-known", "std"] }

View File

@ -101,7 +101,10 @@ impl<'q, Type> Encode<'q, Postgres> for DBEnumWrapper<Type>
where where
Type: DbType + FromStr + Display, Type: DbType + FromStr + Display,
{ {
fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> sqlx::encode::IsNull { fn encode_by_ref(
&self,
buf: &mut PgArgumentBuffer,
) -> Result<sqlx::encode::IsNull, Box<(dyn std::error::Error + Send + Sync + 'static)>> {
<String as Encode<'q, Postgres>>::encode(self.0.to_string(), buf) <String as Encode<'q, Postgres>>::encode(self.0.to_string(), buf)
} }
fn size_hint(&self) -> usize { fn size_hint(&self) -> usize {

View File

@ -13,7 +13,7 @@ openapi = []
payouts = [] payouts = []
[dependencies] [dependencies]
diesel = { version = "2.1.5", features = ["postgres"] } diesel = { version = "2.2.3", features = ["postgres"] }
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.115" serde_json = "1.0.115"
strum = { version = "0.26", features = ["derive"] } strum = { version = "0.26", features = ["derive"] }

View File

@ -26,7 +26,7 @@ async-trait = { version = "0.1.79", optional = true }
base64 = "0.22.0" base64 = "0.22.0"
blake3 = { version = "1.5.1", features = ["serde"] } blake3 = { version = "1.5.1", features = ["serde"] }
bytes = "1.6.0" bytes = "1.6.0"
diesel = "2.1.5" diesel = "2.2.3"
error-stack = "0.4.1" error-stack = "0.4.1"
futures = { version = "0.3.30", optional = true } futures = { version = "0.3.30", optional = true }
globset = "0.4.14" globset = "0.4.14"

View File

@ -20,7 +20,7 @@ payment_v2 = []
[dependencies] [dependencies]
async-bb8-diesel = { git = "https://github.com/jarnura/async-bb8-diesel", rev = "53b4ab901aab7635c8215fd1c2d542c8db443094" } async-bb8-diesel = { git = "https://github.com/jarnura/async-bb8-diesel", rev = "53b4ab901aab7635c8215fd1c2d542c8db443094" }
diesel = { version = "2.1.5", features = ["postgres", "serde_json", "time", "64-column-tables"] } diesel = { version = "2.2.3", features = ["postgres", "serde_json", "time", "64-column-tables"] }
error-stack = "0.4.1" error-stack = "0.4.1"
rustc-hash = "1.1.0" rustc-hash = "1.1.0"
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.197", features = ["derive"] }

View File

@ -19,7 +19,7 @@ async-trait = "0.1.79"
bb8 = "0.8" bb8 = "0.8"
clap = { version = "4.4.18", default-features = false, features = ["std", "derive", "help", "usage"] } clap = { version = "4.4.18", default-features = false, features = ["std", "derive", "help", "usage"] }
config = { version = "0.14.0", features = ["toml"] } config = { version = "0.14.0", features = ["toml"] }
diesel = { version = "2.1.5", features = ["postgres"] } diesel = { version = "2.2.3", features = ["postgres"] }
error-stack = "0.4.1" error-stack = "0.4.1"
mime = "0.3.17" mime = "0.3.17"
once_cell = "1.19.0" once_cell = "1.19.0"

View File

@ -10,7 +10,7 @@ readme = "README.md"
[dependencies] [dependencies]
clap = { version = "4.1.8", features = ["derive"] } clap = { version = "4.1.8", features = ["derive"] }
diesel = { version = "2.1.6", features = ["postgres"] } diesel = { version = "2.2.3", features = ["postgres"] }
diesel_migrations = "2.1.0" diesel_migrations = "2.1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
toml = "0.5" toml = "0.5"

View File

@ -19,7 +19,7 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies] [dependencies]
bytes = { version = "1", optional = true } bytes = { version = "1", optional = true }
diesel = { version = "2.1.5", features = ["postgres", "serde_json", "time"], optional = true } diesel = { version = "2.2.3", features = ["postgres", "serde_json", "time"], optional = true }
erased-serde = "0.4.4" erased-serde = "0.4.4"
serde = { version = "1", features = ["derive"], optional = true } serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1.0.115", optional = true } serde_json = { version = "1.0.115", optional = true }

View File

@ -57,14 +57,13 @@ async-bb8-diesel = { git = "https://github.com/jarnura/async-bb8-diesel", rev =
async-trait = "0.1.79" async-trait = "0.1.79"
base64 = "0.22.0" base64 = "0.22.0"
bb8 = "0.8" bb8 = "0.8"
bigdecimal = "0.3.1"
blake3 = "1.5.1" blake3 = "1.5.1"
bytes = "1.6.0" bytes = "1.6.0"
clap = { version = "4.4.18", default-features = false, features = ["std", "derive", "help", "usage"] } clap = { version = "4.4.18", default-features = false, features = ["std", "derive", "help", "usage"] }
config = { version = "0.14.0", features = ["toml"] } config = { version = "0.14.0", features = ["toml"] }
cookie = "0.18.1" cookie = "0.18.1"
csv = "1.3.0" csv = "1.3.0"
diesel = { version = "2.1.5", features = ["postgres"] } diesel = { version = "2.2.3", features = ["postgres"] }
digest = "0.10.7" digest = "0.10.7"
dyn-clone = "1.0.17" dyn-clone = "1.0.17"
encoding_rs = "0.8.33" encoding_rs = "0.8.33"
@ -84,6 +83,7 @@ mimalloc = { version = "0.1", optional = true }
mime = "0.3.17" mime = "0.3.17"
nanoid = "0.4.0" nanoid = "0.4.0"
num_cpus = "1.16.0" num_cpus = "1.16.0"
num-traits = "0.2.19"
once_cell = "1.19.0" once_cell = "1.19.0"
openidconnect = "3.5.0" # TODO: remove reqwest openidconnect = "3.5.0" # TODO: remove reqwest
openssl = "0.10.64" openssl = "0.10.64"

View File

@ -1,8 +1,8 @@
use bigdecimal::ToPrimitive;
use common_utils::{ext_traits::ValueExt, pii::Email}; use common_utils::{ext_traits::ValueExt, pii::Email};
use error_stack::{self, ResultExt}; use error_stack::{self, ResultExt};
pub use hyperswitch_domain_models::router_request_types::fraud_check::RefundMethod; pub use hyperswitch_domain_models::router_request_types::fraud_check::RefundMethod;
use masking::Secret; use masking::Secret;
use num_traits::ToPrimitive;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use time::PrimitiveDateTime; use time::PrimitiveDateTime;
use utoipa::ToSchema; use utoipa::ToSchema;

View File

@ -1,9 +1,9 @@
use std::{collections::HashMap, sync::Arc}; use std::{collections::HashMap, sync::Arc};
use bigdecimal::ToPrimitive;
use common_utils::errors::CustomResult; use common_utils::errors::CustomResult;
use error_stack::{report, ResultExt}; use error_stack::{report, ResultExt};
use events::{EventsError, Message, MessagingInterface}; use events::{EventsError, Message, MessagingInterface};
use num_traits::ToPrimitive;
use rdkafka::{ use rdkafka::{
config::FromClientConfig, config::FromClientConfig,
message::{Header, OwnedHeaders}, message::{Header, OwnedHeaders},

View File

@ -19,7 +19,7 @@ strum = { version = "0.26.2", features = ["derive"] }
syn = { version = "2.0.57", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features syn = { version = "2.0.57", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features
[dev-dependencies] [dev-dependencies]
diesel = { version = "2.1.5", features = ["postgres"] } diesel = { version = "2.2.3", features = ["postgres"] }
error-stack = "0.4.1" error-stack = "0.4.1"
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.197", features = ["derive"] }
serde_json = "1.0.115" serde_json = "1.0.115"

View File

@ -36,7 +36,7 @@ bb8 = "0.8.3"
bytes = "1.6.0" bytes = "1.6.0"
config = { version = "0.14.0", features = ["toml"] } config = { version = "0.14.0", features = ["toml"] }
crc32fast = "1.4.0" crc32fast = "1.4.0"
diesel = { version = "2.1.5", default-features = false, features = ["postgres"] } diesel = { version = "2.2.3", default-features = false, features = ["postgres"] }
dyn-clone = "1.0.17" dyn-clone = "1.0.17"
error-stack = "0.4.1" error-stack = "0.4.1"
futures = "0.3.30" futures = "0.3.30"