From 9761de5af8730568b9eabde3c9f4d49b99cf7961 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Tue, 29 Oct 2024 15:42:30 -0700 Subject: [PATCH] Re-enable broken tests. --- .../model/semantics/metric_lookup.py | 2 +- .../model/semantics/test_metric_lookup.py | 2 -- .../test_cases/itest_dimensions.yaml | 23 +++++++++---------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/metricflow-semantics/metricflow_semantics/model/semantics/metric_lookup.py b/metricflow-semantics/metricflow_semantics/model/semantics/metric_lookup.py index d4f1aa75c1..f263545db4 100644 --- a/metricflow-semantics/metricflow_semantics/model/semantics/metric_lookup.py +++ b/metricflow-semantics/metricflow_semantics/model/semantics/metric_lookup.py @@ -278,7 +278,7 @@ def _get_min_queryable_time_granularity(self, metric_reference: MetricReference) ) agg_time_dimension_grains.add(measure_properties.agg_time_granularity) - return min(agg_time_dimension_grains, key=lambda time_granularity: time_granularity.to_int()) + return max(agg_time_dimension_grains, key=lambda time_granularity: time_granularity.to_int()) def get_joinable_scd_specs_for_metric(self, metric_reference: MetricReference) -> Sequence[LinkableInstanceSpec]: """Get the SCDs that can be joined to a metric.""" diff --git a/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py b/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py index f525bf42a4..8706073d20 100644 --- a/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py +++ b/metricflow-semantics/tests_metricflow_semantics/model/semantics/test_metric_lookup.py @@ -2,7 +2,6 @@ import logging -import pytest from dbt_semantic_interfaces.references import MetricReference from dbt_semantic_interfaces.type_enums import TimeGranularity from metricflow_semantics.model.semantic_manifest_lookup import SemanticManifestLookup @@ -10,7 +9,6 @@ logger = logging.getLogger(__name__) -@pytest.mark.skip("get_min_queryable_time_granularity has a bug with agg. time dimensions at different grains.") def test_min_queryable_time_granularity_for_different_agg_time_grains( # noqa: D103 extended_date_semantic_manifest_lookup: SemanticManifestLookup, ) -> None: diff --git a/tests_metricflow/integration/test_cases/itest_dimensions.yaml b/tests_metricflow/integration/test_cases/itest_dimensions.yaml index 5f42a9f9c0..48bddcafd3 100644 --- a/tests_metricflow/integration/test_cases/itest_dimensions.yaml +++ b/tests_metricflow/integration/test_cases/itest_dimensions.yaml @@ -157,18 +157,17 @@ integration_test: GROUP BY v.ds --- -# TODO: Test is currently broken. -#integration_test: -# name: query_non_default_time_dimension_without_granularity -# description: Query just a time dimension, no granularity specified. Should assume default granularity for dimension. -# model: EXTENDED_DATE_MODEL -# group_bys: [ "booking__monthly_ds"] -# check_query: | -# SELECT -# ds AS booking__monthly_ds__month -# FROM {{ source_schema }}.fct_bookings_extended_monthly -# GROUP BY -# ds +integration_test: + name: query_non_default_time_dimension_without_granularity + description: Query just a time dimension, no granularity specified. Should assume default granularity for dimension. + model: EXTENDED_DATE_MODEL + group_bys: [ "booking_monthly__ds"] + check_query: | + SELECT + ds AS booking_monthly__ds__month + FROM {{ source_schema }}.fct_bookings_extended_monthly + GROUP BY + ds --- integration_test: name: query_dimension_with_constraint_from_diff_source