Null safety for deduplicate when relation is not a CTE

dbt-labs · Jul 31, 2023 · fe03f43 · fe03f43
1 parent d46676e
commit fe03f43
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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) }}