@@ -109,9 +109,7 @@ def _prepare_expressions_for_pipeline(self, expression, target, annotation_group
109
109
replacements [sub_expr ] = self ._get_replace_expr (sub_expr , group , alias )
110
110
return replacements , group
111
111
112
- def _prepare_search_expressions_for_pipeline (
113
- self , expression , target , search_idx , replacements
114
- ):
112
+ def _prepare_search_expressions_for_pipeline (self , expression , search_idx , replacements ):
115
113
searches = {}
116
114
for sub_expr in self ._get_search_expressions (expression ):
117
115
if sub_expr not in replacements :
@@ -121,18 +119,14 @@ def _prepare_search_expressions_for_pipeline(
121
119
def _prepare_search_query_for_aggregation_pipeline (self , order_by ):
122
120
replacements = {}
123
121
annotation_group_idx = itertools .count (start = 1 )
124
- for target , expr in self .query .annotation_select .items ():
125
- self ._prepare_search_expressions_for_pipeline (
126
- expr , target , annotation_group_idx , replacements
127
- )
122
+ for expr in self .query .annotation_select .values ():
123
+ self ._prepare_search_expressions_for_pipeline (expr , annotation_group_idx , replacements )
128
124
129
125
for expr , _ in order_by :
130
- self ._prepare_search_expressions_for_pipeline (
131
- expr , None , annotation_group_idx , replacements
132
- )
126
+ self ._prepare_search_expressions_for_pipeline (expr , annotation_group_idx , replacements )
133
127
134
128
self ._prepare_search_expressions_for_pipeline (
135
- self .having , None , annotation_group_idx , replacements
129
+ self .having , annotation_group_idx , replacements
136
130
)
137
131
return replacements
138
132
0 commit comments