From fe497ce104c037315d1212029754c1934503bb03 Mon Sep 17 00:00:00 2001
From: Brendan Allan <brendonovich@outlook.com>
Date: Tue, 27 Sep 2022 12:28:32 +0800
Subject: [PATCH] make rust 1.64 requirement more concrete

---
 Cargo.lock                  |  6 +++---
 Cargo.toml                  |  4 ++--
 apps/mobile/rust/Cargo.toml |  2 +-
 core/Cargo.toml             |  7 ++++---
 core/src/util/db.rs         | 19 ++++++++++++-------
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb4270cbb..771c0b638 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3438,7 +3438,7 @@ dependencies = [
 [[package]]
 name = "prisma-client-rust"
 version = "0.6.1"
-source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
+source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
 dependencies = [
  "base64 0.13.0",
  "bigdecimal",
@@ -3467,7 +3467,7 @@ dependencies = [
 [[package]]
 name = "prisma-client-rust-cli"
 version = "0.6.1"
-source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
+source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
 dependencies = [
  "datamodel",
  "prisma-client-rust-sdk",
@@ -3482,7 +3482,7 @@ dependencies = [
 [[package]]
 name = "prisma-client-rust-sdk"
 version = "0.6.1"
-source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536#fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536"
+source = "git+https://github.com//Brendonovich/prisma-client-rust.git?rev=6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6#6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6"
 dependencies = [
  "convert_case 0.5.0",
  "datamodel",
diff --git a/Cargo.toml b/Cargo.toml
index 5078723dc..063d0a62a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,5 +13,5 @@ resolver = "2"
 openssl-sys = { git = "https://github.com/spacedriveapp/rust-openssl" }
 
 [patch."https://github.com/Brendonovich/prisma-client-rust.git"]
-prisma-client-rust = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536" }
-prisma-client-rust-cli = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "fbfa3ecbbd35ca4b5a8e1f9948e7cabdc9c7e536" }
+prisma-client-rust = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6" }
+prisma-client-rust-cli = { git = "https://github.com//Brendonovich/prisma-client-rust.git", rev = "6b59d9f0a07c4c5df1f5c97f2c6c1df7082ccac6" }
diff --git a/apps/mobile/rust/Cargo.toml b/apps/mobile/rust/Cargo.toml
index ebc5d4e53..42d673cfe 100644
--- a/apps/mobile/rust/Cargo.toml
+++ b/apps/mobile/rust/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sdcore-lib"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.64.0"
 
 [lib]
 name = "sdcore"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 8ef01c25b..ddfff8133 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Spacedrive Technology Inc."]
 license = "GNU GENERAL PUBLIC LICENSE"
 repository = "https://github.com/spacedriveapp/spacedrive"
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.64.0"
 
 [features]
 default = ["p2p"]
@@ -15,7 +15,8 @@ p2p = [
 mobile = [
 ] # This feature allows features to be disabled when the Core is running on mobile.
 ffmpeg = [
-  "dep:ffmpeg-next", "dep:thumbnailer"
+  "dep:ffmpeg-next",
+  "dep:thumbnailer",
 ] # This feature controls whether the Spacedrive Core contains functionality which requires FFmpeg.
 
 [dependencies]
@@ -68,4 +69,4 @@ enumflags2 = "0.7.5"
 
 [dev-dependencies]
 tempfile = "^3.3.0"
-tracing-test = "^0.2.3"
\ No newline at end of file
+tracing-test = "^0.2.3"
diff --git a/core/src/util/db.rs b/core/src/util/db.rs
index d7caf2037..949dec7f3 100644
--- a/core/src/util/db.rs
+++ b/core/src/util/db.rs
@@ -22,13 +22,18 @@ pub async fn load_and_migrate(db_url: &str) -> Result<PrismaClient, MigrationErr
 		.map_err(Box::new)?;
 
 	#[cfg(debug_assertions)]
-	client
-		._db_push(
-			std::env::var("SD_FORCE_RESET_DB")
-				.map(|v| v == "true")
-				.unwrap_or(false),
-		)
-		.await?;
+	{
+		let mut builder = client._db_push();
+
+		if std::env::var("SD_FORCE_RESET_DB")
+			.map(|v| v == "true")
+			.unwrap_or(false)
+		{
+			builder = builder.force_reset();
+		}
+
+		builder.await?;
+	}
 
 	#[cfg(not(debug_assertions))]
 	client._migrate_deploy().await?;