From fe03f43cc5f57d86006addfa1770ab78230cd725 Mon Sep 17 00:00:00 2001 From: Doug Beatty Date: Sun, 16 Jul 2023 21:06:16 -0600 Subject: [PATCH] Null safety for `deduplicate` when `relation` is not a CTE --- macros/sql/deduplicate.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/macros/sql/deduplicate.sql b/macros/sql/deduplicate.sql index f376344a..d4e8cef0 100644 --- a/macros/sql/deduplicate.sql +++ b/macros/sql/deduplicate.sql @@ -104,7 +104,10 @@ path: {} {% set row_alias = kwargs.get('row_alias') %} {% set columns = kwargs.get('columns') %} - {% if row_alias != None or columns != None %} + {% if relation.is_cte is defined and not relation.is_cte %} + {% set columns = dbt_utils.get_filtered_columns_in_relation(relation) %} + {{ dbt_utils._safe_deduplicate(relation, partition_by, order_by, columns=columns) }} + {% elif row_alias != None or columns != None %} {{ dbt_utils._safe_deduplicate(relation, partition_by, order_by, row_alias=row_alias, columns=columns) }} {% else %} {{ dbt_utils._unsafe_deduplicate(relation, partition_by, order_by) }}