diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 2c4a10bd8..d09e63a3d 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -364,11 +364,25 @@ name = "diesel" version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" +dependencies = [ + "bitflags", + "byteorder", + "diesel_derives 1.4.1", + "pq-sys", + "r2d2", +] + +[[package]] +name = "diesel" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72eb77396836a4505da85bae0712fa324b74acfe1876d7c2f7e694ef3d0ee373" dependencies = [ "bitflags", "byteorder", "chrono", - "diesel_derives", + "diesel_derives 2.0.2", + "itoa", "pq-sys", "r2d2", ] @@ -396,6 +410,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "diesel_derives" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad74fdcf086be3d4fdd142f67937678fe60ed431c3b2f08599e7687269410c4" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "diesel_migrations" version = "1.4.0" @@ -1001,7 +1027,7 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" dependencies = [ - "diesel", + "diesel 1.4.8", ] [[package]] @@ -1291,6 +1317,30 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -1580,7 +1630,7 @@ version = "0.1.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fa48b6ab25013e9812f1b0c592741900b3a2a83c0936292e0565c0ac842f558" dependencies = [ - "diesel", + "diesel 1.4.8", "r2d2", "rocket", "rocket_sync_db_pools_codegen", @@ -1688,7 +1738,7 @@ name = "seed_data" version = "0.1.0" dependencies = [ "chrono", - "diesel", + "diesel 2.0.4", "dotenv", "server", ] @@ -1741,7 +1791,7 @@ name = "server" version = "0.1.0" dependencies = [ "chrono", - "diesel", + "diesel 2.0.4", "diesel-derive-enum", "diesel_migrations", "dotenv", diff --git a/backend/seed_data/Cargo.toml b/backend/seed_data/Cargo.toml index 1daa00552..47f488ed3 100644 --- a/backend/seed_data/Cargo.toml +++ b/backend/seed_data/Cargo.toml @@ -7,6 +7,6 @@ edition = "2021" [dependencies] server = { path="../server" } -diesel = "1.4.8" +diesel = "2.0.4" chrono = "0.4.23" dotenv = "0.15.0" diff --git a/backend/server/Cargo.toml b/backend/server/Cargo.toml index bc3b79a39..2d2bfc04c 100644 --- a/backend/server/Cargo.toml +++ b/backend/server/Cargo.toml @@ -18,7 +18,7 @@ rocket = { version = "0.5.0-rc.2", features = ["json"] } rocket_sync_db_pools = { version = "0.1.0-rc.2", features = ["diesel_postgres_pool"] } # pull rocket_cors from git master until crates.io artifact builds on stable rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", branch = "master" } -diesel = { version = "1.4.8", features = ["postgres", "r2d2", "chrono"] } +diesel = { version = "2.0.4", features = ["postgres", "r2d2", "chrono"] } diesel-derive-enum = { version = "1", features = ["postgres"] } dotenv = "0.15.0" dotenv_codegen = "0.15.0"