Change some things back

snowplow · Aug 29, 2023 · c0b3e96 · c0b3e96
1 parent d5050bf
commit c0b3e96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/integration_tests/models/base/actual/snowplow_base_events_this_run_actual.sql b/integration_tests/models/base/actual/snowplow_base_events_this_run_actual.sql
@@ -27,15 +27,7 @@ You may obtain a copy of the Snowplow Community License Version 1.0 at https://d
 
 {% set snowplow_custom_sql = 'cast(null as ' ~ dbt.type_string() ~ ') as custom_contents' %}
 {% if var('snowplow__custom_test', false) %}
-    {% if target.type in ['snowflake'] %}
-        {% set snowplow_custom_sql = var("snowplow__snowflake_custom_sql") %}
-    {% elif target.type in ['redshift', 'postgres'] %}
-        {% set snowplow_custom_sql = none %}
-    {% elif target.type in ['bigquery'] %}
-        {% set snowplow_custom_sql = var("snowplow__bigquery_custom_sql") %}
-    {% elif target.type in ['databricks'] %}
-        {% set snowplow_custom_sql = var("snowplow__databricks_custom_sql") %}
-    {% endif %}
+    {% set snowplow_custom_sql = get_value_by_target_type(bigquery_val=var("snowplow__bigquery_custom_sql"), snowflake_val=var("snowplow__snowflake_custom_sql"), databricks_val=var("snowplow__databricks_custom_sql"))%}
 {% endif %}
 
 {% set base_events_query = snowplow_utils.base_create_snowplow_events_this_run(

diff --git a/integration_tests/models/base/source/default/snowplow_events_stg.sql b/integration_tests/models/base/source/default/snowplow_events_stg.sql
@@ -132,6 +132,7 @@ select app_id,
        refr_domain_userid,
        refr_dvce_tstamp,
        domain_sessionid,
+       derived_tstamp,
        contexts_com_snowplowanalytics_snowplow_web_page_1_0_0,
        unstruct_event_com_snowplowanalytics_snowplow_consent_preferenc,
        unstruct_event_com_snowplowanalytics_snowplow_cmp_visible_1_0_0,