From 0dd1e4199ea4885e3fa565bbbea31bafead214af Mon Sep 17 00:00:00 2001
From: Miguel Fernandez <miguel@mff.io>
Date: Mon, 30 Jan 2023 16:30:21 +0100
Subject: [PATCH] Depend on quaint:main

---
 Cargo.lock | 66 +++++++++++-------------------------------------------
 Cargo.toml |  3 +--
 2 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0c37d9f750eb..b2d4fd0f7199 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1536,7 +1536,7 @@ dependencies = [
  "migration-connector",
  "pretty_assertions",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "serde_json",
  "sql-introspection-connector",
  "sql-migration-connector",
@@ -2015,7 +2015,7 @@ dependencies = [
  "json-rpc-stdio",
  "migration-connector",
  "migration-core",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "serde_json",
  "structopt",
  "tempfile",
@@ -2046,7 +2046,7 @@ dependencies = [
  "pretty_assertions",
  "prisma-value",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "serde",
  "serde_json",
  "sql-migration-connector",
@@ -3152,7 +3152,7 @@ dependencies = [
  "mongodb-client",
  "parking_lot 0.12.1",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "tempfile",
  "test-setup",
  "url",
@@ -3161,47 +3161,7 @@ dependencies = [
 [[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"
-source = "git+https://github.com/prisma/quaint#6df49f14efe99696e577ffb9902c83b09bec8de2"
+source = "git+https://github.com/prisma/quaint#1550f6cf3b5160e6ebefb18e885774aebbec7512"
 dependencies = [
  "async-trait",
  "base64 0.12.3",
@@ -3333,7 +3293,7 @@ dependencies = [
  "opentelemetry-otlp",
  "prisma-models",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "query-connector",
  "query-core",
  "query-engine-metrics",
@@ -3457,7 +3417,7 @@ dependencies = [
  "prisma-models",
  "psl",
  "qe-setup",
- "quaint 0.2.0-alpha.13 (git+https://github.com/prisma/quaint)",
+ "quaint",
  "query-core",
  "query-engine",
  "query-engine-metrics",
@@ -4137,7 +4097,7 @@ dependencies = [
  "pretty_assertions",
  "prisma-value",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "regex",
  "serde",
  "serde_json",
@@ -4160,7 +4120,7 @@ dependencies = [
  "migration-connector",
  "once_cell",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "regex",
  "serde_json",
  "sql-ddl",
@@ -4190,7 +4150,7 @@ dependencies = [
  "prisma-models",
  "prisma-value",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "query-connector",
  "rand 0.7.3",
  "serde",
@@ -4219,7 +4179,7 @@ dependencies = [
  "pretty_assertions",
  "prisma-value",
  "psl",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "regex",
  "serde",
  "test-macros",
@@ -4403,7 +4363,7 @@ dependencies = [
  "dissimilar",
  "enumflags2",
  "once_cell",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "tokio",
  "tracing",
  "tracing-error",
@@ -5039,7 +4999,7 @@ version = "0.1.0"
 dependencies = [
  "backtrace",
  "indoc",
- "quaint 0.2.0-alpha.13 (git+https://github.com/miguelff/quaint?branch=fix-traces)",
+ "quaint",
  "serde",
  "serde_json",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 04f0fa33f4cc..00ab561a524e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,8 +39,7 @@ user-facing-errors = { path = "./libs/user-facing-errors" }
 uuid = { version = "1", features = ["serde"] }
 
 [workspace.dependencies.quaint]
-git = "https://github.com/miguelff/quaint"
-branch = "fix-traces"
+git = "https://github.com/prisma/quaint"
 features = [
   "bigdecimal",
   "chrono",