Removing Cartesian Join

macros/get_metric_sql.sql

@@ -71,7 +71,7 @@ with source_query as (
     {%- endfor %}
 ),
 
- spine__time as (
+spine__time as (
      select 
         /* this could be the same as date_day if grain is day. That's OK! 
         They're used for different things: date_day for joining to the spine, period for aggregating.*/
@@ -84,32 +84,35 @@ with source_query as (
         {% endfor %}
         date_day
      from {{ calendar_tbl }}
- ),
 
-{%- for dim in dimensions -%}
-    {%- if metrics.is_dim_from_model(metric, dim) %}
-
-        spine__values__{{ dim }} as (
-
-            select distinct {{ dim }}
-            from source_query
+),
 
-        ),  
-    {% endif -%}
+{% if dimensions is defined and dimensions|length > 0 %}
+spine__values as (
+
+    {#- /*This and the following CTEs were changed on 5/20 in order to remove 
+    the cartesian join behaviour that resulted in impossible combinations of 
+    data. */ #}
+    select distinct 
+        {%- for dim in dimensions -%}
+            {%- if metrics.is_dim_from_model(metric, dim) %}
+                {{ dim }}
+                {% if not loop.last %},{% endif %}
+            {% endif -%}
+        {%- endfor %}
+    from source_query
 
+),  
+{% endif -%}
 
-{%- endfor %}
 
 spine as (
 
     select *
     from spine__time
-    {%- for dim in dimensions -%}
-
-        {%- if metrics.is_dim_from_model(metric, dim) %}
-            cross join spine__values__{{ dim }}
-        {%- endif %}
-    {%- endfor %}
+    {% if dimensions is defined and dimensions|length > 0 %}
+    cross join spine__values
+    {% endif -%}
 
 ),