diff --git a/Cargo.lock b/Cargo.lock index 36e54f6..2160c4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -998,6 +998,41 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2 1.0.66", + "quote 1.0.33", + "strsim 0.11.1", + "syn 2.0.29", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote 1.0.33", + "syn 2.0.29", +] + [[package]] name = "data-encoding" version = "2.4.0" @@ -1123,11 +1158,25 @@ checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" dependencies = [ "bitflags 1.3.2", "byteorder", + "diesel_derives 1.4.1", + "pq-sys", +] + +[[package]] +name = "diesel" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e13bab2796f412722112327f3e575601a3e9cdcbe426f0d30dbf43f3f5dc71" +dependencies = [ + "bitflags 2.4.0", + "byteorder", "chrono", - "diesel_derives", + "diesel_derives 2.2.3", + "itoa 1.0.9", "libsqlite3-sys", "pq-sys", "r2d2", + "time 0.3.36", ] [[package]] @@ -1141,13 +1190,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "diesel_derives" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" +dependencies = [ + "diesel_table_macro_syntax", + "dsl_auto_type", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", +] + [[package]] name = "diesel_full_text_search" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ad3168d9d2008c58b8c9fabb79ddc38d1f9d511fa15e0dcbd6b987912b05783" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -1160,6 +1222,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.29", +] + [[package]] name = "digest" version = "0.7.6" @@ -1236,6 +1307,20 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" +[[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling", + "either", + "heck 0.5.0", + "proc-macro2 1.0.66", + "quote 1.0.33", + "syn 2.0.29", +] + [[package]] name = "dtoa" version = "0.4.8" @@ -1783,6 +1868,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" @@ -2003,6 +2094,12 @@ dependencies = [ "cc", ] +[[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.1.5" @@ -2499,7 +2596,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -4390,7 +4487,7 @@ dependencies = [ "crossbeam-channel", "ctrlc", "data-encoding", - "diesel", + "diesel 2.2.3", "diesel_migrations", "digest 0.10.7", "dirs-next", @@ -4455,7 +4552,7 @@ name = "sn0int-registry" version = "0.5.0" dependencies = [ "blake2 0.8.1", - "diesel", + "diesel 2.2.3", "diesel_full_text_search", "diesel_migrations", "dotenv", @@ -4644,6 +4741,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 = "structopt" version = "0.3.26" diff --git a/Cargo.toml b/Cargo.toml index 766e85e..bdcec17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ rand = "0.8" colored = "2" lazy_static = "1.0" shellwords = "1.0" -diesel = { version = "1.0.0", features = ["sqlite", "chrono"] } +diesel = { version = "2.2.3", features = ["sqlite", "chrono"] } diesel_migrations = { version = "1.3.0", features = ["sqlite"] } libsqlite3-sys = { version = "0.22.0", features = ["bundled-windows"] } chrono = { version = "0.4", features = ["serde"] } diff --git a/sn0int-registry/Cargo.toml b/sn0int-registry/Cargo.toml index b80e16e..3520c7e 100644 --- a/sn0int-registry/Cargo.toml +++ b/sn0int-registry/Cargo.toml @@ -14,7 +14,7 @@ rocket = { version = "0.4", default-features=false } rocket_failure = { version = "0.2" } rocket_contrib = { version = "0.4.1", features = ["handlebars_templates"] } -diesel = { version = "1.3", features = ["postgres", "r2d2"] } +diesel = { version = "2.2", features = ["postgres", "r2d2"] } diesel_migrations = { version = "1.3.0", features = ["postgres"] } diesel_full_text_search = "1.0.1"