diff --git a/crates/ndc-clickhouse/src/sql/ast.rs b/crates/ndc-clickhouse/src/sql/ast.rs index 327a342..9862272 100644 --- a/crates/ndc-clickhouse/src/sql/ast.rs +++ b/crates/ndc-clickhouse/src/sql/ast.rs @@ -685,11 +685,16 @@ impl fmt::Display for WindowSpec { pub struct FunctionArg { name: Option, value: FunctionArgExpr, + alias: Option, } impl FunctionArg { pub fn new(value: FunctionArgExpr) -> Self { - Self { value, name: None } + Self { + value, + name: None, + alias: None, + } } pub fn name(self, name: Ident) -> Self { Self { @@ -697,14 +702,24 @@ impl FunctionArg { ..self } } + pub fn with_alias(self, alias: Ident) -> Self { + Self { + alias: Some(alias), + ..self + } + } } impl fmt::Display for FunctionArg { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match &self.name { - Some(name) => write!(f, "{name}={}", self.value), - None => write!(f, "{}", self.value), + if let Some(name) = &self.name { + write!(f, "{name}=")?; } + write!(f, "{}", self.value)?; + if let Some(alias) = &self.alias { + write!(f, " AS {alias}")?; + } + Ok(()) } } diff --git a/crates/ndc-clickhouse/src/sql/query_builder.rs b/crates/ndc-clickhouse/src/sql/query_builder.rs index 9c32138..9391b2f 100644 --- a/crates/ndc-clickhouse/src/sql/query_builder.rs +++ b/crates/ndc-clickhouse/src/sql/query_builder.rs @@ -198,74 +198,81 @@ impl<'r, 'c> QueryBuilder<'r, 'c> { Ident::new_quoted(format!("_field_{alias}")), ]) .into_arg() + .with_alias(Ident::new_quoted(alias.as_str())) }) .collect(); Function::new_unquoted("tuple").args(args).into_expr() } .into_arg(); + Some( Function::new_unquoted("groupArray") .args(vec![row]) - .into_expr(), + .into_expr() + .into_arg() + .with_alias(Ident::new_quoted("rows")), ) } else { None }; let aggregates = if let Some(aggregates) = &query.aggregates { - Some(if aggregates.is_empty() { - Function::new_unquoted("map").into_expr() - } else { - let args = aggregates - .iter() - .map(|(alias, aggregate)| { - Ok(match aggregate { - models::Aggregate::StarCount {} => Function::new_unquoted("COUNT") - .args(vec![FunctionArgExpr::Wildcard.into_arg()]) - .into_expr(), - models::Aggregate::ColumnCount { - distinct, - column: _, - field_path: _, - } => { - let column = Expr::CompoundIdentifier(vec![ - Ident::new_quoted("_row"), - Ident::new_quoted(format!("_agg_{alias}")), - ]); - Function::new_unquoted("COUNT") - .args(vec![column.into_arg()]) - .distinct(*distinct) - .into_expr() - } - models::Aggregate::SingleColumn { - function, - column: _, - field_path: _, - } => { - let column = Expr::CompoundIdentifier(vec![ - Ident::new_quoted("_row"), - Ident::new_quoted(format!("_agg_{alias}")), - ]); - apply_function(&aggregate_function(function)?, column) + Some( + if aggregates.is_empty() { + Function::new_unquoted("map").into_expr() + } else { + let args = aggregates + .iter() + .map(|(alias, aggregate)| { + Ok(match aggregate { + models::Aggregate::StarCount {} => Function::new_unquoted("COUNT") + .args(vec![FunctionArgExpr::Wildcard.into_arg()]) + .into_expr(), + models::Aggregate::ColumnCount { + distinct, + column: _, + field_path: _, + } => { + let column = Expr::CompoundIdentifier(vec![ + Ident::new_quoted("_row"), + Ident::new_quoted(format!("_agg_{alias}")), + ]); + Function::new_unquoted("COUNT") + .args(vec![column.into_arg()]) + .distinct(*distinct) + .into_expr() + } + models::Aggregate::SingleColumn { + function, + column: _, + field_path: _, + } => { + let column = Expr::CompoundIdentifier(vec![ + Ident::new_quoted("_row"), + Ident::new_quoted(format!("_agg_{alias}")), + ]); + apply_function(&aggregate_function(function)?, column) + } } - } - .into_arg()) - }) - .collect::, QueryBuilderError>>()?; - Function::new_unquoted("tuple").args(args).into_expr() - }) + .into_arg() + .with_alias(Ident::new_quoted(alias.as_str()))) + }) + .collect::, QueryBuilderError>>()?; + Function::new_unquoted("tuple").args(args).into_expr() + } + .into_arg() + .with_alias(Ident::new_quoted("aggregates")), + ) } else { None }; let rowset = match (fields, aggregates) { (None, None) => Function::new_unquoted("map"), - (None, Some(aggregates)) => { - Function::new_unquoted("tuple").args(vec![aggregates.into_arg()]) - } - (Some(fields), None) => Function::new_unquoted("tuple").args(vec![fields.into_arg()]), + (None, Some(aggregates)) => Function::new_unquoted("tuple").args(vec![aggregates]), + (Some(fields), None) => Function::new_unquoted("tuple").args(vec![fields]), (Some(fields), Some(aggregates)) => { - Function::new_unquoted("tuple").args(vec![fields.into_arg(), aggregates.into_arg()]) + Function::new_unquoted("tuple").args(vec![fields, aggregates]) } } .into_expr() diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_01_select_rows.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_01_select_rows.request.json.snap index d903d46..4f2d5d7 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_01_select_rows.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_01_select_rows.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_02_with_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_02_with_predicate.request.json.snap index a9fd95e..359f92a 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_02_with_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_02_with_predicate.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_03_larger_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_03_larger_predicate.request.json.snap index 85df50c..021ffb5 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_03_larger_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_03_larger_predicate.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_04_limit.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_04_limit.request.json.snap index e3c34f0..1914ada 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_04_limit.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_04_limit.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_05_offset.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_05_offset.request.json.snap index 6cdaff9..5a15a2b 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_05_offset.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_05_offset.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_06_limit_offset.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_06_limit_offset.request.json.snap index bc54980..8dc9a83 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_06_limit_offset.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_06_limit_offset.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_07_order_by.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_07_order_by.request.json.snap index 54b222f..5482ba3 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_07_order_by.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_07_order_by.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap index 49a6dd3..b204a94 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_01_object_relationship.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_01_object_relationship.request.json.snap index 23e1389..caf8b5d 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_01_object_relationship.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_01_object_relationship.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Artist" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Artist" AS "Artist" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -38,8 +38,11 @@ FROM SELECT tuple( groupArray( - tuple("_row"."_field_artistId", "_row"."_field_name") - ) + tuple( + "_row"."_field_artistId" AS "artistId", + "_row"."_field_name" AS "name" + ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_ArtistId" AS "_relkey_ArtistId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_02_array_relationship.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_02_array_relationship.request.json.snap index 83250ef..759c2ee 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_02_array_relationship.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_02_array_relationship.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_03_parent_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_03_parent_predicate.request.json.snap index 782d0b4..4e537b6 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_03_parent_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_03_parent_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_04_child_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_04_child_predicate.request.json.snap index bbf1176..70506fd 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_04_child_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_04_child_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap index 6f86f28..41aecf0 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_06_traverse_relationship_in_order_by.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_06_traverse_relationship_in_order_by.request.json.snap index a996d22..5230136 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_06_traverse_relationship_in_order_by.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_06_traverse_relationship_in_order_by.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_Album" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_Album" AS "Album" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -34,7 +34,9 @@ FROM "Chinook"."Track" AS "_origin" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_Artist"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_Artist" AS "Artist")) AS "rows" + ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM ( @@ -45,7 +47,9 @@ FROM "Chinook"."Album" AS "_origin" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_name"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_name" AS "name")) AS "rows" + ) AS "_rowset", "_row"."_relkey_ArtistId" AS "_relkey_ArtistId" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_07_order_by_aggregate_across_relationships.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_07_order_by_aggregate_across_relationships.request.json.snap index 5f1b869..e020614 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_07_order_by_aggregate_across_relationships.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@02_relationships_07_order_by_aggregate_across_relationships.request.json.snap @@ -17,8 +17,11 @@ FROM SELECT tuple( groupArray( - tuple("_row"."_field_trackId", "_row"."_field_name") - ) + tuple( + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name" + ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_01_simple_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_01_simple_predicate.request.json.snap index bb73183..c6ac412 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_01_simple_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_01_simple_predicate.request.json.snap @@ -28,11 +28,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_02_empty_variable_sets.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_02_empty_variable_sets.request.json.snap index 841bbc0..3144afd 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_02_empty_variable_sets.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_02_empty_variable_sets.request.json.snap @@ -25,11 +25,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_03_single_set.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_03_single_set.request.json.snap index cdabce5..26e17b7 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_03_single_set.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Inlined SQL@03_variables_03_single_set.request.json.snap @@ -28,11 +28,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_02_with_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_02_with_predicate.request.json.snap index 2f915a6..84c1774 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_02_with_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_02_with_predicate.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_03_larger_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_03_larger_predicate.request.json.snap index c8a6f59..3f040e2 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_03_larger_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_03_larger_predicate.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap index 4dd7e94..5a66ff7 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@01_simple_queries_08_predicate_limit_offset_order_by.request.json.snap @@ -18,11 +18,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_03_parent_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_03_parent_predicate.request.json.snap index 0a4a490..785cfae 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_03_parent_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_03_parent_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_04_child_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_04_child_predicate.request.json.snap index d5f3aa0..cadf7e4 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_04_child_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_04_child_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap index 00fcc57..3d9710c 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@02_relationships_05_traverse_relationship_in_predicate.request.json.snap @@ -18,12 +18,12 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title", - "_row"."_field_Tracks" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title", + "_row"."_field_Tracks" AS "Tracks" ) - ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,11 +39,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_trackId", - "_row"."_field_name", - "_row"."_field_unitPrice" + "_row"."_field_trackId" AS "trackId", + "_row"."_field_name" AS "name", + "_row"."_field_unitPrice" AS "unitPrice" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_relkey_AlbumId" AS "_relkey_AlbumId" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_01_simple_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_01_simple_predicate.request.json.snap index 41b84c1..f41d97a 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_01_simple_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_01_simple_predicate.request.json.snap @@ -25,11 +25,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_02_empty_variable_sets.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_02_empty_variable_sets.request.json.snap index 66df19b..17ff701 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_02_empty_variable_sets.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_02_empty_variable_sets.request.json.snap @@ -25,11 +25,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_03_single_set.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_03_single_set.request.json.snap index efc349c..d260f8f 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_03_single_set.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__chinook Parameterized SQL@03_variables_03_single_set.request.json.snap @@ -25,11 +25,11 @@ FROM tuple( groupArray( tuple( - "_row"."_field_albumId", - "_row"."_field_artistId", - "_row"."_field_title" + "_row"."_field_albumId" AS "albumId", + "_row"."_field_artistId" AS "artistId", + "_row"."_field_title" AS "title" ) - ) + ) AS "rows" ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_bind_complex_parameters.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_bind_complex_parameters.request.json.snap index 9ce3704..b0dc48b 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_bind_complex_parameters.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_bind_complex_parameters.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_01_bind.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_01_bind.request.json.snap index b5ec6a4..e6c84eb 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_01_bind.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_01_bind.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_02_variables.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_02_variables.request.json.snap index f007b76..9ba4749 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_02_variables.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@01_complex_parameters_02_variables.request.json.snap @@ -25,7 +25,9 @@ FROM "_vars" AS "_vars" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_01_generate_column_accessor.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_01_generate_column_accessor.request.json.snap index 002ccb0..7efa794 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_01_generate_column_accessor.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_01_generate_column_accessor.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_02_skip_if_not_required.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_02_skip_if_not_required.request.json.snap index 5fd6eb0..9c72ed3 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_02_skip_if_not_required.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_02_skip_if_not_required.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_03_support_relationships_on_nested_field.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_03_support_relationships_on_nested_field.request.json.snap index 1c485d8..35cb7e6 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_03_support_relationships_on_nested_field.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_03_support_relationships_on_nested_field.request.json.snap @@ -17,8 +17,11 @@ FROM SELECT tuple( groupArray( - tuple("_row"."_field_field1", "_row"."_field_field2") - ) + tuple( + "_row"."_field_field1" AS "field1", + "_row"."_field_field2" AS "field2" + ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -35,7 +38,9 @@ FROM "Schema1"."Table1" AS "_origin" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_name"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_name" AS "name")) AS "rows" + ) AS "_rowset", "_row"."_relkey_Id" AS "_relkey_Id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_05_complex_example.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_05_complex_example.request.json.snap index e291d54..8c57ab7 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_05_complex_example.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_05_complex_example.request.json.snap @@ -17,8 +17,11 @@ FROM SELECT tuple( groupArray( - tuple("_row"."_field_field1", "_row"."_field_field2") - ) + tuple( + "_row"."_field_field1" AS "field1", + "_row"."_field_field2" AS "field2" + ) + ) AS "rows" ) AS "_rowset" FROM ( @@ -39,7 +42,9 @@ FROM "Schema1"."Table1" AS "_origin" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_name"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_name" AS "name")) AS "rows" + ) AS "_rowset", "_row"."_relkey_Id" AS "_relkey_Id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_06_no_useless_nested_accessors.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_06_no_useless_nested_accessors.request.json.snap index 084099c..662d9d9 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_06_no_useless_nested_accessors.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_column_accessor_06_no_useless_nested_accessors.request.json.snap @@ -17,8 +17,11 @@ FROM SELECT tuple( groupArray( - tuple("_row"."_field_field1", "_row"."_field_field2") - ) + tuple( + "_row"."_field_field1" AS "field1", + "_row"."_field_field2" AS "field2" + ) + ) AS "rows" ) AS "_rowset" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_variables_with_complex_parameters.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_variables_with_complex_parameters.request.json.snap index 0107a45..aeed428 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_variables_with_complex_parameters.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Inlined SQL@02_variables_with_complex_parameters.request.json.snap @@ -25,7 +25,9 @@ FROM "_vars" AS "_vars" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_bind_complex_parameters.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_bind_complex_parameters.request.json.snap index 29421ef..16dc042 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_bind_complex_parameters.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_bind_complex_parameters.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_01_bind.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_01_bind.request.json.snap index 6d8a858..5459610 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_01_bind.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_01_bind.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_02_variables.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_02_variables.request.json.snap index 36ffdd0..d99a8b0 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_02_variables.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@01_complex_parameters_02_variables.request.json.snap @@ -22,7 +22,9 @@ FROM "_vars" AS "_vars" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@02_variables_with_complex_parameters.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@02_variables_with_complex_parameters.request.json.snap index a96ad6a..e6b2cfd 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@02_variables_with_complex_parameters.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__complex_columns Parameterized SQL@02_variables_with_complex_parameters.request.json.snap @@ -22,7 +22,9 @@ FROM "_vars" AS "_vars" LEFT JOIN ( SELECT - tuple(groupArray(tuple("_row"."_field_field1"))) AS "_rowset", + tuple( + groupArray(tuple("_row"."_field_field1" AS "field1")) AS "rows" + ) AS "_rowset", "_row"."_varset_id" AS "_varset_id" FROM ( diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@01_native_query.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@01_native_query.request.json.snap index 4b9ba55..d75c23e 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@01_native_query.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@01_native_query.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_revenue"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_revenue" AS "revenue")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@02_native_query_with_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@02_native_query_with_predicate.request.json.snap index 30334ea..cb5b9de 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@02_native_query_with_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Inlined SQL@02_native_query_with_predicate.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_revenue"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_revenue" AS "revenue")) AS "rows" + ) AS "_rowset" FROM ( SELECT diff --git a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Parameterized SQL@02_native_query_with_predicate.request.json.snap b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Parameterized SQL@02_native_query_with_predicate.request.json.snap index 4d3cbc3..29843f5 100644 --- a/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Parameterized SQL@02_native_query_with_predicate.request.json.snap +++ b/crates/ndc-clickhouse/tests/snapshots/query_builder__star_schema Parameterized SQL@02_native_query_with_predicate.request.json.snap @@ -15,7 +15,9 @@ SELECT FROM ( SELECT - tuple(groupArray(tuple("_row"."_field_revenue"))) AS "_rowset" + tuple( + groupArray(tuple("_row"."_field_revenue" AS "revenue")) AS "rows" + ) AS "_rowset" FROM ( SELECT