Skip to content

Commit 246ba86

Browse files
authored
Merge branch 'main' into mday/nifty-darwin-df5zc5
2 parents df32cee + f0ed98e commit 246ba86

3 files changed

Lines changed: 39 additions & 1 deletion

File tree

‎sqlmesh/core/metric/definition.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ def is_measure(node: exp.Expr) -> bool:
199199
return is_measure(parent)
200200
if isinstance(parent, (exp.Binary, exp.Paren, exp.Distinct)):
201201
return is_measure(parent)
202+
# AGG(x ORDER BY y) is parsed as AGG(Order(this=x, expressions=[Ordered(y)])).
203+
# Only the Order's `this` can be the measure, not the ORDER BY expressions.
204+
if isinstance(parent, exp.Order) and node.arg_key == "this":
205+
return is_measure(parent)
202206
return False
203207

204208
for node in expression.walk():

‎tests/core/metric/test_metric.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,11 @@ def test_get_measure_and_dim_tables():
154154
"a",
155155
("b",),
156156
)
157+
assert _get_measure_and_dim_tables(d.parse_one("ARRAY_AGG(a.x ORDER BY a.x)")) == ("a", ())
158+
assert _get_measure_and_dim_tables(d.parse_one("ARRAY_AGG(a.x ORDER BY b.y)")) == ("a", ("b",))
159+
assert _get_measure_and_dim_tables(
160+
d.parse_one("ARRAY_AGG(IF(c.z = 'dim', a.x, NULL) ORDER BY b.y)")
161+
) == ("a", ("b", "c"))
162+
# A column that only appears in the ORDER BY clause cannot be the measure.
163+
with pytest.raises(ConfigError, match="Could not infer a measures table"):
164+
_get_measure_and_dim_tables(d.parse_one("ARRAY_AGG(1 ORDER BY b.y)"))

‎tests/core/metric/test_rewriter.py‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from sqlglot import parse_one
22

3-
from sqlmesh.core.metric import rewrite
3+
from sqlmesh.core import dialect as d
4+
from sqlmesh.core.metric import expand_metrics, load_metric_ddl, rewrite
45
from sqlmesh.core.reference import ReferenceGraph
6+
from sqlmesh.utils import UniqueKeyDict
57

68

79
def test_rewrite(sushi_context_pre_scheduling, assert_exp_eq):
@@ -222,3 +224,27 @@ def test_rewrite(sushi_context_pre_scheduling, assert_exp_eq):
222224
# dialect=context.config.dialect,
223225
# ),
224226
# )
227+
228+
229+
def test_rewrite_order_by_metric(sushi_context_pre_scheduling):
230+
context = sushi_context_pre_scheduling
231+
graph = ReferenceGraph(context.models.values())
232+
meta = load_metric_ddl(
233+
d.parse_one(
234+
"METRIC (name sorted_amounts, expression ARRAY_AGG(sushi.orders.amount ORDER BY sushi.orders.amount))",
235+
dialect=context.config.dialect,
236+
),
237+
dialect=context.config.dialect,
238+
)
239+
metrics = expand_metrics(UniqueKeyDict("metas", {meta.name: meta}))
240+
241+
query = rewrite(
242+
"SELECT c.customer_id, METRIC(sorted_amounts) FROM sushi.customers AS c GROUP BY c.customer_id",
243+
graph=graph,
244+
metrics=metrics,
245+
)
246+
sql = query.sql()
247+
# Stop before the generated NULLS LAST so the assertion doesn't depend on null ordering.
248+
assert "ARRAY_AGG(sushi__orders.amount ORDER BY sushi__orders.amount" in sql
249+
assert "sushi.orders AS sushi__orders" in sql
250+
parse_one(sql, dialect=context.config.dialect)

0 commit comments

Comments
 (0)