Added equals macro that handles null value comparison

.changes/unreleased/Under the Hood-20241217-110536.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Added new equals macro that handles null value checks in sql
+time: 2024-12-17T11:05:36.363421+02:00
+custom:
+    Author: adrianburusdbt
+    Issue: "159"

dbt-tests-adapter/dbt/tests/adapter/utils/base_utils.py

@@ -1,16 +1,6 @@
 import pytest
 from dbt.tests.util import run_dbt
 
-
-macros__equals_sql = """
-{% macro equals(expr1, expr2) -%}
-case when (({{ expr1 }} = {{ expr2 }}) or ({{ expr1 }} is null and {{ expr2 }} is null))
-    then 0
-    else 1
-end = 0
-{% endmacro %}
-"""
-
 macros__test_assert_equal_sql = """
 {% test assert_equal(model, actual, expected) %}
 select * from {{ model }}
@@ -33,7 +23,6 @@ class BaseUtils:
     @pytest.fixture(scope="class")
     def macros(self):
         return {
-            "equals.sql": macros__equals_sql,
             "test_assert_equal.sql": macros__test_assert_equal_sql,
             "replace_empty.sql": macros__replace_empty_sql,
         }

dbt-tests-adapter/dbt/tests/adapter/utils/test_equals.py

@@ -1,16 +1,10 @@
 import pytest
 
-from dbt.tests.adapter.utils import base_utils, fixture_equals
+from dbt.tests.adapter.utils import fixture_equals
 from dbt.tests.util import relation_from_name, run_dbt
 
 
 class BaseEquals:
-    @pytest.fixture(scope="class")
-    def macros(self):
-        return {
-            "equals.sql": base_utils.macros__equals_sql,
-        }
-
     @pytest.fixture(scope="class")
     def seeds(self):
         return {

dbt/include/global_project/macros/materializations/models/incremental/merge.sql

@@ -22,7 +22,7 @@
             {% endfor %}
         {% else %}
             {% set unique_key_match %}
-                DBT_INTERNAL_SOURCE.{{ unique_key }} = DBT_INTERNAL_DEST.{{ unique_key }}
+                {{ adapter.dispatch('equals', 'dbt')(DBT_INTERNAL_SOURCE.{{ unique_key }}, DBT_INTERNAL_DEST.{{ unique_key }}) }}
             {% endset %}
             {% do predicates.append(unique_key_match) %}
         {% endif %}
@@ -62,11 +62,11 @@
 
     {% if unique_key %}
         {% if unique_key is sequence and unique_key is not string %}
-            delete from {{target }}
+            delete from {{ target }}
             using {{ source }}
             where (
                 {% for key in unique_key %}
-                    {{ source }}.{{ key }} = {{ target }}.{{ key }}
+                    {{ adapter.dispatch('equals', 'dbt')({{ source }}.{{ key }}, {{ target }}.{{ key }}) }}
                     {{ "and " if not loop.last}}
                 {% endfor %}
                 {% if incremental_predicates %}

dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -53,8 +53,7 @@
         from {{ target_relation }}
         where
             {% if config.get('dbt_valid_to_current') %}
-               {# Check for either dbt_valid_to_current OR null, in order to correctly update records with nulls #}
-               ( {{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or {{ columns.dbt_valid_to }} is null)
+               {{ adapter.dispatch('equals', 'dbt')({{ columns.dbt_valid_to }}, {{ config.get('dbt_valid_to_current') }}) }}
             {% else %}
                 {{ columns.dbt_valid_to }} is null
             {% endif %}
@@ -276,7 +275,7 @@
 {% macro unique_key_join_on(unique_key, identifier, from_identifier) %}
     {% if unique_key | is_list %}
         {% for key in unique_key %}
-            {{ identifier }}.dbt_unique_key_{{ loop.index }} = {{ from_identifier }}.dbt_unique_key_{{ loop.index }}
+            {{ adapter.dispatch('equals', 'dbt')({{ identifier }}.dbt_unique_key_{{ loop.index }}, {{ from_identifier }}.dbt_unique_key_{{ loop.index }}) }}
             {%- if not loop.last %} and {%- endif %}
         {% endfor %}
     {% else %}

dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql

@@ -15,8 +15,8 @@
 
     when matched
      {% if config.get("dbt_valid_to_current") %}
-       and (DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} = {{ config.get('dbt_valid_to_current') }} or
-            DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null)
+       and {{ adapter.dispatch('equals', 'dbt')(DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }}, {{ config.get('dbt_valid_to_current') }}) }}
+
      {% else %}
        and DBT_INTERNAL_DEST.{{ columns.dbt_valid_to }} is null
      {% endif %}

dbt/include/global_project/macros/utils/equals.sql

@@ -0,0 +1,12 @@
+{% macro equals(first_date, second_date, datepart) %}
+    {{ return(adapter.dispatch('equals', 'dbt') (expr1, expr2)) }}
+{%- endmacro %}
+
+{% macro default__equals(expr1, expr2) -%}
+
+    case when (({{ expr1 }} = {{ expr2 }}) or ({{ expr1 }} is null and {{ expr2 }} is null))
+        then 0
+        else 1
+    end = 0
+
+{% endmacro %}