From 8cede20081d2fb549140d57371dd1f48e72d0d13 Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Fri, 27 Jan 2023 16:09:51 +0100 Subject: [PATCH] Use specific fork of quaint until the related PR is merged https://github.com/prisma/quaint/pull/431 --- Cargo.lock | 64 ++++++++++++++++++++++++++++++++++++++++++++---------- Cargo.toml | 3 ++- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0f66d9d155e9..f9adc7abf9f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,7 +1536,7 @@ dependencies = [ "migration-connector", "pretty_assertions", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "serde_json", "sql-introspection-connector", "sql-migration-connector", @@ -2015,7 +2015,7 @@ dependencies = [ "json-rpc-stdio", "migration-connector", "migration-core", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "serde_json", "structopt", "tempfile", @@ -2046,7 +2046,7 @@ dependencies = [ "pretty_assertions", "prisma-value", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "serde", "serde_json", "sql-migration-connector", @@ -3151,12 +3151,52 @@ dependencies = [ "mongodb-client", "parking_lot 0.12.1", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "tempfile", "test-setup", "url", ] +[[package]] +name = "quaint" +version = "0.2.0-alpha.13" +source = "git+https://github.com/miguelff/quaint?branch=fix-traces#76a56f5940bd44d9f51cd73b89b274c65ff2a081" +dependencies = [ + "async-trait", + "base64 0.12.3", + "bigdecimal", + "bit-vec", + "byteorder", + "bytes", + "chrono", + "connection-string", + "either", + "futures", + "hex", + "libsqlite3-sys", + "lru-cache", + "metrics 0.18.1", + "mobc", + "mysql_async", + "native-tls", + "num_cpus", + "percent-encoding", + "postgres-native-tls", + "postgres-types", + "rusqlite", + "serde_json", + "sqlformat", + "thiserror", + "tiberius", + "tokio", + "tokio-postgres", + "tokio-util 0.6.10", + "tracing", + "tracing-core", + "url", + "uuid 1.1.2", +] + [[package]] name = "quaint" version = "0.2.0-alpha.13" @@ -3292,7 +3332,7 @@ dependencies = [ "opentelemetry-otlp", "prisma-models", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "query-connector", "query-core", "query-engine-metrics", @@ -3416,7 +3456,7 @@ dependencies = [ "prisma-models", "psl", "qe-setup", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/prisma/quaint)", "query-core", "query-engine", "query-engine-metrics", @@ -4096,7 +4136,7 @@ dependencies = [ "pretty_assertions", "prisma-value", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "regex", "serde", "serde_json", @@ -4119,7 +4159,7 @@ dependencies = [ "migration-connector", "once_cell", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "regex", "serde_json", "sql-ddl", @@ -4149,7 +4189,7 @@ dependencies = [ "prisma-models", "prisma-value", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "query-connector", "rand 0.7.3", "serde", @@ -4178,7 +4218,7 @@ dependencies = [ "pretty_assertions", "prisma-value", "psl", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "regex", "serde", "test-macros", @@ -4362,7 +4402,7 @@ dependencies = [ "dissimilar", "enumflags2", "once_cell", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "tokio", "tracing", "tracing-error", @@ -4998,7 +5038,7 @@ version = "0.1.0" dependencies = [ "backtrace", "indoc", - "quaint", + "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)", "serde", "serde_json", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 76806c557ad7..5be08ed883e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,8 @@ user-facing-errors = { path = "./libs/user-facing-errors" } uuid = { version = "1", features = ["serde"] } [workspace.dependencies.quaint] -git = "https://github.com/prisma/quaint" +git = "https://github.com/miguelff/quaint" +branch = "fix-traces" features = [ "bigdecimal", "chrono",