Fixes and more tests

Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
 members = ["azure-kusto-data"]
+resolver = "2"

azure-kusto-data/Cargo.toml

@@ -5,7 +5,7 @@ description = "Rust wrappers around Microsoft Azure REST APIs - Azure Data Explo
 readme = "README.md"
 license = "MIT"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.74"
 repository = "https://github.com/azure/azure-sdk-for-rust"
 homepage = "https://github.com/azure/azure-sdk-for-rust"
 documentation = "https://docs.rs/azure_kusto_data"
@@ -26,7 +26,7 @@ bytes = "1.4"
 futures = "0.3"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_with = { version = "3.4.0"}
+serde_with = { version = "3.4.0" }
 thiserror = "1.0.38"
 hashbrown = { version = "0.14", features = ["serde"] }
 regex = "1.7.1"
@@ -38,16 +38,17 @@ time = { version = "0.3", features = [
     "serde-well-known",
 ] }
 derive_builder = "0.12"
-derive_more = { version = "1.0.0-beta.6" , features = ["from", "into", "display", "from_str"] }
+derive_more = { version = "1.0.0-beta.6", features = ["from", "into", "display", "from_str"] }
 once_cell = "1"
 rust_decimal = { version = "1.33.1", features = ["serde-str"] }
 uuid = { version = "1.3.0", features = ["serde"] }
+tokio = { version = "1.35.1", features = ["macros", "rt"] }
+
 
 [dev-dependencies]
 arrow = { version = "49.0.0", features = ["prettyprint"] }
 dotenv = "0.15.0"
 env_logger = "0.10.0"
-tokio = { version = "1.25.0", features = ["macros"] }
 oauth2 = "4.3.0"
 criterion = "0.5"
 clap = { version = "4.1.6", features = ["derive", "env"] }

azure-kusto-data/src/arrow.rs

@@ -94,7 +94,7 @@ pub fn convert_column(data: Vec<Value>, column: &Column) -> Result<(Field, Array
             .map(|data| (Field::new(column_name, DataType::Int64, true), data)),
         ColumnType::Real => convert_array_float(data)
             .map(|data| (Field::new(column_name, DataType::Float64, true), data)),
-        ColumnType::Datetime => convert_array_datetime(data).map(|data| {
+        ColumnType::DateTime => convert_array_datetime(data).map(|data| {
             (
                 Field::new(
                     column_name,

azure-kusto-data/src/client.rs

@@ -13,7 +13,6 @@ use crate::prelude::ClientRequestProperties;
 use azure_core::headers::Headers;
 use azure_core::prelude::{Accept, AcceptEncoding, ClientVersion, ContentType};
 use serde::de::DeserializeOwned;
-use serde_json::Value;
 use std::convert::TryFrom;
 use std::fmt::Debug;
 use std::sync::Arc;
@@ -250,10 +249,8 @@ impl KustoClient {
             .ok_or_else(|| Error::QueryError("No primary results found".into()))?
             .rows
             .into_iter()
-            .map(|row| match row {
-                Row::Values(v) => serde_json::from_value(Value::Array(v)).map_err(Error::from),
-                Row::Error(e) => Err(Error::QueryApiError(e)),
-            })
+            .map(Row::into_result)
+            .map(|r| r.and_then(|v| serde_json::from_value::<T>(serde_json::Value::Array(v)).map_err(Error::from)))
             .collect::<Result<Vec<T>>>()?;
 
         Ok(results)

azure-kusto-data/src/error.rs

@@ -54,26 +54,50 @@ pub enum Error {
     /// Errors raised from the api calls to kusto
     #[error("Query API error: {0}")]
     QueryApiError(OneApiError),
+
+    /// Multiple errors
+    #[error("Multiple errors: {0:?}")]
+    MultipleErrors(Vec<Error>),
+}
+
+impl From<Vec<Error>> for Error {
+    fn from(errors: Vec<Error>) -> Self {
+        if errors.len() == 1 {
+            Error::from(errors.into_iter().next().unwrap())
+        } else {
+            Error::MultipleErrors(errors)
+        }
+    }
 }
 
+/// Errors raised when parsing values.
 #[derive(thiserror::Error, Debug)]
 pub enum ParseError {
+    /// Raised when a value is null, but the type is not nullable.
     #[error("Error parsing null value for {0}")]
     ValueNull(String),
+    /// Raised when an int value is failed to be parsed.
     #[error("Error parsing int: {0}")]
     Int(#[from] std::num::ParseIntError),
+    /// Raised when a long value is failed to be parsed.
     #[error("Error parsing float: {0}")]
     Float(#[from] std::num::ParseFloatError),
+    /// Raised when a bool value is failed to be parsed.
     #[error("Error parsing bool: {0}")]
     Bool(#[from] std::str::ParseBoolError),
+    /// Raised when a timespan value is failed to be parsed.
     #[error("Error parsing timespan: {0}")]
     Timespan(String),
+    /// Raised when a datetime value is failed to be parsed.
     #[error("Error parsing datetime: {0}")]
     DateTime(#[from] time::error::Parse),
+    /// Raised when a guid value is failed to be parsed.
     #[error("Error parsing guid: {0}")]
     Guid(#[from] uuid::Error),
+    /// Raised when a decimal value is failed to be parsed.
     #[error("Error parsing decimal")]
     Decimal(#[from] rust_decimal::Error),
+    /// Raised when a dynamic value is failed to be parsed.
     #[error("Error parsing dynamic: {0}")]
     Dynamic(#[from] serde_json::Error),
 }
@@ -115,3 +139,4 @@ impl ConnectionStringError {
 
 /// Result type for kusto operations.
 pub type Result<T> = std::result::Result<T, Error>;
+pub type Partial<T> = std::result::Result<T, (Option<T>, Error)>;

azure-kusto-data/src/models/mod.rs

@@ -1,6 +1,9 @@
 pub mod v1;
 pub mod v2;
 
+#[cfg(test)]
+pub(crate) mod test_helpers;
+
 use serde::{Deserialize, Serialize};
 
 /// Represents the scalar data types of ADX. see [the docs for more information](https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/)
@@ -11,7 +14,7 @@ pub enum ColumnType {
     Bool,
     /// Datetime, represents a specific point in time.
     #[serde(rename = "datetime")]
-    Datetime,
+    DateTime,
     /// A complex type, that is either an array or a dictionary of other values.
     #[serde(rename = "dynamic")]
     Dynamic,