Merge pull request #23 from hasura:fix-foreach

Fix-foreach

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.11]
+
+- Bugfix: add missing group by clause for `foreach` queries. This should fix remote relationships.
+
 ## [0.2.10]
 
 - Correct CLI implementation of Init command (used to behave the same as update)

Cargo.toml

@@ -6,5 +6,5 @@ members = [
 ]
 resolver = "2"
 
-package.version = "0.2.10"
+package.version = "0.2.11"
 package.edition = "2021"

crates/ndc-clickhouse/Cargo.toml

@@ -18,6 +18,6 @@ schemars = "0.8.16"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
 sqlformat = "0.2.3"
-strum = { version = "0.26.2", features = ["derive"] }
+strum = { version = "0.26.3", features = ["derive"] }
 tokio = "1.36.0"
 tracing = "0.1.40"

crates/ndc-clickhouse/src/sql/query_builder.rs

@@ -178,10 +178,20 @@ impl<'r, 'c> QueryBuilder<'r, 'c> {
             vec![]
         };
 
+        let group_by = if self.request.variables.is_some() {
+            vec![Expr::CompoundIdentifier(vec![
+                Ident::new_quoted("_vars"),
+                Ident::new_quoted("_varset_id"),
+            ])]
+        } else {
+            vec![]
+        };
+
         Ok(Query::new()
             .with(with)
             .select(select)
             .from(from)
+            .group_by(group_by)
             .order_by(order_by)
             .into_statement()
             .format("TabSeparatedRaw"))

crates/ndc-clickhouse/tests/query_builder/chinook/03_variables/01_simple_predicate.statement.sql

@@ -46,5 +46,7 @@ FROM
     GROUP BY
       "_row"."_varset_id"
   ) AS "_rowset" ON "_vars"."_varset_id" = "_rowset"."_varset_id"
+GROUP BY
+  "_vars"."_varset_id"
 ORDER BY
   "_vars"."_varset_id" ASC FORMAT TabSeparatedRaw;

crates/ndc-clickhouse/tests/query_builder/chinook/03_variables/02_empty_variable_sets.statement.sql

@@ -43,5 +43,7 @@ FROM
     GROUP BY
       "_row"."_varset_id"
   ) AS "_rowset" ON "_vars"."_varset_id" = "_rowset"."_varset_id"
+GROUP BY
+  "_vars"."_varset_id"
 ORDER BY
   "_vars"."_varset_id" ASC FORMAT TabSeparatedRaw;