Skip to content

Commit

Permalink
Change order of descriptions in SQL output
Browse files Browse the repository at this point in the history
  • Loading branch information
courtneyholcomb committed Sep 24, 2024
1 parent 84b90f5 commit fb1588c
Show file tree
Hide file tree
Showing 27 changed files with 38 additions and 38 deletions.
18 changes: 9 additions & 9 deletions metricflow/plan_conversion/dataflow_to_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -1087,9 +1087,9 @@ def visit_metric_time_dimension_transform_node(self, node: MetricTimeDimensionTr
spec=metric_time_dimension_spec,
)
)
output_column_to_input_column[
metric_time_dimension_column_association.column_name
] = matching_time_dimension_instance.associated_column.column_name
output_column_to_input_column[metric_time_dimension_column_association.column_name] = (
matching_time_dimension_instance.associated_column.column_name
)

output_instance_set = InstanceSet(
measure_instances=tuple(output_measure_instances),
Expand Down Expand Up @@ -1324,11 +1324,11 @@ def visit_join_to_time_spine_node(self, node: JoinToTimeSpineNode) -> SqlDataSet
and len(time_spine_dataset.checked_sql_select_node.select_columns) == 1
), "Time spine dataset not configured properly. Expected exactly one column."
original_time_spine_dim_instance = time_spine_dataset.instance_set.time_dimension_instances[0]
time_spine_column_select_expr: Union[
SqlColumnReferenceExpression, SqlDateTruncExpression
] = SqlColumnReferenceExpression.create(
SqlColumnReference(
table_alias=time_spine_alias, column_name=original_time_spine_dim_instance.spec.qualified_name
time_spine_column_select_expr: Union[SqlColumnReferenceExpression, SqlDateTruncExpression] = (
SqlColumnReferenceExpression.create(
SqlColumnReference(
table_alias=time_spine_alias, column_name=original_time_spine_dim_instance.spec.qualified_name
)
)
)

Expand Down Expand Up @@ -1491,7 +1491,7 @@ def visit_join_to_custom_granularity_node(self, node: JoinToCustomGranularityNod
return SqlDataSet(
instance_set=InstanceSet.merge([time_spine_instance_set, parent_data_set.instance_set]),
sql_select_node=SqlSelectStatementNode.create(
description=node.description + "\n" + parent_data_set.checked_sql_select_node.description,
description=parent_data_set.checked_sql_select_node.description + "\n" + node.description,
select_columns=parent_data_set.checked_sql_select_node.select_columns + time_spine_select_columns,
from_source=parent_data_set.checked_sql_select_node.from_source,
from_source_alias=parent_alias,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ FROM (
, subq_6.metric_time__day
, SUM(subq_6.txn_revenue) AS txn_revenue
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_4.metric_time__day AS metric_time__day
, subq_4.txn_revenue AS txn_revenue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ FROM (
metric_time__martian_day
, AVG(txn_revenue) OVER (PARTITION BY metric_time__martian_day) AS trailing_2_months_revenue
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['txn_revenue', 'metric_time__day', 'metric_time__day']
-- Join to Custom Granularity Dataset
-- Aggregate Measures
SELECT
subq_15.martian_day AS metric_time__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ FROM (
subq_3.booking__ds__martian_day
, subq_3.booking_value
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['booking_value', 'booking__ds__day']
-- Join to Custom Granularity Dataset
SELECT
subq_1.booking__ds__day AS booking__ds__day
, subq_1.booking_value AS booking_value
Expand Down Expand Up @@ -251,8 +251,8 @@ FROM (
subq_10.booking__ds__martian_day
, subq_10.bookers
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookers', 'booking__ds__day']
-- Join to Custom Granularity Dataset
SELECT
subq_8.booking__ds__day AS booking__ds__day
, subq_8.bookers AS bookers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ SELECT
booking__ds__martian_day
, booking_value * 0.05 / bookers AS booking_fees_per_booker
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__day']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['booking_value', 'bookers', 'booking__ds__martian_day']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ FROM (
, subq_3.listing__ds__month
, subq_3.listings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__day', 'listing__ds__month']
-- Join to Custom Granularity Dataset
SELECT
subq_1.listing__ds__month AS listing__ds__month
, subq_1.metric_time__day AS metric_time__day
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__day', 'listing__ds__month']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__martian_day', 'listing__ds__month']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ FROM (
subq_3.metric_time__martian_day
, subq_3.bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_1.metric_time__day AS metric_time__day
, subq_1.bookings AS bookings
Expand Down Expand Up @@ -246,8 +246,8 @@ FULL OUTER JOIN (
subq_10.metric_time__martian_day
, subq_10.listings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_8.metric_time__day AS metric_time__day
, subq_8.listings AS listings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ SELECT
, MAX(subq_20.bookings) AS bookings
, MAX(subq_27.listings) AS listings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__martian_day']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand All @@ -28,8 +28,8 @@ FROM (
subq_16.martian_day
) subq_20
FULL OUTER JOIN (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__day']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['listings', 'metric_time__martian_day']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SELECT
, subq_6.user__bio_added_ts__month
, subq_6.metric_time__day
FROM (
-- Join Standard Outputs
-- Join to Custom Granularity Dataset
-- Join to Custom Granularity Dataset
-- Join Standard Outputs
SELECT
subq_0.ds__day AS ds__day
, subq_0.ds__week AS ds__week
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
-- Join Standard Outputs
-- Join to Custom Granularity Dataset
-- Join to Custom Granularity Dataset
-- Join Standard Outputs
-- Pass Only Elements: ['metric_time__day', 'metric_time__martian_day', 'user__bio_added_ts__martian_day', 'user__bio_added_ts__month']
SELECT
subq_12.martian_day AS user__bio_added_ts__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
SELECT
subq_2.metric_time__martian_day
FROM (
-- Join to Custom Granularity Dataset
-- Metric Time Dimension 'ds'
-- Join to Custom Granularity Dataset
SELECT
subq_0.ds__day AS ds__day
, subq_0.ds__week AS ds__week
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Join to Custom Granularity Dataset
-- Metric Time Dimension 'ds'
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['metric_time__martian_day',]
SELECT
subq_4.martian_day AS metric_time__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
SELECT
subq_1.booking__ds__martian_day
FROM (
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'bookings_source'
-- Join to Custom Granularity Dataset
SELECT
1 AS bookings
, CASE WHEN is_instant THEN 1 ELSE 0 END AS instant_bookings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'bookings_source'
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['booking__ds__martian_day',]
SELECT
subq_2.martian_day AS booking__ds__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ FROM (
, subq_1.largest_listing
, subq_1.smallest_listing
FROM (
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'listings_latest'
-- Join to Custom Granularity Dataset
SELECT
1 AS listings
, listings_latest_src_28000.capacity AS largest_listing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
SELECT
listing__ds__day
FROM (
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'listings_latest'
-- Join to Custom Granularity Dataset
SELECT
DATE_TRUNC('day', listings_latest_src_28000.created_at) AS listing__ds__day
, subq_3.martian_day AS listing__ds__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ FROM (
, subq_1.largest_listing
, subq_1.smallest_listing
FROM (
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'listings_latest'
-- Join to Custom Granularity Dataset
SELECT
1 AS listings
, listings_latest_src_28000.capacity AS largest_listing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
SELECT
listing__ds__martian_day
FROM (
-- Join to Custom Granularity Dataset
-- Read Elements From Semantic Model 'listings_latest'
-- Join to Custom Granularity Dataset
SELECT
subq_3.martian_day AS listing__ds__martian_day
FROM ***************************.dim_listings_latest listings_latest_src_28000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ FROM (
subq_3.booking__ds__martian_day
, subq_3.bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'booking__ds__day']
-- Join to Custom Granularity Dataset
SELECT
subq_1.booking__ds__day AS booking__ds__day
, subq_1.bookings AS bookings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'booking__ds__day']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'booking__ds__martian_day']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ FROM (
subq_8.listing__ds__martian_day
, subq_8.bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'listing__ds__day']
-- Join to Custom Granularity Dataset
SELECT
subq_6.listing__ds__day AS listing__ds__day
, subq_6.bookings AS bookings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'listing__ds__day']
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'listing__ds__martian_day']
-- Aggregate Measures
-- Compute Metrics via Expressions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ FROM (
, subq_3.metric_time__day
, subq_3.bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_1.metric_time__day AS metric_time__day
, subq_1.bookings AS bookings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
SELECT
SUM(bookings) AS bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_8.bookings AS bookings
, subq_9.martian_day AS metric_time__martian_day
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ FROM (
, subq_3.metric_time__day
, subq_3.bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_1.metric_time__day AS metric_time__day
, subq_1.bookings AS bookings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ SELECT
metric_time__martian_day
, SUM(bookings) AS bookings
FROM (
-- Join to Custom Granularity Dataset
-- Pass Only Elements: ['bookings', 'metric_time__day']
-- Join to Custom Granularity Dataset
SELECT
subq_8.bookings AS bookings
, subq_9.martian_day AS metric_time__martian_day
Expand Down

0 comments on commit fb1588c

Please sign in to comment.