column_name is now a required arg

dbt-msft · Sep 14, 2021 · e9fc44b · e9fc44b
1 parent 5a109af
commit e9fc44b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/macros/dbt_utils/schema_tests/at_least_one.sql b/macros/dbt_utils/schema_tests/at_least_one.sql
@@ -1,6 +1,4 @@
-{% macro sqlserver__test_at_least_one(model) %}
-
-{% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
+{% macro sqlserver__test_at_least_one(model, column_name) %}
 
 select count(*)
 from (
@@ -17,7 +15,6 @@ from (
 
 {% endmacro %}
 
-{% macro synapse__test_at_least_one(model) %}
- {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
- {% do return( tsql_utils.sqlserver__test_at_least_one(model, **kwargs)) %}
+{% macro synapse__test_at_least_one(model, column_name) %}
+ {% do return( tsql_utils.sqlserver__test_at_least_one(model,, column_name)) %}
 {% endmacro %}
diff --git a/macros/dbt_utils/schema_tests/relationships_where.sql b/macros/dbt_utils/schema_tests/relationships_where.sql
@@ -1,15 +1,12 @@
-{% macro sqlserver__test_relationships_where(model, to, field) %}
+{% macro sqlserver__test_relationships_where(model, column_name, to, field, from_condition, to_condition) %}
 
- {% set column_name = kwargs.get('column_name', kwargs.get('from')) %}
- {% set from_condition = kwargs.get('from_condition', "1=1") %}
- {% set to_condition = kwargs.get('to_condition', "1=1") %}
  {# override dbt-utils' integration tests args default see: #}
  {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L67-L75 #}
  {# TSQL has non-ANSI not-equal sign #}
  {% if from_condition == 'id <> 4' %}
  {% set where = 'id != 4' %}
  {% endif %}
 
- {{ return(dbt_utils.default__test_relationships_where(model, to, field, column_name=column_name, from_condition=from_condition, to_condition=to_condition)) }}
+ {{ return(dbt_utils.default__test_relationships_where(model, column_name, to, field, from_condition, to_condition)) }}
 
 {% endmacro %}
diff --git a/macros/dbt_utils/schema_tests/test_not_null_where.sql b/macros/dbt_utils/schema_tests/test_not_null_where.sql
@@ -1,6 +1,5 @@
-{% macro sqlserver__test_not_null_where(model) %}
+{% macro sqlserver__test_not_null_where(model, column_name) %}
 
- {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
  {% set where = kwargs.get('where', kwargs.get('arg')) %}
  {# override dbt-utils' integration tests args default see: #}
  {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #}
@@ -9,13 +8,12 @@
  {% set where = '_deleted = 0' %}
  {% endif %}
 
- {{ return(dbt_utils.default__test_not_null_where(model, column_name=column_name, where=where)) }}
+ {{ return(dbt_utils.default__test_not_null_where(model, column_name, where=where)) }}
 
 {% endmacro %}
 
-{% macro synapse__test_not_null_where(model) %}
+{% macro synapse__test_not_null_where(model, column_name) %}
 
- {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
  {% set where = kwargs.get('where', kwargs.get('arg')) %}
  {# override dbt-utils' integration tests args default see: #}
  {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #}
@@ -24,5 +22,5 @@
  {% set where = '_deleted = 0' %}
  {% endif %}
 
- {% do return( tsql_utils.sqlserver__test_not_null_where(model, **kwargs)) %}
+ {% do return( tsql_utils.sqlserver__test_not_null_where(model, column_name, **kwargs)) %}
 {% endmacro %}
diff --git a/macros/dbt_utils/schema_tests/test_unique_where.sql b/macros/dbt_utils/schema_tests/test_unique_where.sql
@@ -1,5 +1,4 @@
-{% macro sqlserver__test_unique_where(model) %}
- {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
+{% macro sqlserver__test_unique_where(model, column_name) %}
  {% set where = kwargs.get('where', kwargs.get('arg')) %}
  {# override dbt-utils' integration tests args default see: #}
  {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #}
@@ -14,7 +13,6 @@
 
 {% macro synapse__test_unique_where(model) %}
 
- {% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
  {% set where = kwargs.get('where', kwargs.get('arg')) %}
  {# override dbt-utils' integration tests args default see: #}
  {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #}
@@ -23,5 +21,5 @@
  {% set where = '_deleted = 0' %}
  {% endif %}
 
- {% do return( tsql_utils.sqlserver__test_unique_where(model, **kwargs)) %}
+ {% do return( tsql_utils.sqlserver__test_unique_where(model, column_name, **kwargs)) %}
 {% endmacro %}