diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2023-04-20 19:34:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-20 19:34:36 -0500 |
commit | 3ff1650819a4920738700cc2ddfddc44d99b7658 (patch) | |
tree | 42d0b9e511a645fdf957cc93ead56364645ac37e /pkgs/development/tools/database | |
parent | 3c4d1ef08a9b23a5467bb46d5aa1922f2d9628dc (diff) | |
parent | 9a03bb2c0760db455f4d672c206e69a7201b8c99 (diff) |
Merge pull request #226868 from pimeys/prisma-4.13.0
prisma-engines: 4.12.0 -> 4.13.0
Diffstat (limited to 'pkgs/development/tools/database')
-rw-r--r-- | pkgs/development/tools/database/prisma-engines/Cargo.lock | 700 | ||||
-rw-r--r-- | pkgs/development/tools/database/prisma-engines/default.nix | 10 |
2 files changed, 404 insertions, 306 deletions
diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 4e62430f3c50d..5d7b32a4f6cca 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -106,7 +106,7 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -117,7 +117,7 @@ checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -192,6 +192,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + +[[package]] name = "bigdecimal" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -208,7 +214,7 @@ version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -234,6 +240,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" + +[[package]] name = "bitvec" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -246,6 +258,21 @@ dependencies = [ ] [[package]] +name = "black-box-tests" +version = "0.1.0" +dependencies = [ + "anyhow", + "indoc", + "insta", + "query-engine-tests", + "query-tests-setup", + "reqwest", + "serde_json", + "tokio", + "user-facing-errors", +] + +[[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -284,6 +311,15 @@ dependencies = [ ] [[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "memchr", +] + +[[package]] name = "builtin-psl-connectors" version = "0.1.0" dependencies = [ @@ -403,7 +439,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim 0.8.0", "textwrap 0.11.0", "unicode-width", @@ -416,7 +452,7 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "clap_lex", "indexmap", "textwrap 0.16.0", @@ -509,12 +545,6 @@ dependencies = [ [[package]] name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - -[[package]] -name = "convert_case" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" @@ -693,7 +723,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" dependencies = [ "quote", - "syn", + "syn 1.0.99", +] + +[[package]] +name = "ctor" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" +dependencies = [ + "quote", + "syn 2.0.14", ] [[package]] @@ -728,7 +768,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 1.0.99", ] [[package]] @@ -739,7 +779,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -781,7 +821,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -842,9 +882,12 @@ name = "dmmf" version = "0.1.0" dependencies = [ "bigdecimal", + "colored", "expect-test", + "flate2", "indexmap", "indoc", + "itertools", "pretty_assertions", "prisma-models", "psl", @@ -852,6 +895,7 @@ dependencies = [ "schema-builder", "serde", "serde_json", + "similar", ] [[package]] @@ -931,6 +975,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -945,7 +998,7 @@ dependencies = [ "heck 0.4.0", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -957,7 +1010,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -978,7 +1031,7 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1112,7 +1165,7 @@ checksum = "3dbc4f084ec5a3f031d24ccedeb87ab2c3189a2f33b8d070889073837d5ea09e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1124,7 +1177,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1148,7 +1201,7 @@ dependencies = [ "frunk_proc_macro_helpers", "proc-macro-hack", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1213,7 +1266,7 @@ checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -1488,6 +1541,19 @@ dependencies = [ ] [[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1517,9 +1583,9 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.7" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" [[package]] name = "insta" @@ -1544,47 +1610,6 @@ dependencies = [ ] [[package]] -name = "introspection-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "enumflags2", - "psl", - "serde", - "serde_json", - "thiserror", - "user-facing-errors", -] - -[[package]] -name = "introspection-engine-tests" -version = "0.1.0" -dependencies = [ - "barrel", - "connection-string", - "enumflags2", - "expect-test", - "indoc", - "introspection-connector", - "migration-connector", - "pretty_assertions", - "psl", - "quaint", - "serde_json", - "sql-introspection-connector", - "sql-migration-connector", - "sql-schema-describer", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] - -[[package]] name = "io-lifetimes" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1603,7 +1628,7 @@ dependencies = [ "socket2", "widestring", "winapi", - "winreg", + "winreg 0.7.0", ] [[package]] @@ -1614,9 +1639,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1859,7 +1884,7 @@ version = "0.91.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2368312c59425dd133cb9a327afee65be0a633a8ce471d248e2202a48f8f68ae" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -1972,7 +1997,7 @@ checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2014,99 +2039,10 @@ dependencies = [ ] [[package]] -name = "migration-connector" -version = "0.1.0" -dependencies = [ - "chrono", - "enumflags2", - "introspection-connector", - "psl", - "sha2 0.9.9", - "tracing", - "tracing-error", - "user-facing-errors", -] - -[[package]] -name = "migration-core" -version = "0.1.0" -dependencies = [ - "async-trait", - "chrono", - "enumflags2", - "json-rpc-api-build", - "jsonrpc-core", - "migration-connector", - "mongodb-migration-connector", - "psl", - "serde", - "serde_json", - "sql-migration-connector", - "tokio", - "tracing", - "tracing-futures", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "migration-engine-cli" -version = "0.1.0" -dependencies = [ - "backtrace", - "base64 0.13.1", - "connection-string", - "expect-test", - "indoc", - "json-rpc-stdio", - "migration-connector", - "migration-core", - "quaint", - "serde_json", - "structopt", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-error", - "tracing-subscriber", - "url", - "user-facing-errors", -] - -[[package]] -name = "migration-engine-tests" -version = "0.1.0" -dependencies = [ - "bigdecimal", - "chrono", - "colored", - "connection-string", - "enumflags2", - "expect-test", - "indoc", - "jsonrpc-core", - "migration-core", - "once_cell", - "pretty_assertions", - "prisma-value", - "psl", - "quaint", - "serde", - "serde_json", - "sql-migration-connector", - "sql-schema-describer", - "tempfile", - "test-macros", - "test-setup", - "tokio", - "tracing", - "tracing-futures", - "url", - "user-facing-errors", -] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2161,7 +2097,7 @@ checksum = "b95afe97b0c799fdf69cd960272a2cb9662d077bd6efd84eb722bb9805d47554" dependencies = [ "async-trait", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bson", "chrono", "derivative", @@ -2210,82 +2146,62 @@ dependencies = [ ] [[package]] -name = "mongodb-introspection-connector" +name = "mongodb-query-connector" version = "0.1.0" dependencies = [ + "anyhow", "async-trait", - "convert_case 0.5.0", - "datamodel-renderer", - "enumflags2", - "expect-test", + "bigdecimal", + "bson", + "chrono", + "cuid", "futures", - "indoc", - "introspection-connector", + "indexmap", + "itertools", "mongodb", "mongodb-client", - "mongodb-schema-describer", - "names", - "once_cell", + "prisma-models", + "prisma-value", "psl", + "query-connector", + "query-engine-metrics", + "rand 0.7.3", "regex", + "serde", "serde_json", "thiserror", "tokio", - "url", + "tracing", + "tracing-futures", "user-facing-errors", + "uuid 1.1.2", ] [[package]] -name = "mongodb-migration-connector" +name = "mongodb-schema-connector" version = "0.1.0" dependencies = [ + "convert_case", + "datamodel-renderer", "dissimilar", "enumflags2", + "expect-test", "futures", - "migration-connector", + "indoc", "mongodb", "mongodb-client", - "mongodb-introspection-connector", "mongodb-schema-describer", + "names", "once_cell", "psl", - "serde", - "serde_json", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "mongodb-query-connector" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "bson", - "chrono", - "cuid", - "futures", - "indexmap", - "itertools", - "mongodb", - "mongodb-client", - "prisma-models", - "prisma-value", - "psl", - "query-connector", - "query-engine-metrics", - "rand 0.7.3", "regex", + "schema-connector", "serde", "serde_json", - "thiserror", "tokio", "tracing", - "tracing-futures", + "url", "user-facing-errors", - "uuid 1.1.2", ] [[package]] @@ -2344,7 +2260,7 @@ dependencies = [ "base64 0.13.1", "bigdecimal", "bindgen", - "bitflags", + "bitflags 1.3.2", "bitvec", "byteorder", "bytes", @@ -2392,17 +2308,17 @@ dependencies = [ [[package]] name = "napi" -version = "2.10.4" +version = "2.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "838b5b414a008e75b97edb3c3e6f189034af789a0608686299b149d3b0e66c39" +checksum = "556470a21074b55be8adee5f27ca04389cfdaca323a28b4b0e9c15466de94731" dependencies = [ - "bitflags", - "ctor", + "bitflags 2.1.0", + "ctor 0.2.0", + "napi-derive", "napi-sys", "once_cell", "serde", "serde_json", - "thread_local", "tokio", ] @@ -2414,36 +2330,37 @@ checksum = "ebd4419172727423cf30351406c54f6cc1b354a2cfb4f1dba3e6cd07f6d5522b" [[package]] name = "napi-derive" -version = "2.9.3" +version = "2.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e44e34e70aa61be9036ae652e27c20db5bca80e006be0f482419f6601352a" +checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" dependencies = [ - "convert_case 0.6.0", + "convert_case", "napi-derive-backend", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] name = "napi-derive-backend" -version = "1.0.40" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17925fff04b6fa636f8e4b4608cc1a4f1360b64ac8ecbfdb7da1be1dc74f6843" +checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" dependencies = [ - "convert_case 0.6.0", + "convert_case", "once_cell", "proc-macro2", "quote", "regex", - "syn", + "semver 1.0.17", + "syn 1.0.99", ] [[package]] name = "napi-sys" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529671ebfae679f2ce9630b62dd53c72c56b3eb8b2c852e7e2fa91704ff93d67" +checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" dependencies = [ "libloading", ] @@ -2567,7 +2484,7 @@ version = "0.10.48" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "foreign-types", "libc", @@ -2584,7 +2501,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2841,7 +2758,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2910,7 +2827,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -2962,7 +2879,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "native-tls", "tokio", @@ -2973,7 +2890,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "base64 0.13.1", "byteorder", @@ -2990,7 +2907,7 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "bit-vec", "bytes", @@ -3020,7 +2937,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ctor", + "ctor 0.1.23", "diff", "output_vt100", "yansi", @@ -3099,7 +3016,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "version_check", ] @@ -3122,9 +3039,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -3169,7 +3086,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -3222,13 +3139,13 @@ version = "0.1.0" dependencies = [ "connection-string", "enumflags2", - "migration-core", "mongodb", "mongodb-client", "once_cell", "parking_lot 0.12.1", "psl", "quaint", + "schema-core", "tempfile", "test-setup", "url", @@ -3237,7 +3154,7 @@ dependencies = [ [[package]] name = "quaint" version = "0.2.0-alpha.13" -source = "git+https://github.com/prisma/quaint#53c756a67a0ff3f1b6023c64bec9dc9280bdc1cd" +source = "git+https://github.com/prisma/quaint#5a708313ed488da9016e37edbb2f774fd7893250" dependencies = [ "async-trait", "base64 0.12.3", @@ -3317,22 +3234,16 @@ dependencies = [ "base64 0.12.3", "bigdecimal", "chrono", - "connection-string", "crossbeam-channel", - "crossbeam-queue", "cuid", "enumflags2", "futures", "indexmap", "itertools", "lru 0.7.8", - "mongodb-client", - "mongodb-query-connector", "once_cell", "opentelemetry", - "parking_lot 0.12.1", "petgraph 0.4.13", - "pin-utils", "prisma-models", "prisma-value", "psl", @@ -3342,14 +3253,12 @@ dependencies = [ "schema-builder", "serde", "serde_json", - "sql-query-connector", "thiserror", "tokio", "tracing", "tracing-futures", "tracing-opentelemetry", "tracing-subscriber", - "url", "user-facing-errors", "uuid 1.1.2", ] @@ -3474,7 +3383,7 @@ dependencies = [ "proc-macro2", "query-tests-setup", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -3521,9 +3430,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -3621,7 +3530,7 @@ version = "10.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3652,14 +3561,14 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -3677,9 +3586,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "request-handlers" @@ -3693,12 +3602,14 @@ dependencies = [ "indexmap", "insta", "itertools", + "mongodb-query-connector", "prisma-models", "psl", "query-core", "schema-builder", "serde", "serde_json", + "sql-query-connector", "thiserror", "tracing", "url", @@ -3706,6 +3617,43 @@ dependencies = [ ] [[package]] +name = "reqwest" +version = "0.11.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +dependencies = [ + "base64 0.21.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.10.1", +] + +[[package]] name = "resolv-conf" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3736,7 +3684,7 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152" dependencies = [ - "bitflags", + "bitflags 1.3.2", "chrono", "fallible-iterator", "fallible-streaming-iterator", @@ -3775,7 +3723,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" dependencies = [ - "semver", + "semver 0.9.0", ] [[package]] @@ -3785,7 +3733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" dependencies = [ "rustc_version", - "semver", + "semver 0.9.0", ] [[package]] @@ -3794,7 +3742,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -3904,10 +3852,76 @@ dependencies = [ "once_cell", "prisma-models", "psl", + "rustc-hash", "schema", ] [[package]] +name = "schema-connector" +version = "0.1.0" +dependencies = [ + "chrono", + "enumflags2", + "psl", + "quaint", + "serde", + "serde_json", + "sha2 0.9.9", + "tracing", + "tracing-error", + "user-facing-errors", +] + +[[package]] +name = "schema-core" +version = "0.1.0" +dependencies = [ + "async-trait", + "chrono", + "enumflags2", + "json-rpc-api-build", + "jsonrpc-core", + "mongodb-schema-connector", + "psl", + "schema-connector", + "serde", + "serde_json", + "sql-schema-connector", + "tokio", + "tracing", + "tracing-futures", + "tracing-subscriber", + "url", + "user-facing-errors", +] + +[[package]] +name = "schema-engine-cli" +version = "0.1.0" +dependencies = [ + "backtrace", + "base64 0.13.1", + "connection-string", + "expect-test", + "indoc", + "json-rpc-stdio", + "quaint", + "schema-connector", + "schema-core", + "serde_json", + "structopt", + "tempfile", + "test-macros", + "test-setup", + "tokio", + "tracing", + "tracing-error", + "tracing-subscriber", + "url", + "user-facing-errors", +] + +[[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3939,7 +3953,7 @@ version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3966,6 +3980,12 @@ dependencies = [ ] [[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3997,7 +4017,7 @@ checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4020,7 +4040,19 @@ checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", ] [[package]] @@ -4042,7 +4074,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4068,7 +4100,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4146,6 +4178,9 @@ name = "similar" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" +dependencies = [ + "bstr", +] [[package]] name = "siphasher" @@ -4198,58 +4233,60 @@ dependencies = [ ] [[package]] -name = "sql-introspection-connector" +name = "sql-introspection-tests" version = "0.1.0" dependencies = [ - "anyhow", - "async-trait", - "bigdecimal", - "datamodel-renderer", - "either", + "barrel", + "connection-string", "enumflags2", "expect-test", - "introspection-connector", - "once_cell", + "indoc", "pretty_assertions", - "prisma-value", "psl", "quaint", - "regex", - "serde", + "schema-connector", "serde_json", + "sql-schema-connector", "sql-schema-describer", - "sqlformat", - "sqlparser", - "thiserror", + "test-macros", + "test-setup", + "tokio", "tracing", "tracing-futures", + "url", "user-facing-errors", ] [[package]] -name = "sql-migration-connector" +name = "sql-migration-tests" version = "0.1.0" dependencies = [ + "bigdecimal", "chrono", + "colored", "connection-string", - "either", "enumflags2", + "expect-test", "indoc", - "migration-connector", + "jsonrpc-core", "once_cell", + "pretty_assertions", + "prisma-value", "psl", "quaint", - "regex", + "schema-core", + "serde", "serde_json", - "sql-ddl", - "sql-introspection-connector", + "sql-schema-connector", "sql-schema-describer", + "tempfile", + "test-macros", + "test-setup", "tokio", "tracing", "tracing-futures", "url", "user-facing-errors", - "uuid 1.1.2", ] [[package]] @@ -4283,6 +4320,36 @@ dependencies = [ ] [[package]] +name = "sql-schema-connector" +version = "0.1.0" +dependencies = [ + "chrono", + "connection-string", + "datamodel-renderer", + "either", + "enumflags2", + "indoc", + "once_cell", + "prisma-value", + "psl", + "quaint", + "regex", + "schema-connector", + "serde", + "serde_json", + "sql-ddl", + "sql-schema-describer", + "sqlformat", + "sqlparser", + "tokio", + "tracing", + "tracing-futures", + "url", + "user-facing-errors", + "uuid 1.1.2", +] + +[[package]] name = "sql-schema-describer" version = "0.1.0" dependencies = [ @@ -4386,7 +4453,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4417,6 +4484,17 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4460,10 +4538,9 @@ dependencies = [ "colored", "dmmf", "enumflags2", - "introspection-connector", - "migration-connector", - "migration-core", "psl", + "schema-connector", + "schema-core", "serde_json", "structopt", "tokio", @@ -4478,7 +4555,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4529,7 +4606,7 @@ checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4664,7 +4741,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4680,7 +4757,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/pimeys/rust-postgres?branch=pgbouncer-mode#74f0847e9a8ac350c48dd65c4c33e9be5fcf6010" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" dependencies = [ "async-trait", "byteorder", @@ -4814,7 +4891,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -4870,7 +4947,7 @@ checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5030,7 +5107,7 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5117,7 +5194,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", ] [[package]] @@ -5276,11 +5353,23 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-shared", ] [[package]] +name = "wasm-bindgen-futures" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "wasm-bindgen-macro" version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5298,7 +5387,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.99", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5413,7 +5502,7 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f820cd208ce9c6b050812dc2d724ba98c6c1e9db5ce9b3f58d925ae5723a5e6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "byteorder", "md5", "rand 0.7.3", @@ -5511,6 +5600,15 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] name = "wyz" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 07934dde7654a..6f1a8e91a956b 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.12.0"; + version = "4.13.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-bSyAWJ4ukiXVyKI1iGvCs2cMgW1jdYRs5cgTdOCXvrQ="; + sha256 = "sha256-NJQvu+EREF40u5P3i8h2yGYC1vM6Q8xEXX9WyOnJkBM="; }; # Use system openssl. @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage rec { "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mobc-0.7.3" = "sha256-Ts2VVAuZakS+Sy/rEUrCe7RJX5MWs/TTO60c7mH+5sU="; "mysql_async-0.31.3" = "sha256-hvuZTJ8W6L2s2gYAGJXBezkeAHTu06zIvJGQjoYX+7Q="; - "postgres-native-tls-0.5.0" = "sha256-6aDlwv9+Tt9ncOPRnhKNAgafcPhqM1V31Ix+fplwdUc="; - "quaint-0.2.0-alpha.13" = "sha256-UI1B/BylEQQko48D+sQzUhD7qIK2Z84115bu7NkDSFw="; + "postgres-native-tls-0.5.0" = "sha256-OYbtGYAvDDCTeYfhav/BI2LJSyMyUERD7xa8GA/57rI="; + "quaint-0.2.0-alpha.13" = "sha256-Z7Zl1ZXzP3YE1Z1iuuj9V6dYBD2DpJngVbDLb4l/gjc="; }; }; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" "query-engine" "-p" "query-engine-node-api" - "-p" "migration-engine-cli" + "-p" "schema-engine-cli" "-p" "prisma-fmt" ]; |