From 8f7392983fee90cebcc47d48e0fb5be96e68144a Mon Sep 17 00:00:00 2001
From: Emmanuel Keller <emmanuel.keller@surrealdb.com>
Date: Tue, 30 Jul 2024 18:52:03 +0100
Subject: [PATCH] Remove private feature, restore cfg/docker (#4442)

---
 Cargo.toml                | 5 +++--
 Makefile.ci.toml          | 4 ++--
 tests/database_upgrade.rs | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d89ee9ab..3359df99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,6 @@ performance-profiler = ["dep:pprof"]
 # Special features
 storage-fdb-7_1 = ["surrealdb/kv-fdb-7_1"]
 storage-fdb-7_3 = ["surrealdb/kv-fdb-7_3"]
-# Trigger database upgrade tests
-database-upgrade-tests = []
 
 [workspace]
 members = [
@@ -184,3 +182,6 @@ assets = [
 ]
 extended-description = "A scalable, distributed, collaborative, document-graph database, for the realtime web."
 license-file = ["LICENSE", "4"]
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(docker)'] }
diff --git a/Makefile.ci.toml b/Makefile.ci.toml
index 50fcd659..33fcc09e 100644
--- a/Makefile.ci.toml
+++ b/Makefile.ci.toml
@@ -110,8 +110,8 @@ run_task = { name = ["start-surrealdb", "test-api-integration", "stop-surrealdb"
 [tasks.test-database-upgrade]
 private = true
 command = "cargo"
-env = { RUST_BACKTRACE = 1, RUST_LOG = "info" }
-args = ["test", "--locked", "--no-default-features", "--features", "database-upgrade-tests,${_TEST_FEATURES}", "--workspace", "--test", "database_upgrade", "--", "database_upgrade", "--show-output"]
+env = { RUST_BACKTRACE = 1, RUST_LOG = "info", RUSTFLAGS = "--cfg docker" }
+args = ["test", "--locked", "--no-default-features", "--features", "${_TEST_FEATURES}", "--workspace", "--test", "database_upgrade", "--", "database_upgrade", "--show-output"]
 
 
 #
diff --git a/tests/database_upgrade.rs b/tests/database_upgrade.rs
index 39a1acbd..e653643b 100644
--- a/tests/database_upgrade.rs
+++ b/tests/database_upgrade.rs
@@ -3,7 +3,7 @@
 
 mod common;
 
-#[cfg(feature = "database-upgrade-tests")]
+#[cfg(docker)]
 mod database_upgrade {
 	use super::common::docker::DockerContainer;
 	use super::common::expected::Expected;