Use dundered column names for min/max cols

dbt-labs · Dec 7, 2023 · 4cfbbcc · 4cfbbcc
1 parent 2d80dea
commit 4cfbbcc
Show file tree

Hide file tree

Showing 38 changed files with 80 additions and 80 deletions.
diff --git a/metricflow/specs/specs.py b/metricflow/specs/specs.py
@@ -21,7 +21,7 @@
 
 from dbt_semantic_interfaces.dataclass_serialization import SerializableDataclass
 from dbt_semantic_interfaces.implementations.metric import PydanticMetricTimeWindow
-from dbt_semantic_interfaces.naming.keywords import METRIC_TIME_ELEMENT_NAME
+from dbt_semantic_interfaces.naming.keywords import DUNDER, METRIC_TIME_ELEMENT_NAME
 from dbt_semantic_interfaces.protocols import MetricTimeWindow
 from dbt_semantic_interfaces.references import (
     DimensionReference,
@@ -130,7 +130,7 @@ class MetadataSpec(InstanceSpec):
 
     @property
     def qualified_name(self) -> str:  # noqa: D
-        return f"{self.agg_type.value}_{self.element_name}" if self.agg_type else self.element_name
+        return f"{self.element_name}{DUNDER}{self.agg_type.value}" if self.agg_type else self.element_name
 
     @staticmethod
     def from_name(name: str, agg_type: Optional[AggregationType] = None) -> MetadataSpec:  # noqa: D

diff --git a/metricflow/test/integration/test_cases/itest_dimensions.yaml b/metricflow/test/integration/test_cases/itest_dimensions.yaml
@@ -210,8 +210,8 @@ integration_test:
   min_max_only: true
   check_query: |
     SELECT
-      MIN(user__home_state) AS min_user__home_state
-      , MAX(user__home_state) AS max_user__home_state
+      MIN(user__home_state) AS user__home_state__min
+      , MAX(user__home_state) AS user__home_state__max
     FROM (
       SELECT
         u.home_state AS user__home_state
@@ -228,8 +228,8 @@ integration_test:
   min_max_only: true
   check_query: |
     SELECT
-      MIN(verification__ds__day) AS min_verification__ds__day
-      , MAX(verification__ds__day) AS max_verification__ds__day
+      MIN(verification__ds__day) AS verification__ds__day__min
+      , MAX(verification__ds__day) AS verification__ds__day__max
     FROM (
       SELECT
         v.ds as verification__ds__day
@@ -246,8 +246,8 @@ integration_test:
   min_max_only: true
   check_query: |
     SELECT
-      MIN(verification__ds__month) AS min_verification__ds__month
-      , MAX(verification__ds__month) AS max_verification__ds__month
+      MIN(verification__ds__month) AS verification__ds__month__min
+      , MAX(verification__ds__month) AS verification__ds__month__max
     FROM (
       SELECT
         {{ render_date_trunc("v.ds", TimeGranularity.MONTH) }} as verification__ds__month

diff --git a/...ts/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql b/...ts/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...ery_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql b/...ery_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql b/...snapshots/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql b/...test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...s/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql b/...s/test_query_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(subq_1.booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__quarter']

diff --git a/...ry_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql b/...ry_rendering.py/SqlQueryPlan/BigQuery/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/.../test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql b/.../test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...y_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql b/...y_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...apshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql b/...apshots/test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...st_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql b/...st_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql b/...test_query_rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(subq_1.booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__quarter']

diff --git a/..._rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql b/..._rendering.py/SqlQueryPlan/Databricks/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...hots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql b/...hots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql b/...query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...t/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql b/...t/snapshots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...s/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql b/...s/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...ots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql b/...ots/test_query_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(subq_1.booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__quarter']

diff --git a/...uery_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql b/...uery_rendering.py/SqlQueryPlan/DuckDB/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...ts/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql b/...ts/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...ery_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql b/...ery_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql b/...snapshots/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql b/...test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...s/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql b/...s/test_query_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(subq_1.booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__quarter']

diff --git a/...ry_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql b/...ry_rendering.py/SqlQueryPlan/Postgres/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...ts/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql b/...ts/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...ery_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql b/...ery_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql b/...snapshots/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql b/...test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...s/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql b/...s/test_query_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(subq_1.booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(subq_1.booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__quarter']

diff --git a/...ry_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql b/...ry_rendering.py/SqlQueryPlan/Redshift/test_min_max_only_time_quarter__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__quarter) AS min_booking__paid_at__quarter
-  , MAX(booking__paid_at__quarter) AS max_booking__paid_at__quarter
+  MIN(booking__paid_at__quarter) AS booking__paid_at__quarter__min
+  , MAX(booking__paid_at__quarter) AS booking__paid_at__quarter__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements:

diff --git a/...s/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql b/...s/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.listing__country_latest) AS min_listing__country_latest
-  , MAX(subq_1.listing__country_latest) AS max_listing__country_latest
+  MIN(subq_1.listing__country_latest) AS listing__country_latest__min
+  , MAX(subq_1.listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Pass Only Elements:
   --   ['listing__country_latest']

diff --git a/...ry_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql b/...ry_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_categorical__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(listing__country_latest) AS min_listing__country_latest
-  , MAX(listing__country_latest) AS max_listing__country_latest
+  MIN(listing__country_latest) AS listing__country_latest__min
+  , MAX(listing__country_latest) AS listing__country_latest__max
 FROM (
   -- Read Elements From Semantic Model 'listings_latest'
   -- Pass Only Elements:

diff --git a/...napshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql b/...napshots/test_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(subq_1.booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(subq_1.booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(subq_1.booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(subq_1.booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Pass Only Elements:
   --   ['booking__paid_at__day']

diff --git a/...est_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql b/...est_query_rendering.py/SqlQueryPlan/Snowflake/test_min_max_only_time__plan0_optimized.sql
@@ -1,7 +1,7 @@
 -- Calculate min and max
 SELECT
-  MIN(booking__paid_at__day) AS min_booking__paid_at__day
-  , MAX(booking__paid_at__day) AS max_booking__paid_at__day
+  MIN(booking__paid_at__day) AS booking__paid_at__day__min
+  , MAX(booking__paid_at__day) AS booking__paid_at__day__max
 FROM (
   -- Read Elements From Semantic Model 'bookings_source'
   -- Pass Only Elements: