Skip to content

COALESCE selected expressions to capture all values #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

COALESCE selected expressions to capture all values #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44c139e
For metrics SQL generation, we should COALESCE dimensions after doing…
shangyian Oct 22, 2024
bc6a5bc
Fix test
shangyian Oct 22, 2024
a3ebc9a
Fix alias handling for order by clause with coalesce
shangyian Oct 22, 2024
63d2b1f
Fix lint
shangyian Oct 22, 2024
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
18 changes: 13 additions & 5 deletions datajunction-server/datajunction_server/construction/build_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,19 @@ async def build(self) -> ast.Query:
ctes=parent_ctes + metric_ctes,
select=ast.Select(
projection=[
ast.Column(
name=ast.Name(proj.alias, namespace=initial_cte.alias), # type: ignore
_type=proj.type, # type: ignore
semantic_entity=proj.semantic_entity, # type: ignore
semantic_type=proj.semantic_type, # type: ignore
ast.Function(
ast.Name("COALESCE"),
args=[
ast.Column(
name=ast.Name(proj.alias, namespace=join_cte.alias), # type: ignore
_type=proj.type, # type: ignore
semantic_entity=proj.semantic_entity, # type: ignore
semantic_type=proj.semantic_type, # type: ignore
)
for join_cte in metric_ctes
],
).set_alias(
proj.alias, # type: ignore
)
for proj in initial_cte.select.projection
],
Expand Down
4 changes: 2 additions & 2 deletions datajunction-server/datajunction_server/sql/parsing/ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ class Alias(Aliasable, Generic[AliasedType]):
child: AliasedType = field(default_factory=Node)

def __str__(self) -> str:
as_ = " AS " if self.as_ else " "
return f"{self.child}{as_}{self.alias}"
as_ = " AS " if self.as_ and self.alias else " "
return f"{self.child}{as_}{self.alias if self.alias else ''}"

def is_aggregation(self) -> bool:
return isinstance(self.child, Expression) and self.child.is_aggregation()
Expand Down
62 changes: 49 additions & 13 deletions datajunction-server/tests/api/cubes_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ async def test_create_cube_similar_dimensions(


@pytest.mark.asyncio
async def test_create_cube(
async def test_create_cube1(
client_with_repairs_cube: AsyncClient,
):
"""
Expand Down Expand Up @@ -762,18 +762,54 @@ async def test_create_cube(
default_DOT_hard_hat_to_delete.hire_date
)
SELECT
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_country,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_postal_code,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_city,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_state,
default_DOT_repair_orders_fact_metrics.default_DOT_dispatcher_DOT_company_name,
default_DOT_repair_orders_fact_metrics.default_DOT_municipality_dim_DOT_local_region,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_to_delete_DOT_hire_date,
default_DOT_repair_orders_fact_metrics.default_DOT_discounted_orders_rate,
default_DOT_repair_orders_fact_metrics.default_DOT_num_repair_orders,
default_DOT_repair_orders_fact_metrics.default_DOT_avg_repair_price,
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_cost,
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_order_discounts,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_country,
default_DOT_repair_order_details_metrics.default_DOT_hard_hat_DOT_country
) default_DOT_hard_hat_DOT_country,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_postal_code,
default_DOT_repair_order_details_metrics.default_DOT_hard_hat_DOT_postal_code
) default_DOT_hard_hat_DOT_postal_code,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_city,
default_DOT_repair_order_details_metrics.default_DOT_hard_hat_DOT_city
) default_DOT_hard_hat_DOT_city,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_state,
default_DOT_repair_order_details_metrics.default_DOT_hard_hat_DOT_state
) default_DOT_hard_hat_DOT_state,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_dispatcher_DOT_company_name,
default_DOT_repair_order_details_metrics.default_DOT_dispatcher_DOT_company_name
) default_DOT_dispatcher_DOT_company_name,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_municipality_dim_DOT_local_region,
default_DOT_repair_order_details_metrics.default_DOT_municipality_dim_DOT_local_region
) default_DOT_municipality_dim_DOT_local_region,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_to_delete_DOT_hire_date,
default_DOT_repair_order_details_metrics.default_DOT_hard_hat_to_delete_DOT_hire_date
) default_DOT_hard_hat_to_delete_DOT_hire_date,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_discounted_orders_rate,
default_DOT_repair_order_details_metrics.default_DOT_discounted_orders_rate
) default_DOT_discounted_orders_rate,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_num_repair_orders,
default_DOT_repair_order_details_metrics.default_DOT_num_repair_orders
) default_DOT_num_repair_orders,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_avg_repair_price,
default_DOT_repair_order_details_metrics.default_DOT_avg_repair_price
) default_DOT_avg_repair_price,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_cost,
default_DOT_repair_order_details_metrics.default_DOT_total_repair_cost
) default_DOT_total_repair_cost,
COALESCE(
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_order_discounts,
default_DOT_repair_order_details_metrics.default_DOT_total_repair_order_discounts
) default_DOT_total_repair_order_discounts,
default_DOT_repair_order_details_metrics.default_DOT_double_total_repair_cost
FROM default_DOT_repair_orders_fact_metrics
FULL JOIN default_DOT_repair_order_details_metrics
Expand Down
24 changes: 19 additions & 5 deletions datajunction-server/tests/api/sql_v2_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,13 +765,27 @@ async def test_metrics_sql_different_parents(
FROM default_DOT_repair_orders_fact INNER JOIN default_DOT_hard_hat ON default_DOT_repair_orders_fact.hard_hat_id = default_DOT_hard_hat.hard_hat_id
GROUP BY default_DOT_hard_hat.first_name, default_DOT_hard_hat.last_name
)
SELECT default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name,
SELECT
COALESCE(
default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_last_name
) default_DOT_hard_hat_DOT_last_name,
COALESCE(
default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_first_name,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_first_name
) default_DOT_hard_hat_DOT_first_name,
COALESCE(
default_DOT_hard_hat_metrics.default_DOT_avg_length_of_employment,
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_cost
FROM default_DOT_hard_hat_metrics FULL JOIN default_DOT_repair_orders_fact_metrics ON default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_first_name = default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_first_name AND default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name = default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_last_name
ORDER BY default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name
LIMIT 5"""
default_DOT_repair_orders_fact_metrics.default_DOT_avg_length_of_employment
) default_DOT_avg_length_of_employment,
default_DOT_repair_orders_fact_metrics.default_DOT_total_repair_cost
FROM default_DOT_hard_hat_metrics FULL JOIN default_DOT_repair_orders_fact_metrics ON default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_first_name = default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_first_name AND default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name = default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_last_name
ORDER BY
COALESCE(
default_DOT_hard_hat_metrics.default_DOT_hard_hat_DOT_last_name,
default_DOT_repair_orders_fact_metrics.default_DOT_hard_hat_DOT_last_name
)
LIMIT 5"""
assert str(parse(str(data["sql"]))) == str(parse(expected_sql))

response = await module__client_with_roads.get(
Expand Down
Loading