update tests for group by change

hasura · Jun 13, 2024 · 2cb8bde · 2cb8bde
1 parent 4614e7e
commit 2cb8bde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/crates/ndc-clickhouse/tests/query_builder.rs b/crates/ndc-clickhouse/tests/query_builder.rs
@@ -11,7 +11,7 @@ mod test_utils {
         connector::read_server_config,
         sql::{QueryBuilder, QueryBuilderError},
     };
-    use ndc_sdk::models::{self, QueryRequest};
+    use ndc_sdk::models;
     use std::{env, error::Error, path::PathBuf};
     use tokio::fs;
 
@@ -45,7 +45,7 @@ mod test_utils {
         schema_dir: &str,
         group_dir: &str,
         test_name: &str,
-    ) -> Result<QueryRequest, Box<dyn Error>> {
+    ) -> Result<models::QueryRequest, Box<dyn Error>> {
         let request_path =
             tests_dir_path(schema_dir, group_dir).join(format!("{test_name}.request.json"));
 
@@ -89,7 +89,7 @@ mod test_utils {
     }
     fn generate_sql(
         configuration: &ServerConfig,
-        request: &QueryRequest,
+        request: &models::QueryRequest,
     ) -> Result<String, QueryBuilderError> {
         let generated_statement = pretty_print_sql(
             &QueryBuilder::new(&request, &configuration)

diff --git a/...query_builder/chinook/02_relationships/06_traverse_relationship_in_order_by.statement.sql b/...query_builder/chinook/02_relationships/06_traverse_relationship_in_order_by.statement.sql
@@ -67,6 +67,9 @@ FROM
             WHERE
               TRUE
               AND TRUE
+            GROUP BY
+              "_order_by_0"."AlbumId",
+              "_order_by_1"."Name"
             LIMIT
               1 BY "_order_by_0"."AlbumId"
           ) AS "_order_by_0" ON "_origin"."AlbumId" = "_order_by_0"."_relkey_AlbumId"

diff --git a/...builder/chinook/02_relationships/07_order_by_aggregate_across_relationships.statement.sql b/...builder/chinook/02_relationships/07_order_by_aggregate_across_relationships.statement.sql
@@ -32,6 +32,9 @@ FROM
             WHERE
               TRUE
               AND TRUE
+            GROUP BY
+              "_order_by_0"."AlbumId",
+              "_order_by_1"."Name"
             LIMIT
               1 BY "_order_by_0"."AlbumId"
           ) AS "_order_by_0" ON "_origin"."AlbumId" = "_order_by_0"."_relkey_AlbumId"