0.31.1: translate libsql to https before matching

tursodatabase · Jun 26, 2023 · 8618039 · 8618039
1 parent 9f4ec9b
commit 8618039
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "libsql-client"
-version = "0.31.0"
+version = "0.31.1"
 edition = "2021"
 license = "Apache-2.0"
 description = "HTTP-based client for libSQL and sqld"
@@ -31,7 +31,7 @@ tracing = "0.1.37"
 futures = "0.3.28"
 
 [features]
-default = ["local_backend", "hrana_backend", "reqwest_backend"]
+default = ["local_backend", "reqwest_backend"]
 workers_backend = ["worker", "futures-util"]
 reqwest_backend = ["reqwest"]
 local_backend = ["rusqlite"]

diff --git a/src/client.rs b/src/client.rs
@@ -182,7 +182,14 @@ impl Client {
     /// # }
     /// ```
     #[allow(unreachable_patterns)]
-    pub async fn from_config<'a>(config: Config) -> anyhow::Result<Client> {
+    pub async fn from_config<'a>(mut config: Config) -> anyhow::Result<Client> {
+        config.url = if config.url.scheme() == "libsql" {
+            // We cannot use url::Url::set_scheme() because it prevents changing the scheme to http...
+            // Safe to unwrap, because we know that the scheme is libsql
+            url::Url::parse(&config.url.as_str().replace("libsql://", "https://")).unwrap()
+        } else {
+            config.url
+        };
         let scheme = config.url.scheme();
         Ok(match scheme {
             #[cfg(feature = "local_backend")]
@@ -194,19 +201,6 @@ impl Client {
                 Client::Hrana(crate::hrana::Client::from_config(config).await?)
             },
             #[cfg(feature = "reqwest_backend")]
-            "libsql" => {
-                let inner = crate::http::InnerClient::Reqwest(crate::reqwest::HttpClient::new());
-                let mut config = config;
-                config.url = if config.url.scheme() == "libsql" {
-                    // We cannot use url::Url::set_scheme() because it prevents changing the scheme to http...
-                    // Safe to unwrap, because we know that the scheme is libsql
-                    url::Url::parse(&config.url.as_str().replace("libsql://", "https://")).unwrap()
-                } else {
-                    config.url
-                };
-                Client::Http(crate::http::Client::from_config(inner, config)?)
-            }
-            #[cfg(feature = "reqwest_backend")]
             "http" | "https" => {
                 let inner = crate::http::InnerClient::Reqwest(crate::reqwest::HttpClient::new());
                 Client::Http(crate::http::Client::from_config(inner, config)?)