Fix field macro for databricks

snowplow · Aug 18, 2023 · 10f3172 · 10f3172
1 parent b419baa
commit 10f3172
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/macros/snowplow_media_player_base_events_this_run/field.sql b/macros/snowplow_media_player_base_events_this_run/field.sql
@@ -17,7 +17,7 @@
     {% endif %}
 {% endmacro %}
 
-{% macro default__field(property, col_prefix, field) %}
+{% macro snowflake__field(property, col_prefix, field) %}
     {% if property is string -%}
     {{ property }}
     {% else %}
@@ -32,3 +32,19 @@
     }}
     {% endif %}
 {% endmacro %}
+
+{% macro default__field(property, col_prefix, field) %}
+    {% if property is string -%}
+    {{ property }}
+    {% else %}
+    {{
+        property.get('relation_alias', 'a')
+    }}.{{
+        property.get('col_prefix', col_prefix)
+    }}{% if 'contexts_' in property.get('col_prefix', col_prefix) %}[0]{% endif %}.{{
+        property.get('field', field)
+    }}::{{
+        property.get('dtype', 'string')
+    }}
+    {% endif %}
+{% endmacro %}
diff --git a/models/base/scratch/databricks/snowplow_media_player_base_events_this_run.sql b/models/base/scratch/databricks/snowplow_media_player_base_events_this_run.sql
@@ -20,7 +20,10 @@ with prep AS (
   select
 
     a.event_id,
-    a.contexts_com_snowplowanalytics_snowplow_web_page_1[0].id::string as page_view_id,
+    {{ web_or_mobile_col(
+      web_property={ 'field': 'id', 'col_prefix': 'contexts_com_snowplowanalytics_snowplow_web_page_1', 'dtype': 'string' },
+      mobile_property={ 'field': 'id', 'col_prefix': 'contexts_com_snowplowanalytics_mobile_screen_1', 'dtype': 'string' }
+    ) }} as page_view_id,
     b.session_id,
     b.domain_userid,
     a.user_id,

diff --git a/models/base/scratch/snowflake/snowplow_media_player_base_events_this_run.sql b/models/base/scratch/snowflake/snowplow_media_player_base_events_this_run.sql
@@ -22,8 +22,8 @@ with prep as (
 
     a.event_id,
     {{ web_or_mobile_col(
-      web_property='a.contexts_com_snowplowanalytics_snowplow_web_page_1[0]:id::varchar',
-      mobile_property='a.contexts_com_snowplowanalytics_mobile_screen_1[0]:id::varchar'
+      web_property={ 'field': 'id', 'col_prefix': 'contexts_com_snowplowanalytics_snowplow_web_page_1', 'dtype': 'varchar' },
+      mobile_property={ 'field': 'id', 'col_prefix': 'contexts_com_snowplowanalytics_mobile_screen_1', 'dtype': 'varchar' }
     ) }} as page_view_id,
     b.session_id,
     b.domain_userid,