From 4fcb9d1c18837fa0fd60781249a0a3c98b91d262 Mon Sep 17 00:00:00 2001 From: Benoit Ranque Date: Wed, 1 Jan 2025 16:11:09 -0400 Subject: [PATCH] aggregates have changed --- .../select_order_by_artist_album_count.json | 5 ++++- .../goldenfiles/select_order_by_artist_album_count.json | 5 ++++- .../select_order_by_artist_album_count_agg.json | 9 ++++++--- .../sorting_by_nested_relationship_count.json | 5 ++++- .../sorting_by_relationship_count_with_predicate.json | 5 ++++- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json b/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json index 29d876fa..61e29d8f 100644 --- a/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json +++ b/crates/tests/tests-common/goldenfiles/native_queries/select_order_by_artist_album_count.json @@ -45,7 +45,10 @@ { "order_direction": "desc", "target": { - "type": "star_count_aggregate", + "type": "aggregate", + "aggregate": { + "type": "star_count" + }, "path": [ { "relationship": "ArtistAlbums", diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json index 7f2e6931..c9cf0dfe 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count.json @@ -15,7 +15,10 @@ { "order_direction": "desc", "target": { - "type": "star_count_aggregate", + "type": "aggregate", + "aggregate": { + "type": "star_count" + }, "path": [ { "relationship": "ArtistAlbums", diff --git a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json index 4ff90c6b..c56a1c42 100644 --- a/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json +++ b/crates/tests/tests-common/goldenfiles/select_order_by_artist_album_count_agg.json @@ -13,9 +13,12 @@ "elements": [ { "target": { - "type": "single_column_aggregate", - "column": "AlbumId", - "function": "count", + "type": "aggregate", + "aggregate": { + "type": "single_column", + "column": "AlbumId", + "function": "count" + }, "path": [ { "relationship": "ArtistAlbum", diff --git a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_count.json b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_count.json index 2160ac87..53f1893b 100644 --- a/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_count.json +++ b/crates/tests/tests-common/goldenfiles/sorting_by_nested_relationship_count.json @@ -69,7 +69,10 @@ { "order_direction": "desc", "target": { - "type": "star_count_aggregate", + "type": "aggregate", + "aggregate": { + "type": "star_count" + }, "path": [ { "relationship": "ArtistAlbums", diff --git a/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json b/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json index 9189eab8..b487bf3d 100644 --- a/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json +++ b/crates/tests/tests-common/goldenfiles/sorting_by_relationship_count_with_predicate.json @@ -15,7 +15,10 @@ { "order_direction": "desc", "target": { - "type": "star_count_aggregate", + "type": "aggregate", + "aggregate": { + "type": "star_count" + }, "path": [ { "relationship": "ArtistAlbums",