Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/pt_snap_cli/query/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def __init__(self):
self._limit: int | None = None
self._offset: int | None = None
self._group_by: list[str] = []
self._having: list[Condition] = []

def from_table(self, table: str) -> QueryBuilder:
"""Set the table to query from.
Expand Down Expand Up @@ -84,6 +85,21 @@ def group_by(self, *columns: str) -> QueryBuilder:
self._group_by.extend(columns)
return self

def having(self, condition: Condition) -> QueryBuilder:
"""Add a HAVING condition.

HAVING filters groups after aggregation. Should be used
after a GROUP BY clause.

Args:
condition: Condition to add.

Returns:
Self for chaining.
"""
self._having.append(condition)
return self

def limit(self, n: int) -> QueryBuilder:
"""Set LIMIT clause.

Expand Down Expand Up @@ -135,6 +151,14 @@ def build(self) -> tuple[str, list[Any]]:
if self._group_by:
sql += " GROUP BY " + ", ".join(self._group_by)

if self._having:
having_parts = []
for cond in self._having:
cond_sql, cond_params = cond.to_sql()
having_parts.append(cond_sql)
params.extend(cond_params)
sql += " HAVING " + " AND ".join(f"({part})" for part in having_parts)

if self._order_by:
sql += " ORDER BY " + ", ".join(self._order_by)

Expand All @@ -159,4 +183,5 @@ def reset(self) -> QueryBuilder:
self._limit = None
self._offset = None
self._group_by = []
self._having = []
return self
52 changes: 52 additions & 0 deletions tests/query/test_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,55 @@ def test_combined_conditions(self):
assert "WHERE" in sql
assert "AND" in sql
assert "OR" in sql

def test_having_clause(self):
builder = QueryBuilder()
sql, params = (
builder.from_table("trace_entry_0")
.group_by("eventType")
.having(GreaterThan("COUNT(*)", 10))
.build()
)
assert "GROUP BY eventType" in sql
assert "HAVING" in sql
assert "(COUNT(*) > ?)" in sql
assert params == [10]

def test_multiple_having_clauses(self):
builder = QueryBuilder()
sql, params = (
builder.from_table("trace_entry_0")
.group_by("eventType")
.having(GreaterThan("COUNT(*)", 10))
.having(GreaterThan("SUM(size)", 1024))
.build()
)
assert "HAVING (COUNT(*) > ?) AND (SUM(size) > ?)" in sql
assert params == [10, 1024]

def test_full_query_with_having(self):
builder = QueryBuilder()
sql, params = (
builder.from_table("trace_entry_0")
.columns("eventType", "COUNT(*) as cnt")
.where(Equal("action", "malloc"))
.group_by("eventType")
.having(GreaterThan("COUNT(*)", 5))
.order_by("cnt", descending=True)
.limit(10)
.build()
)
assert sql.startswith("SELECT eventType, COUNT(*) as cnt FROM trace_entry_0")
assert "WHERE" in sql
assert "GROUP BY eventType" in sql
assert "HAVING" in sql
assert "ORDER BY cnt DESC" in sql
assert "LIMIT 10" in sql
assert params == ["malloc", 5]

def test_reset_clears_having(self):
builder = QueryBuilder()
builder.from_table("t").group_by("c").having(GreaterThan("x", 1))
builder.reset()
sql, params = builder.from_table("t").build()
assert "HAVING" not in sql
Loading