Merge branch 'main' into add-version-to-output

Author: dave-connors-3

integration_tests/models/marts/metrics.yml

@@ -36,7 +36,7 @@ metrics:
   # Specify the measure you are creating a proxy for. 
       measure: total_count 
     filter: |
-      {{ Dimension('dim__id') }} > 0
+      {{ Dimension('dim__id') }} > '2023-04-01'
   - name: new_metric_with_window
     label: "New cumulative Metric"
     type: cumulative 

macros/unpack/get_metric_values.sql

@@ -9,7 +9,7 @@
     {%- set values = [] -%}
 
     {%- for node in nodes_list -%}
-          
+   
           {%- set values_line = 
             [
             wrap_string_with_quotes(node.unique_id),
@@ -20,7 +20,7 @@
             wrap_string_with_quotes(node.type),
             wrap_string_with_quotes(dbt.escape_single_quotes(node.label)),
             wrap_string_with_quotes(node.package_name),
-            wrap_string_with_quotes(node.filter | tojson),
+            wrap_string_with_quotes(dbt.escape_single_quotes(tojson(node.filter))),
             wrap_string_with_quotes(node.type_params.measure.name),
             wrap_string_with_quotes(node.type_params.measure.alias),
             wrap_string_with_quotes(node.type_params.numerator | tojson),