hasura · BenoitRanque · Jul 31, 2024 · Jul 31, 2024 · Jul 31, 2024 · Jul 31, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/common/src/clickhouse_parser.rs b/crates/common/src/clickhouse_parser.rs
@@ -226,15 +226,15 @@ fn can_parse_parameterized_query() {
             }),
         ],
     };
-    let parsed = clickhouse_parser::parameterized_query(&query);
+    let parsed = clickhouse_parser::parameterized_query(query);
     assert_eq!(parsed, Ok(expected), "can parse parameterized query");
 }
 
 #[test]
 fn can_parse_empty_parameterized_query() {
     let query = r#""#;
     let expected = ParameterizedQuery { elements: vec![] };
-    let parsed = clickhouse_parser::parameterized_query(&query);
+    let parsed = clickhouse_parser::parameterized_query(query);
     assert_eq!(parsed, Ok(expected), "can parse parameterized query");
 }
 
@@ -259,6 +259,6 @@ fn does_not_parse_parameters_insides_quoted_strings() {
             ParameterizedQueryElement::String(" AND Name = '{ArtistName: String}'".to_string()),
         ],
     };
-    let parsed = clickhouse_parser::parameterized_query(&query);
+    let parsed = clickhouse_parser::parameterized_query(query);
     assert_eq!(parsed, Ok(expected), "can parse parameterized query");
 }
diff --git a/crates/ndc-clickhouse-cli/src/main.rs b/crates/ndc-clickhouse-cli/src/main.rs
@@ -157,7 +157,7 @@ async fn read_config_file(file_path: &PathBuf) -> Result<Option<ServerConfigFile
 
 async fn update_tables_config(
     configuration_dir: impl AsRef<Path> + Send,
-    introspection: &Vec<TableInfo>,
+    introspection: &[TableInfo],
 ) -> Result<ServerConfigFile, Box<dyn Error>> {
     let file_path = configuration_dir.as_ref().join(CONFIG_FILE_NAME);
     let schema_file_path = configuration_dir.as_ref().join(CONFIG_SCHEMA_FILE_NAME);
@@ -206,7 +206,7 @@ async fn update_tables_config(
                     table,
                     &old_table_config,
                     &old_config,
-                    &introspection,
+                    introspection,
                 ),
             };
 
@@ -216,7 +216,7 @@ async fn update_tables_config(
 
     let config = ServerConfigFile {
         schema: CONFIG_SCHEMA_FILE_NAME.to_owned(),
-        tables: tables,
+        tables,
         queries: old_config
             .as_ref()
             .map(|old_config| old_config.queries.to_owned())
@@ -295,7 +295,7 @@ async fn validate_table_config(
             ReturnType::Definition { columns } => {
                 for (column_alias, column_data_type) in columns {
                     let _data_type =
-                        ClickHouseDataType::from_str(&column_data_type).map_err(|err| {
+                        ClickHouseDataType::from_str(column_data_type).map_err(|err| {
                             format!(
                                 "Unable to parse data type \"{}\" for column {} in table {}: {}",
                                 column_data_type, column_alias, table_alias, err
@@ -368,7 +368,7 @@ async fn validate_table_config(
             ReturnType::Definition { columns } => {
                 for (column_name, column_data_type) in columns {
                     let _data_type =
-                        ClickHouseDataType::from_str(&column_data_type).map_err(|err| {
+                        ClickHouseDataType::from_str(column_data_type).map_err(|err| {
                             format!(
                                 "Unable to parse data type \"{}\" for field {} in query {}: {}",
                                 column_data_type, column_name, query_alias, err
@@ -435,7 +435,7 @@ fn get_table_return_type(
     table: &TableInfo,
     old_table: &Option<(&String, &TableConfigFile)>,
     old_config: &Option<ServerConfigFile>,
-    introspection: &Vec<TableInfo>,
+    introspection: &[TableInfo],
 ) -> ReturnType {
     let new_columns = get_return_type_columns(table);
 
@@ -495,7 +495,7 @@ fn get_table_return_type(
             },
         );
 
-    old_return_type.unwrap_or_else(|| ReturnType::Definition {
+    old_return_type.unwrap_or(ReturnType::Definition {
         columns: new_columns,
     })
 }

diff --git a/crates/ndc-clickhouse/Cargo.toml b/crates/ndc-clickhouse/Cargo.toml
@@ -8,7 +8,7 @@ async-trait = "0.1.78"
 bytes = "1.6.0"
 common = { path = "../common" }
 indexmap = "2.1.0"
-ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs", rev = "972dba6", package = "ndc-sdk" }
+ndc-sdk = { git = "https://github.com/hasura/ndc-sdk-rs", tag = "v0.1.4", package = "ndc-sdk" }
 prometheus = "0.13.3"
 reqwest = { version = "0.12.3", features = [
   "json",

diff --git a/crates/ndc-clickhouse/src/connector.rs b/crates/ndc-clickhouse/src/connector.rs
@@ -1,12 +1,7 @@
 pub mod handler;
 pub mod state;
 
-use std::{
-    collections::BTreeMap,
-    env,
-    path::{Path, PathBuf},
-    str::FromStr,
-};
+use std::{collections::BTreeMap, env, path::Path, str::FromStr};
 use tokio::fs;
 
 use async_trait::async_trait;
@@ -164,14 +159,14 @@ pub async fn read_server_config(
                 &file_path,
                 &["tables", &table_alias, "return_type"],
             )?
-            .and_then(|columns| {
-                Some((
+            .map(|columns| {
+                (
                     table_alias.to_owned(),
                     TableType {
                         comment: table_config.comment.to_owned(),
                         columns,
                     },
-                ))
+                )
             });
 
             Ok(table_type)
@@ -183,14 +178,14 @@ pub async fn read_server_config(
                 &file_path,
                 &["query", &query_alias, "return_type"],
             )?
-            .and_then(|columns| {
-                Some((
+            .map(|columns| {
+                (
                     query_alias.to_owned(),
                     TableType {
                         comment: query_config.comment.to_owned(),
                         columns,
                     },
-                ))
+                )
             });
 
             Ok(table_type)
@@ -223,7 +218,7 @@ pub async fn read_server_config(
                         .iter()
                         .map(|(name, r#type)| {
                             let data_type =
-                                ClickHouseDataType::from_str(&r#type).map_err(|_err| {
+                                ClickHouseDataType::from_str(r#type).map_err(|_err| {
                                     ParseError::ValidateError(InvalidNodes(vec![InvalidNode {
                                         file_path: file_path.to_owned(),
                                         node_path: vec![
@@ -318,7 +313,7 @@ fn get_connection_config() -> Result<ConnectionConfig, ParseError> {
 fn validate_and_parse_return_type(
     return_type: &ReturnType,
     config: &ServerConfigFile,
-    file_path: &PathBuf,
+    file_path: &Path,
     node_path: &[&str],
 ) -> Result<Option<BTreeMap<String, ClickHouseDataType>>, ParseError> {
     let get_node_path = |extra_segments: &[&str]| {
@@ -338,7 +333,7 @@ fn validate_and_parse_return_type(
                 Some(_) => {
                     Err(ParseError::ValidateError(InvalidNodes(vec![
                         InvalidNode {
-                            file_path: file_path.clone(),
+                            file_path: file_path.to_path_buf(),
                             node_path: get_node_path(&["table_name"]),
                             message: format!(
                             "Invalid reference: referenced table {} which does not have a return type definition",
@@ -348,16 +343,16 @@ fn validate_and_parse_return_type(
                     ])))
                 }
                 None => {
-                    return Err(ParseError::ValidateError(InvalidNodes(vec![
+                    Err(ParseError::ValidateError(InvalidNodes(vec![
                         InvalidNode {
-                            file_path: file_path.clone(),
+                            file_path: file_path.to_path_buf(),
                             node_path: get_node_path(&["table_name"]),
                             message: format!(
                             "Orphan reference: cannot find referenced table {}",
                             table_name,
                         ),
                         },
-                    ])));
+                    ])))
                 }
             }
         }
@@ -370,7 +365,7 @@ fn validate_and_parse_return_type(
                 Some(_) => {
                     Err(ParseError::ValidateError(InvalidNodes(vec![
                         InvalidNode {
-                            file_path: file_path.clone(),
+                            file_path: file_path.to_path_buf(),
                             node_path: get_node_path(&["query_name"]),
                             message: format!(
                                 "Invalid reference: referenced query {} which does not have a return type definition",
@@ -382,7 +377,7 @@ fn validate_and_parse_return_type(
                 None => {
                     Err(ParseError::ValidateError(InvalidNodes(vec![
                         InvalidNode {
-                            file_path: file_path.clone(),
+                            file_path: file_path.to_path_buf(),
                             node_path: get_node_path(&["query_name"]),
                             message: format!(
                                 "Orphan reference: cannot find referenced query {}",
@@ -398,9 +393,9 @@ fn validate_and_parse_return_type(
             columns
             .iter()
             .map(|(field_alias, field_type)| {
-                let data_type = ClickHouseDataType::from_str(&field_type).map_err(|err| {
+                let data_type = ClickHouseDataType::from_str(field_type).map_err(|err| {
                     ParseError::ValidateError(InvalidNodes(vec![InvalidNode {
-                        file_path: file_path.clone(),
+                        file_path: file_path.to_path_buf(),
                         node_path: get_node_path(&["columns", field_alias]),
                         message: format!(
                             "Unable to parse data type \"{}\": {}",

diff --git a/crates/ndc-clickhouse/src/connector/handler/capabilities.rs b/crates/ndc-clickhouse/src/connector/handler/capabilities.rs
@@ -1,13 +1,18 @@
-use ndc_sdk::models::{self, LeafCapability, RelationshipCapabilities};
+use ndc_sdk::models::{self, LeafCapability, NestedFieldCapabilities, RelationshipCapabilities};
 
 pub fn capabilities() -> models::CapabilitiesResponse {
     models::CapabilitiesResponse {
-        version: "^0.1.1".to_string(),
+        version: "0.1.4".to_owned(),
         capabilities: models::Capabilities {
             query: models::QueryCapabilities {
                 aggregates: Some(LeafCapability {}),
                 variables: Some(LeafCapability {}),
                 explain: Some(LeafCapability {}),
+                nested_fields: NestedFieldCapabilities {
+                    filter_by: None,
+                    order_by: None,
+                    aggregates: None,
+                },
             },
             mutation: models::MutationCapabilities {
                 transactional: None,

diff --git a/crates/ndc-clickhouse/src/connector/handler/query.rs b/crates/ndc-clickhouse/src/connector/handler/query.rs
@@ -60,7 +60,7 @@ pub async fn query(
     )
     .instrument(execution_span)
     .await
-    .map_err(|err| QueryError::UnprocessableContent(err.to_string().into()))?;
+    .map_err(|err| QueryError::UnprocessableContent(err.to_string()))?;
 
     #[cfg(debug_assertions)]
     {