From be3fb1e9856e11416963716f367ddfda1ca44163 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Mon, 5 Dec 2022 17:57:10 +0100
Subject: [PATCH] Update sea-orm to fix bug on failure to commit transactions

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
---
 Cargo.lock               | 6 ++----
 crates/collab/Cargo.toml | 5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a75ca972e2..30c5054576 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5329,8 +5329,7 @@ dependencies = [
 [[package]]
 name = "sea-orm"
 version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fc9dad132e450d6320bd5953e70fb88b42785080b591e9be804da69bd8a170"
+source = "git+https://github.com/zed-industries/sea-orm?rev=18f4c691085712ad014a51792af75a9044bacee6#18f4c691085712ad014a51792af75a9044bacee6"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -5357,8 +5356,7 @@ dependencies = [
 [[package]]
 name = "sea-orm-macros"
 version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66af5d33e04e56dafb2c700f9b1201a39e6c2c77b53ed9ee93244f21f8de6041"
+source = "git+https://github.com/zed-industries/sea-orm?rev=18f4c691085712ad014a51792af75a9044bacee6#18f4c691085712ad014a51792af75a9044bacee6"
 dependencies = [
  "bae",
  "heck 0.3.3",
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 2238be2257..8725642ae5 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -36,7 +36,8 @@ prometheus = "0.13"
 rand = "0.8"
 reqwest = { version = "0.11", features = ["json"], optional = true }
 scrypt = "0.7"
-sea-orm = { version = "0.10", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls"] }
+# Remove fork dependency when a version with https://github.com/SeaQL/sea-orm/pull/1283 is released.
+sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-postgres", "postgres-array", "runtime-tokio-rustls"] }
 sea-query = "0.27"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
@@ -74,7 +75,7 @@ env_logger = "0.9"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 util = { path = "../util" }
 lazy_static = "1.4"
-sea-orm = { version = "0.10", features = ["sqlx-sqlite"] }
+sea-orm = { git = "https://github.com/zed-industries/sea-orm", rev = "18f4c691085712ad014a51792af75a9044bacee6", features = ["sqlx-sqlite"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 sqlx = { version = "0.6", features = ["sqlite"] }
 unindent = "0.1"