Merge pull request ClickHouse#87502 from ClickHouse/backport/25.8/87463

Backport ClickHouse#87463 to 25.8: EmbeddedRocksDB: Go back to using data/ path by default

Author: clickhouse-gh[bot]

src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp

@@ -214,12 +214,8 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
 
     if (rocksdb_dir.empty())
     {
-        /// We used to create databases under the database directory by default instead of user files. Check first if it exists there
-        auto old_path = context_->getPath() + relative_data_path_;
-        if (mode >= LoadingStrictnessLevel::ATTACH && fs::exists(old_path))
-            rocksdb_dir = old_path;
-        else
-            rocksdb_dir = fs::path{getContext()->getUserFilesPath()} / relative_data_path_;
+        /// We create tables under the database directory by default and enforce user_files path check for explicitly declared paths
+        rocksdb_dir = context_->getPath() + relative_data_path_;
     }
     else
     {
@@ -229,7 +225,7 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
             rocksdb_dir = user_files_path / rocksdb_dir;
         rocksdb_dir = fs::absolute(rocksdb_dir).lexically_normal();
 
-        if (!is_local && !pathStartsWith(fs::path(rocksdb_dir), user_files_path))
+        if (!is_local && !fileOrSymlinkPathStartsWith(fs::path(rocksdb_dir), user_files_path))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Path must be inside user-files path: {}", user_files_path.string());
     }