diff --git a/Cargo.lock b/Cargo.lock index da0033c833..fd55c2dc31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,7 +10,7 @@ checksum = "f728064aca1c318585bf4bb04ffcfac9e75e508ab4e8b1bd9ba5dfe04e2cbed5" dependencies = [ "actix-rt", "actix_derive", - "bitflags", + "bitflags 1.3.2", "bytes", "crossbeam-channel", "futures-core", @@ -32,7 +32,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", @@ -69,8 +69,8 @@ dependencies = [ "actix-service", "actix-utils", "ahash 0.8.3", - "base64 0.21.0", - "bitflags", + "base64 0.21.2", + "bitflags 1.3.2", "brotli", "bytes", "bytestring", @@ -138,7 +138,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ec592f234db8a253cf80531246a4407c8a70530423eea80688a6c5a44a110e7" dependencies = [ - "darling", + "darling 0.14.4", "parse-size", "proc-macro2", "quote", @@ -264,7 +264,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.20", + "time 0.3.21", "url", ] @@ -322,9 +322,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -353,6 +353,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + [[package]] name = "anyhow" version = "1.0.70" @@ -377,7 +383,7 @@ dependencies = [ "serde", "serde_json", "strum", - "time 0.3.20", + "time 0.3.21", "url", "utoipa", ] @@ -441,9 +447,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.3.15" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" +checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" dependencies = [ "flate2", "futures-core", @@ -500,7 +506,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -511,7 +517,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -544,7 +550,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.7.6", - "base64 0.21.0", + "base64 0.21.2", "bytes", "cfg-if", "cookie", @@ -568,9 +574,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "0.55.1" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd62464d1c4ad70f8b6cd693e7f30229f36bebdcdf3fce8c11803e1bdc0bc052" +checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" dependencies = [ "aws-credential-types", "aws-http", @@ -589,7 +595,7 @@ dependencies = [ "http", "hyper", "ring", - "time 0.3.20", + "time 0.3.21", "tokio", "tower", "tracing", @@ -598,9 +604,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb57ac6088805821f78d282c0ba8aec809f11cbee10dda19a97b03ab040ccc2" +checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -612,9 +618,9 @@ dependencies = [ [[package]] name = "aws-endpoint" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5f6f84a4f46f95a9bb71d9300b73cd67eb868bc43ae84f66ad34752299f4ac" +checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -626,9 +632,9 @@ dependencies = [ [[package]] name = "aws-http" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a754683c322f7dc5167484266489fdebdcd04d26e53c162cad1f3f949f2c5671" +checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -728,9 +734,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143953d46f77a0b18480e7d8bb1a651080b9484e0bb94c27b8645eaeb3c3e231" +checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -753,9 +759,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7255c0d8053b89e8b5cdabb52e1dbf596e9968b1f45dce7a56b2cd57038fcfc9" +checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" dependencies = [ "aws-credential-types", "aws-endpoint", @@ -779,9 +785,9 @@ dependencies = [ [[package]] name = "aws-sig-auth" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84dc92a63ede3c2cbe43529cb87ffa58763520c96c6a46ca1ced80417afba845" +checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -794,9 +800,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "392fefab9d6fcbd76d518eb3b1c040b84728ab50f58df0c3c53ada4bea9d327e" +checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", @@ -809,15 +815,15 @@ dependencies = [ "percent-encoding", "regex", "sha2", - "time 0.3.20", + "time 0.3.21", "tracing", ] [[package]] name = "aws-smithy-async" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae23b9fe7a07d0919000116c4c5c0578303fbce6fc8d32efca1f7759d4c20faf" +checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" dependencies = [ "futures-util", "pin-project-lite", @@ -827,9 +833,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.55.1" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a63d4f1c04b3abb7603001e4513f19617427bf27ca185b2ac663a1e342d39e" +checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -848,9 +854,9 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230d25d244a51339273b8870f0f77874cd4449fb4f8f629b21188ae10cfc0ba" +checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -872,9 +878,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22d2a2bcc16e5c4d949ffd2b851da852b9bbed4bb364ed4ae371b42137ca06d9" +checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" dependencies = [ "aws-smithy-types", "bytes", @@ -883,9 +889,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60e2133beb9fe6ffe0b70deca57aaeff0a35ad24a9c6fab2fd3b4f45b99fdb5" +checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", @@ -906,9 +912,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4d94f556c86a0dd916a5d7c39747157ea8cb909ca469703e20fee33e448b67" +checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -922,18 +928,18 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3d6e6ebb00b2cce379f079ad5ec508f9bcc3a9510d9b9c1840ed1d6f8af39" +checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.55.1" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b50d15f446c19e088009ecb00e2fb2d13133d6fe1db702e9aa67ad135bf6a6" +checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" dependencies = [ "aws-smithy-types", "urlencoding", @@ -941,31 +947,31 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58db46fc1f4f26be01ebdb821751b4e2482cd43aa2b64a0348fb89762defaffa" +checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" dependencies = [ "base64-simd", "itoa", "num-integer", "ryu", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "aws-smithy-xml" -version = "0.55.1" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b5398c1c25dfc6f8c282b1552a66aa807c9d6e15e1b3a84b94aa44e7859bec3" +checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.55.2" +version = "0.55.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0869598bfe46ec44ffe17e063ed33336e59df90356ca8ff0e8da6f7c1d994b" +checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -985,7 +991,7 @@ checksum = "3b32c5ea3aabaf4deb5f5ced2d688ec0844c881c9e6c696a8b769a05fc691e62" dependencies = [ "async-trait", "axum-core", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -1030,9 +1036,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64-simd" @@ -1078,6 +1084,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + [[package]] name = "blake3" version = "1.3.3" @@ -1124,9 +1136,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "bytecount" @@ -1185,7 +1197,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -1268,9 +1280,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b802d85aaf3a1cdb02b224ba472ebdea62014fccfcb269b95a4d76443b5ee5a" +checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" dependencies = [ "clap_builder", "clap_derive", @@ -1279,31 +1291,32 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a1a858f532119338887a4b8e1af9c60de8249cd7bafd68036a489e261e37b6" +checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" dependencies = [ - "bitflags", + "anstyle", + "bitflags 1.3.2", "clap_lex", ] [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] name = "codespan-reporting" @@ -1354,7 +1367,7 @@ dependencies = [ "signal-hook", "signal-hook-tokio", "thiserror", - "time 0.3.20", + "time 0.3.21", "tokio", ] @@ -1405,7 +1418,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time 0.3.21", "version_check", ] @@ -1433,9 +1446,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -1530,7 +1543,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1547,7 +1560,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -1556,8 +1569,18 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +dependencies = [ + "darling_core 0.20.1", + "darling_macro 0.20.1", ] [[package]] @@ -1574,17 +1597,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.18", +] + [[package]] name = "darling_macro" version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core", + "darling_core 0.14.4", "quote", "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +dependencies = [ + "darling_core 0.20.1", + "quote", + "syn 2.0.18", +] + [[package]] name = "dashmap" version = "5.4.0" @@ -1643,37 +1691,46 @@ dependencies = [ [[package]] name = "diesel" -version = "2.0.3" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" +checksum = "f7a532c1f99a0f596f6960a60d1e119e91582b24b39e2d83a190e61262c3ef0c" dependencies = [ - "bitflags", + "bitflags 2.3.1", "byteorder", "diesel_derives", "itoa", "pq-sys", "r2d2", "serde_json", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "diesel_derives" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" +checksum = "74398b79d81e52e130d991afeed9c86034bb1b7735f46d2f5bf7deb261d80303" dependencies = [ - "proc-macro-error", + "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", +] + +[[package]] +name = "diesel_table_macro_syntax" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +dependencies = [ + "syn 2.0.18", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -1825,7 +1882,7 @@ dependencies = [ "aws-sdk-kms", "aws-sdk-sesv2", "aws-smithy-client", - "base64 0.21.0", + "base64 0.21.2", "common_utils", "dyn-clone", "error-stack", @@ -1839,11 +1896,12 @@ dependencies = [ [[package]] name = "fake" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d68f517805463f3a896a9d29c1d6ff09d3579ded64a7201b4069f8f9c0d52fd" +checksum = "0a44c765350db469b774425ff1c833890b16ceb9612fb5d7c4bbdf4a1b55f876" dependencies = [ "rand 0.8.5", + "unidecode", ] [[package]] @@ -1862,7 +1920,7 @@ dependencies = [ "mime", "serde", "serde_json", - "time 0.3.20", + "time 0.3.21", "tokio", "url", "webdriver", @@ -1928,9 +1986,9 @@ dependencies = [ [[package]] name = "fred" -version = "6.0.0" +version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52d60e6d9b2a715da13ec520d7da6e095121e25da5027cdac56b8f96684654b" +checksum = "7e02c21b098d77b0e99fe0054ebd3e7c9f81bffb42aa843021415ffa793124a6" dependencies = [ "arc-swap", "arcstr", @@ -2091,7 +2149,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -2142,12 +2200,12 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199523ba70af2b447640715e8c4bd2b5360313a71d2d69361ae4dd1dc31487dd" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows", + "windows-targets 0.48.0", ] [[package]] @@ -2174,11 +2232,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.16.1" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" +checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libgit2-sys", "log", @@ -2193,9 +2251,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -2325,7 +2383,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -2510,12 +2568,12 @@ dependencies = [ [[package]] name = "josekit" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef871a7a5f162afa718c416e9cbdd54241a58c922e07870e898ebad2425d8d8" +checksum = "33a96c4f2128a6f44ecf7c36df2b03dddf5a07b060a4d5ebc0a81e9821f7c60e" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.2", "flate2", "once_cell", "openssl", @@ -2523,14 +2581,14 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -2552,7 +2610,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "pem", "ring", "serde", @@ -2574,15 +2632,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.141" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libgit2-sys" -version = "0.14.2+1.5.1" +version = "0.15.1+1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" dependencies = [ "cc", "libc", @@ -2955,11 +3013,11 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl" -version = "0.10.50" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e30d8bc91859781f0a943411186324d580f2bbeb71b452fe91ae344806af3f1" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2976,7 +3034,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -2987,9 +3045,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.85" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ "cc", "libc", @@ -3000,7 +3058,7 @@ dependencies = [ [[package]] name = "opentelemetry" version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -3009,7 +3067,7 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" version = "0.11.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "futures", @@ -3026,7 +3084,7 @@ dependencies = [ [[package]] name = "opentelemetry-proto" version = "0.1.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "futures", "futures-util", @@ -3038,7 +3096,7 @@ dependencies = [ [[package]] name = "opentelemetry_api" version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "fnv", "futures-channel", @@ -3053,7 +3111,7 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" version = "0.18.0" -source = "git+https://github.com/open-telemetry/opentelemetry-rust?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" +source = "git+https://github.com/open-telemetry/opentelemetry-rust/?rev=44b90202fd744598db8b0ace5b8f0bad7ec45658#44b90202fd744598db8b0ace5b8f0bad7ec45658" dependencies = [ "async-trait", "crossbeam-channel", @@ -3185,7 +3243,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -3201,22 +3259,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -3244,7 +3302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -3261,9 +3319,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pq-sys" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b845d6d8ec554f972a2c5298aad68953fd64e7441e846075450b44656a016d1" +checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" dependencies = [ "vcpkg", ] @@ -3310,29 +3368,28 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70" +checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "byteorder", "lazy_static", "num-traits", - "quick-error 2.0.1", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax", + "regex-syntax 0.6.29", "rusty-fork", "tempfile", "unarray", @@ -3367,7 +3424,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] @@ -3394,12 +3451,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quick-xml" version = "0.28.2" @@ -3412,9 +3463,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" dependencies = [ "proc-macro2", ] @@ -3516,7 +3567,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3554,7 +3605,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3563,7 +3614,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3579,13 +3630,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.2", ] [[package]] @@ -3594,7 +3645,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", ] [[package]] @@ -3604,13 +3655,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] -name = "reqwest" -version = "0.11.16" +name = "regex-syntax" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" + +[[package]] +name = "reqwest" +version = "0.11.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "async-compression", - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -3671,7 +3728,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -3691,7 +3748,7 @@ dependencies = [ "awc", "aws-config", "aws-sdk-s3", - "base64 0.21.0", + "base64 0.21.2", "bb8", "blake3", "bytes", @@ -3743,9 +3800,9 @@ dependencies = [ "strum", "thirtyfour", "thiserror", - "time 0.3.20", + "time 0.3.21", "tokio", - "toml 0.7.3", + "toml 0.7.4", "url", "utoipa", "utoipa-swagger-ui", @@ -3757,7 +3814,7 @@ dependencies = [ name = "router_derive" version = "0.1.0" dependencies = [ - "darling", + "darling 0.14.4", "diesel", "proc-macro2", "quote", @@ -3782,7 +3839,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "strum", - "time 0.3.20", + "time 0.3.21", "tokio", "tracing", "tracing-actix-web", @@ -3859,7 +3916,7 @@ version = "0.37.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -3897,7 +3954,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] @@ -3913,7 +3970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" dependencies = [ "fnv", - "quick-error 1.2.3", + "quick-error", "tempfile", "wait-timeout", ] @@ -3975,11 +4032,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3988,9 +4045,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -4007,22 +4064,22 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4085,14 +4142,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" dependencies = [ "serde", ] @@ -4111,9 +4168,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0" +checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ "base64 0.13.1", "chrono", @@ -4122,19 +4179,19 @@ dependencies = [ "serde", "serde_json", "serde_with_macros", - "time 0.3.20", + "time 0.3.21", ] [[package]] name = "serde_with_macros" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c" +checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling", + "darling 0.20.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -4159,7 +4216,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4253,7 +4310,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -4322,7 +4379,7 @@ dependencies = [ "serde_json", "strum", "thiserror", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -4381,9 +4438,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" dependencies = [ "proc-macro2", "quote", @@ -4479,7 +4536,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4505,9 +4562,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa", "serde", @@ -4517,15 +4574,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" dependencies = [ "time-core", ] @@ -4547,9 +4604,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -4561,7 +4618,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -4576,13 +4633,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -4608,9 +4665,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -4619,9 +4676,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4642,9 +4699,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" dependencies = [ "serde", "serde_spanned", @@ -4654,18 +4711,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ "indexmap", "serde", @@ -4753,9 +4810,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2def0ffabc0116481e14e82cf705fef814f5178171d445b6790137ff8a85a73" +checksum = "ce52ffaf2d544e317d3bef63f49a6a22022866505fa4840a4339b1756834a2a9" dependencies = [ "actix-web", "opentelemetry", @@ -4772,7 +4829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.20", + "time 0.3.21", "tracing-subscriber", ] @@ -4789,9 +4846,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -4844,9 +4901,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ "matchers", "nu-ansi-term", @@ -4910,9 +4967,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" [[package]] name = "unicode-normalization" @@ -4935,6 +4992,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unidecode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "402bb19d8e03f1d1a7450e2bd613980869438e0666331be3e073089124aa1adc" + [[package]] name = "untrusted" version = "0.7.1" @@ -4986,7 +5049,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.18", ] [[package]] @@ -5007,9 +5070,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.1" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom 0.2.9", "serde", @@ -5029,15 +5092,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vergen" -version = "8.1.1" +version = "8.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b86a8af1dedf089b1c78338678e4c7492b6045649042d94faf19690499d236" +checksum = "8b3c89c2c7e50f33e4d35527e5bf9c11d6d132226dbbd1753f0fbe9f19ef88c6" dependencies = [ "anyhow", "git2", "rustc_version", "rustversion", - "time 0.3.20", + "time 0.3.21", ] [[package]] @@ -5107,9 +5170,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5117,16 +5180,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-shared", ] @@ -5144,9 +5207,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5154,22 +5217,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" @@ -5195,7 +5258,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time 0.3.20", + "time 0.3.21", "unicode-segmentation", "url", ] @@ -5432,7 +5495,7 @@ checksum = "bd7b0b5b253ebc0240d6aac6dd671c495c467420577bf634d3064ae7e6fa2b4c" dependencies = [ "assert-json-diff", "async-trait", - "base64 0.21.0", + "base64 0.21.2", "deadpool", "futures", "futures-timer", diff --git a/crates/common_enums/Cargo.toml b/crates/common_enums/Cargo.toml index f26831868a..9521d0ee04 100644 --- a/crates/common_enums/Cargo.toml +++ b/crates/common_enums/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +diesel = { version = "2.1.0", features = ["postgres"] } serde = { version = "1.0.160", features = [ "derive" ] } strum = { version = "0.24.1", features = [ "derive" ] } utoipa = { version = "3.3.0", features = ["preserve_order"] } -diesel = { version = "2.0.3", features = ["postgres"] } # First party crates router_derive = { version = "0.1.0", path = "../router_derive" } diff --git a/crates/common_utils/Cargo.toml b/crates/common_utils/Cargo.toml index aa5ffab69e..092f616245 100644 --- a/crates/common_utils/Cargo.toml +++ b/crates/common_utils/Cargo.toml @@ -15,6 +15,7 @@ logs = ["dep:router_env"] [dependencies] async-trait = { version = "0.1.68", optional = true } bytes = "1.4.0" +diesel = "2.1.0" error-stack = "0.3.1" futures = { version = "0.3.28", optional = true } hex = "0.4.3" @@ -36,7 +37,6 @@ md5 = "0.7.0" # First party crates masking = { version = "0.1.0", path = "../masking" } router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"], optional = true } -diesel = "2.0.3" [target.'cfg(not(target_os = "windows"))'.dependencies] signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"], optional = true } diff --git a/crates/common_utils/src/pii.rs b/crates/common_utils/src/pii.rs index 11e9fd07ea..611402c335 100644 --- a/crates/common_utils/src/pii.rs +++ b/crates/common_utils/src/pii.rs @@ -3,7 +3,6 @@ use std::{convert::AsRef, fmt, ops, str::FromStr}; use diesel::{ - backend, backend::Backend, deserialize, deserialize::FromSql, @@ -153,7 +152,7 @@ where DB: Backend, String: FromSql, { - fn from_sql(bytes: backend::RawValue<'_, DB>) -> deserialize::Result { + fn from_sql(bytes: DB::RawValue<'_>) -> deserialize::Result { let val = String::from_sql(bytes)?; Ok(Self::from_str(val.as_str())?) } diff --git a/crates/drainer/Cargo.toml b/crates/drainer/Cargo.toml index f31aa4f49c..2003c20f0a 100644 --- a/crates/drainer/Cargo.toml +++ b/crates/drainer/Cargo.toml @@ -16,7 +16,7 @@ async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = " bb8 = "0.8" clap = { version = "4.2.2", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } -diesel = { version = "2.0.3", features = ["postgres"] } +diesel = { version = "2.1.0", features = ["postgres"] } error-stack = "0.3.1" once_cell = "1.17.1" serde = "1.0.160" diff --git a/crates/masking/Cargo.toml b/crates/masking/Cargo.toml index 7ad8c91d42..2e6389ce8b 100644 --- a/crates/masking/Cargo.toml +++ b/crates/masking/Cargo.toml @@ -17,7 +17,7 @@ rustdoc-args = ["--cfg", "docsrs"] [dependencies] bytes = { version = "1", optional = true } -diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time"], optional = true } +diesel = { version = "2.1.0", features = ["postgres", "serde_json", "time"], optional = true } serde = { version = "1", features = ["derive"], optional = true } serde_json = "1.0.96" subtle = "=2.4.1" diff --git a/crates/masking/src/diesel.rs b/crates/masking/src/diesel.rs index 7de021aac5..307f083d27 100644 --- a/crates/masking/src/diesel.rs +++ b/crates/masking/src/diesel.rs @@ -4,7 +4,7 @@ pub use diesel::Expression; use diesel::{ - backend::{Backend, RawValue}, + backend::Backend, deserialize::{self, FromSql, Queryable}, expression::AsExpression, internal::derives::as_expression::Bound, @@ -53,7 +53,7 @@ where S: FromSql, I: Strategy, { - fn from_sql(bytes: RawValue<'_, DB>) -> diesel::deserialize::Result { + fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result { S::from_sql(bytes).map(|raw| raw.into()) } } @@ -123,7 +123,7 @@ where S: FromSql + ZeroizableSecret, I: Strategy, { - fn from_sql(bytes: RawValue<'_, DB>) -> diesel::deserialize::Result { + fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result { S::from_sql(bytes).map(|raw| raw.into()) } } diff --git a/crates/router/Cargo.toml b/crates/router/Cargo.toml index ae59a299c4..254503f57d 100644 --- a/crates/router/Cargo.toml +++ b/crates/router/Cargo.toml @@ -44,7 +44,7 @@ bytes = "1.4.0" clap = { version = "4.2.2", default-features = false, features = ["std", "derive", "help", "usage"] } config = { version = "0.13.3", features = ["toml"] } crc32fast = "1.3.2" -diesel = { version = "2.0.3", features = ["postgres"] } +diesel = { version = "2.1.0", features = ["postgres"] } dyn-clone = "1.0.11" encoding_rs = "0.8.32" error-stack = "0.3.1" diff --git a/crates/router_derive/Cargo.toml b/crates/router_derive/Cargo.toml index 6d39c9a6d1..483a0d1cd9 100644 --- a/crates/router_derive/Cargo.toml +++ b/crates/router_derive/Cargo.toml @@ -18,7 +18,7 @@ quote = "1.0.26" syn = { version = "1.0.109", features = ["full", "extra-traits"] } # the full feature does not seem to encompass all the features [dev-dependencies] -diesel = { version = "2.0.3", features = ["postgres"] } +diesel = { version = "2.1.0", features = ["postgres"] } serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" strum = { version = "0.24.1", features = ["derive"] } diff --git a/crates/storage_models/Cargo.toml b/crates/storage_models/Cargo.toml index 22c1acc833..aca1978090 100644 --- a/crates/storage_models/Cargo.toml +++ b/crates/storage_models/Cargo.toml @@ -12,7 +12,7 @@ kv_store = [] [dependencies] async-bb8-diesel = { git = "https://github.com/juspay/async-bb8-diesel", rev = "9a71d142726dbc33f41c1fd935ddaa79841c7be5" } async-trait = "0.1.68" -diesel = { version = "2.0.3", features = ["postgres", "serde_json", "time", "64-column-tables"] } +diesel = { version = "2.1.0", features = ["postgres", "serde_json", "time", "64-column-tables"] } error-stack = "0.3.1" frunk = "0.4.1" frunk_core = "0.4.1" diff --git a/crates/storage_models/src/api_keys.rs b/crates/storage_models/src/api_keys.rs index b362094597..1644d14ecc 100644 --- a/crates/storage_models/src/api_keys.rs +++ b/crates/storage_models/src/api_keys.rs @@ -117,7 +117,7 @@ mod diesel_impl { DB: Backend, String: FromSql, { - fn from_sql(bytes: diesel::backend::RawValue<'_, DB>) -> diesel::deserialize::Result { + fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result { Ok(Self(String::from_sql(bytes)?)) } } diff --git a/crates/storage_models/src/enums.rs b/crates/storage_models/src/enums.rs index 55cd93ce79..356c6ee293 100644 --- a/crates/storage_models/src/enums.rs +++ b/crates/storage_models/src/enums.rs @@ -598,7 +598,7 @@ impl FromSql for MandateDataType where serde_json::Value: FromSql, { - fn from_sql(bytes: diesel::backend::RawValue<'_, DB>) -> diesel::deserialize::Result { + fn from_sql(bytes: DB::RawValue<'_>) -> diesel::deserialize::Result { let value = >::from_sql(bytes)?; Ok(serde_json::from_value(value)?) } diff --git a/crates/storage_models/src/lib.rs b/crates/storage_models/src/lib.rs index 45a40b26f0..265be16622 100644 --- a/crates/storage_models/src/lib.rs +++ b/crates/storage_models/src/lib.rs @@ -23,6 +23,7 @@ pub mod process_tracker; pub mod query; pub mod refund; pub mod reverse_lookup; +#[allow(unused_qualifications)] pub mod schema; use diesel_impl::{DieselArray, OptionalDieselArray}; diff --git a/crates/storage_models/src/schema.rs b/crates/storage_models/src/schema.rs index 90488f02bb..ea23a6a7ef 100644 --- a/crates/storage_models/src/schema.rs +++ b/crates/storage_models/src/schema.rs @@ -6,21 +6,34 @@ diesel::table! { address (address_id) { id -> Int4, + #[max_length = 64] address_id -> Varchar, + #[max_length = 128] city -> Nullable, country -> Nullable, + #[max_length = 255] line1 -> Nullable, + #[max_length = 255] line2 -> Nullable, + #[max_length = 255] line3 -> Nullable, + #[max_length = 128] state -> Nullable, + #[max_length = 16] zip -> Nullable, + #[max_length = 255] first_name -> Nullable, + #[max_length = 255] last_name -> Nullable, + #[max_length = 32] phone_number -> Nullable, + #[max_length = 8] country_code -> Nullable, created_at -> Timestamp, modified_at -> Timestamp, + #[max_length = 64] customer_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, } } @@ -30,11 +43,17 @@ diesel::table! { use crate::enums::diesel_exports::*; api_keys (key_id) { + #[max_length = 64] key_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] name -> Varchar, + #[max_length = 256] description -> Nullable, + #[max_length = 128] hashed_api_key -> Varchar, + #[max_length = 16] prefix -> Varchar, created_at -> Timestamp, expires_at -> Nullable, @@ -47,14 +66,18 @@ diesel::table! { use crate::enums::diesel_exports::*; cards_info (card_iin) { + #[max_length = 16] card_iin -> Varchar, card_issuer -> Nullable, card_network -> Nullable, card_type -> Nullable, card_subtype -> Nullable, card_issuing_country -> Nullable, + #[max_length = 32] bank_code_id -> Nullable, + #[max_length = 32] bank_code -> Nullable, + #[max_length = 32] country_code -> Nullable, date_created -> Timestamp, last_updated -> Nullable, @@ -68,6 +91,7 @@ diesel::table! { configs (key) { id -> Int4, + #[max_length = 255] key -> Varchar, config -> Text, } @@ -79,12 +103,17 @@ diesel::table! { connector_response (id) { id -> Int4, + #[max_length = 64] payment_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] attempt_id -> Varchar, created_at -> Timestamp, modified_at -> Timestamp, + #[max_length = 64] connector_name -> Nullable, + #[max_length = 128] connector_transaction_id -> Nullable, authentication_data -> Nullable, encoded_data -> Nullable, @@ -97,12 +126,19 @@ diesel::table! { customers (customer_id, merchant_id) { id -> Int4, + #[max_length = 64] customer_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 255] name -> Nullable, + #[max_length = 255] email -> Nullable, + #[max_length = 32] phone -> Nullable, + #[max_length = 8] phone_country_code -> Nullable, + #[max_length = 255] description -> Nullable, created_at -> Timestamp, metadata -> Nullable, @@ -117,23 +153,34 @@ diesel::table! { dispute (id) { id -> Int4, + #[max_length = 64] dispute_id -> Varchar, + #[max_length = 255] amount -> Varchar, + #[max_length = 255] currency -> Varchar, dispute_stage -> DisputeStage, dispute_status -> DisputeStatus, + #[max_length = 255] payment_id -> Varchar, + #[max_length = 64] attempt_id -> Varchar, + #[max_length = 255] merchant_id -> Varchar, + #[max_length = 255] connector_status -> Varchar, + #[max_length = 255] connector_dispute_id -> Varchar, + #[max_length = 255] connector_reason -> Nullable, + #[max_length = 255] connector_reason_code -> Nullable, challenge_required_by -> Nullable, connector_created_at -> Nullable, connector_updated_at -> Nullable, created_at -> Timestamp, modified_at -> Timestamp, + #[max_length = 255] connector -> Varchar, evidence -> Jsonb, } @@ -145,11 +192,14 @@ diesel::table! { events (id) { id -> Int4, + #[max_length = 64] event_id -> Varchar, event_type -> EventType, event_class -> EventClass, is_webhook_notified -> Bool, + #[max_length = 64] intent_reference_id -> Nullable, + #[max_length = 64] primary_object_id -> Varchar, primary_object_type -> EventObjectType, created_at -> Timestamp, @@ -161,15 +211,22 @@ diesel::table! { use crate::enums::diesel_exports::*; file_metadata (file_id, merchant_id) { + #[max_length = 64] file_id -> Varchar, + #[max_length = 255] merchant_id -> Varchar, + #[max_length = 255] file_name -> Nullable, file_size -> Int4, + #[max_length = 255] file_type -> Varchar, + #[max_length = 255] provider_file_id -> Nullable, + #[max_length = 255] file_upload_provider -> Nullable, available -> Bool, created_at -> Timestamp, + #[max_length = 255] connector_label -> Nullable, } } @@ -180,19 +237,32 @@ diesel::table! { locker_mock_up (id) { id -> Int4, + #[max_length = 255] card_id -> Varchar, + #[max_length = 255] external_id -> Varchar, + #[max_length = 255] card_fingerprint -> Varchar, + #[max_length = 255] card_global_fingerprint -> Varchar, + #[max_length = 255] merchant_id -> Varchar, + #[max_length = 255] card_number -> Varchar, + #[max_length = 255] card_exp_year -> Varchar, + #[max_length = 255] card_exp_month -> Varchar, + #[max_length = 255] name_on_card -> Nullable, + #[max_length = 255] nickname -> Nullable, + #[max_length = 255] customer_id -> Nullable, duplicate -> Nullable, + #[max_length = 8] card_cvc -> Nullable, + #[max_length = 64] payment_method_id -> Nullable, } } @@ -203,22 +273,32 @@ diesel::table! { mandate (id) { id -> Int4, + #[max_length = 64] mandate_id -> Varchar, + #[max_length = 64] customer_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] payment_method_id -> Varchar, mandate_status -> MandateStatus, mandate_type -> MandateType, customer_accepted_at -> Nullable, + #[max_length = 64] customer_ip_address -> Nullable, + #[max_length = 255] customer_user_agent -> Nullable, + #[max_length = 128] network_transaction_id -> Nullable, + #[max_length = 64] previous_attempt_id -> Nullable, created_at -> Timestamp, mandate_amount -> Nullable, mandate_currency -> Nullable, amount_captured -> Nullable, + #[max_length = 64] connector -> Varchar, + #[max_length = 128] connector_mandate_id -> Nullable, start_date -> Nullable, end_date -> Nullable, @@ -233,18 +313,25 @@ diesel::table! { merchant_account (id) { id -> Int4, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 255] return_url -> Nullable, enable_payment_response_hash -> Bool, + #[max_length = 255] payment_response_hash_key -> Nullable, redirect_to_merchant_with_http_post -> Bool, + #[max_length = 128] merchant_name -> Nullable, merchant_details -> Nullable, webhook_details -> Nullable, sub_merchants_enabled -> Nullable, + #[max_length = 64] parent_merchant_id -> Nullable, + #[max_length = 128] publishable_key -> Nullable, storage_scheme -> MerchantStorageScheme, + #[max_length = 64] locker_id -> Nullable, metadata -> Nullable, routing_algorithm -> Nullable, @@ -262,18 +349,24 @@ diesel::table! { merchant_connector_account (id) { id -> Int4, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] connector_name -> Varchar, connector_account_details -> Json, test_mode -> Nullable, disabled -> Nullable, + #[max_length = 128] merchant_connector_id -> Varchar, payment_methods_enabled -> Nullable>>, connector_type -> ConnectorType, metadata -> Nullable, + #[max_length = 255] connector_label -> Varchar, business_country -> CountryAlpha2, + #[max_length = 255] business_label -> Varchar, + #[max_length = 64] business_sub_label -> Nullable, frm_configs -> Nullable, created_at -> Timestamp, @@ -287,20 +380,26 @@ diesel::table! { payment_attempt (id) { id -> Int4, + #[max_length = 64] payment_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] attempt_id -> Varchar, status -> AttemptStatus, amount -> Int8, currency -> Nullable, save_to_locker -> Nullable, + #[max_length = 64] connector -> Nullable, error_message -> Nullable, offer_amount -> Nullable, surcharge_amount -> Nullable, tax_amount -> Nullable, + #[max_length = 64] payment_method_id -> Nullable, payment_method -> Nullable, + #[max_length = 128] connector_transaction_id -> Nullable, capture_method -> Nullable, capture_on -> Nullable, @@ -309,16 +408,23 @@ diesel::table! { created_at -> Timestamp, modified_at -> Timestamp, last_synced -> Nullable, + #[max_length = 255] cancellation_reason -> Nullable, amount_to_capture -> Nullable, + #[max_length = 64] mandate_id -> Nullable, browser_info -> Nullable, + #[max_length = 255] error_code -> Nullable, + #[max_length = 128] payment_token -> Nullable, connector_metadata -> Nullable, + #[max_length = 50] payment_experience -> Nullable, + #[max_length = 64] payment_method_type -> Nullable, payment_method_data -> Nullable, + #[max_length = 64] business_sub_label -> Nullable, straight_through_algorithm -> Nullable, preprocessing_step_id -> Nullable, @@ -332,29 +438,42 @@ diesel::table! { payment_intent (id) { id -> Int4, + #[max_length = 64] payment_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, status -> IntentStatus, amount -> Int8, currency -> Nullable, amount_captured -> Nullable, + #[max_length = 64] customer_id -> Nullable, + #[max_length = 255] description -> Nullable, + #[max_length = 255] return_url -> Nullable, metadata -> Nullable, + #[max_length = 64] connector_id -> Nullable, + #[max_length = 64] shipping_address_id -> Nullable, + #[max_length = 64] billing_address_id -> Nullable, + #[max_length = 255] statement_descriptor_name -> Nullable, + #[max_length = 255] statement_descriptor_suffix -> Nullable, created_at -> Timestamp, modified_at -> Timestamp, last_synced -> Nullable, setup_future_usage -> Nullable, off_session -> Nullable, + #[max_length = 128] client_secret -> Nullable, + #[max_length = 64] active_attempt_id -> Varchar, business_country -> CountryAlpha2, + #[max_length = 64] business_label -> Varchar, } } @@ -365,23 +484,34 @@ diesel::table! { payment_methods (id) { id -> Int4, + #[max_length = 64] customer_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 64] payment_method_id -> Varchar, accepted_currency -> Nullable>>, + #[max_length = 32] scheme -> Nullable, + #[max_length = 128] token -> Nullable, + #[max_length = 255] cardholder_name -> Nullable, + #[max_length = 64] issuer_name -> Nullable, + #[max_length = 64] issuer_country -> Nullable, payer_country -> Nullable>>, is_stored -> Nullable, + #[max_length = 32] swift_code -> Nullable, + #[max_length = 128] direct_debit_token -> Nullable, created_at -> Timestamp, last_modified -> Timestamp, payment_method -> Varchar, payment_method_type -> Nullable, + #[max_length = 128] payment_method_issuer -> Nullable, payment_method_issuer_code -> Nullable, metadata -> Nullable, @@ -393,14 +523,19 @@ diesel::table! { use crate::enums::diesel_exports::*; process_tracker (id) { + #[max_length = 127] id -> Varchar, + #[max_length = 64] name -> Nullable, tag -> Array>, + #[max_length = 64] runner -> Nullable, retry_count -> Int4, schedule_time -> Nullable, + #[max_length = 255] rule -> Varchar, tracking_data -> Json, + #[max_length = 255] business_status -> Varchar, status -> ProcessTrackerStatus, event -> Array>, @@ -415,13 +550,21 @@ diesel::table! { refund (id) { id -> Int4, + #[max_length = 64] internal_reference_id -> Varchar, + #[max_length = 64] refund_id -> Varchar, + #[max_length = 64] payment_id -> Varchar, + #[max_length = 64] merchant_id -> Varchar, + #[max_length = 128] connector_transaction_id -> Varchar, + #[max_length = 64] connector -> Varchar, + #[max_length = 128] connector_refund_id -> Nullable, + #[max_length = 64] external_reference_id -> Nullable, refund_type -> RefundType, total_amount -> Int8, @@ -431,11 +574,15 @@ diesel::table! { sent_to_gateway -> Bool, refund_error_message -> Nullable, metadata -> Nullable, + #[max_length = 128] refund_arn -> Nullable, created_at -> Timestamp, modified_at -> Timestamp, + #[max_length = 255] description -> Nullable, + #[max_length = 64] attempt_id -> Varchar, + #[max_length = 255] refund_reason -> Nullable, refund_error_code -> Nullable, } @@ -446,9 +593,13 @@ diesel::table! { use crate::enums::diesel_exports::*; reverse_lookup (lookup_id) { + #[max_length = 128] lookup_id -> Varchar, + #[max_length = 128] sk_id -> Varchar, + #[max_length = 128] pk_id -> Varchar, + #[max_length = 128] source -> Varchar, } }