Merge branch 'main' into docs/adamji/taosws-example

taosdata · Aug 4, 2023 · 80339c7 · 80339c7
2 parents 56400af + da3bbf7
commit 80339c7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "0.9.2"
+version = "0.9.3"
 
 authors = ["Linhe Huo <linhe.huo@gmail.com>"]
 categories = ["database", "api-bindings", "asynchronous"]

diff --git a/mdsn/Cargo.toml b/mdsn/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mdsn"
-version = "0.2.16"
+version = "0.2.17"
 edition = "2021"
 keywords = ["url", "dsn", "mdsn"]
 license = "MIT OR Apache-2.0"

diff --git a/mdsn/src/lib.rs b/mdsn/src/lib.rs
@@ -96,7 +96,7 @@ impl Dsn {
                         (/(?P<subject>[\w %$@./-]+)?)?                             # for subject
                     | # or
                     # path-like dsn
-                    (?P<path>([\\/.~]$|/\w+[\w %$@*:.\\\-/]*|[\.~\w]?[\w %$@*:.\\\-/]+))
+                    (?P<path>([\\/.~]$|/\s*\w+[\w\s %$@*:.\\\-/]*|[\.~\w\s]?[\w\s %$@*:.\\\-/]+))
                 ) # abc
                 (\?(?P<params>(?s:.)*))?").unwrap();
         }
@@ -1146,4 +1146,12 @@ mod tests {
         assert!(dsn.path.is_some());
         assert_eq!(dsn.get("param").unwrap(), "1");
     }
+
+
+    #[test]
+    fn unix_path_with_space() {
+        let dsn = Dsn::from_str(&format!("csv:./a b.csv?param=1")).unwrap();
+        dbg!(&dsn);
+        assert_eq!(dsn.path.unwrap(), "./a b.csv");
+    }
 }
diff --git a/taos-error/Cargo.toml b/taos-error/Cargo.toml
@@ -12,7 +12,7 @@ version.workspace = true
 
 [dependencies]
 derive_more = "0.99"
-mdsn = {path = "../mdsn", version = "0.2.16" }
+mdsn = {path = "../mdsn", version = "0.2.17" }
 serde = {version = "1", features = ["derive"], optional = true}
 thiserror = "1.0"
 anyhow = { version = "1", features = ["backtrace"] }

diff --git a/taos-optin/Cargo.toml b/taos-optin/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 serde_repr = {version = "0.1.7", optional = true}
 # taos-error = { version = "0.2.0", path = "../taos-error" }
 taos-macros = {version = "0.*", path = "../taos-macros"}
-taos-query = {version = "0.9.2", path = "../taos-query"}
+taos-query = {version = "0.9.3", path = "../taos-query"}
 
 # time_this = "0.2.4"
 fun_time = "0.2.1"

diff --git a/taos-query/Cargo.toml b/taos-query/Cargo.toml
@@ -20,14 +20,14 @@ chrono = { version = "0.4", features = ["serde"] }
 derive_more = "0.99"
 itertools = "0.10.3"
 log = "0.4"
-mdsn = { path = "../mdsn", version = "0.2.16" }
+mdsn = { path = "../mdsn", version = "0.2.17" }
 num_enum = "0.6.1"
 once_cell = "1.12.0"
 parse_duration = "2.1"
 prettytable = "0.10.0"
 rust_decimal = { version = "1", features = ["c-repr"] }
 rustversion = "1.0.6"
-taos-error = { path = "../taos-error", version = "0.9.2" }
+taos-error = { path = "../taos-error", version = "0.9.3" }
 thiserror = "1.0"
 url = "2.2.2"
 

diff --git a/taos-sys/Cargo.toml b/taos-sys/Cargo.toml
@@ -31,7 +31,7 @@ serde_json = "1.0"
 serde_repr = { version = "0.1.7", optional = true }
 # taos-error = { path = "../taos-error", version = "0.2.9" }
 taos-macros = { path = "../taos-macros", version = "0.*" }
-taos-query = { path = "../taos-query", version = "0.9.2" }
+taos-query = { path = "../taos-query", version = "0.9.3" }
 
 [build-dependencies]
 dotenv = "0.15.0"

diff --git a/taos-ws/Cargo.toml b/taos-ws/Cargo.toml
@@ -27,7 +27,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
 serde_repr = "0.1.8"
 serde_with = "3.0.0"
-taos-query = { path = "../taos-query", version = "0.9.2" }
+taos-query = { path = "../taos-query", version = "0.9.3" }
 thiserror = "1"
 tokio = { version = "1", features = ["sync", "rt-multi-thread", "macros", "io-util", "time"] }
 tokio-tungstenite = { version = "0.18.0" }

diff --git a/taos/Cargo.toml b/taos/Cargo.toml
@@ -19,10 +19,10 @@ no-default-features = true
 [dependencies]
 async-trait = "0.1"
 log = "0.4.17"
-taos-optin = {path = "../taos-optin", version = "0.9.2", optional = true}
-taos-query = {path = "../taos-query", version = "0.9.2", default-features = false}
-taos-sys = {path = "../taos-sys", version = "0.9.2", optional = true}
-taos-ws = {path = "../taos-ws", version = "0.9.2", optional = true}
+taos-optin = {path = "../taos-optin", version = "0.9.3", optional = true}
+taos-query = {path = "../taos-query", version = "0.9.3", default-features = false}
+taos-sys = {path = "../taos-sys", version = "0.9.3", optional = true}
+taos-ws = {path = "../taos-ws", version = "0.9.3", optional = true}
 
 [dev-dependencies]
 anyhow = "1"