Merge pull request dbt-labs#77 from fishtown-analytics/macros-v2

Add support for schema.yml version 2

macros/schema_tests/at_least_one.sql

@@ -1,14 +1,16 @@
-{% macro test_at_least_one(model, arg) %}
+{% macro test_at_least_one(model) %}
+
+{% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 
 select count(*)
 from (
     select
 
-      count({{ arg }})
+      count({{ column_name }})
 
     from {{ model }}
 
-    having count({{ arg }}) = 0
+    having count({{ column_name }}) = 0
 
 ) validation_errors
 

macros/schema_tests/cardinality_equality.sql

@@ -1,8 +1,10 @@
-{% macro test_cardinality_equality(model, from, to, field) %}
+{% macro test_cardinality_equality(model, to, field) %}
+
+{% set column_name = kwargs.get('column_name', kwargs.get('from')) %}
 
 with table_a as (
 select
-  {{ from }},
+  {{ column_name }},
   count(*) as num_rows
 from {{ model }}
 group by 1

macros/schema_tests/equality.sql

@@ -1,4 +1,6 @@
-{% macro test_equality(model, arg) %}
+{% macro test_equality(model) %}
+
+{% set compare_model = kwargs.get('compare_model', kwargs.get('arg')) %}
 
 
 {#-- Prevent querying of db in parsing mode. This works because this macro does not create any new refs. #}
@@ -26,7 +28,7 @@ with a as (
 
 b as (
 
-    select * from {{ arg }}
+    select * from {{ compare_model }}
 
 ),
 

macros/schema_tests/not_constant.sql

@@ -1,16 +1,18 @@
 
-{% macro test_not_constant(model, arg) %}
+{% macro test_not_constant(model) %}
+
+{% set column_name = kwargs.get('column_name', kwargs.get('arg')) %}
 
 select count(*)
 
 from (
 
     select
-          count(distinct {{ arg }})
+          count(distinct {{ column_name }})
 
     from {{ model }}
 
-    having count(distinct {{ arg }}) = 1
+    having count(distinct {{ column_name }}) = 1
 
     ) validation_errors
 

macros/schema_tests/recency.sql

@@ -1,11 +1,13 @@
-{% macro test_recency(model, field, datepart, interval) %}
+{% macro test_recency(model, datepart, interval) %}
+
+{% set column_name = kwargs.get('column_name', kwargs.get('field')) %}
 
 select
     case when count(*) > 0 then 0
     else 1
     end as error_result
 from {{model}}
-where {{field}} >=
+where {{column_name}} >=
     {{dbt_utils.dateadd(datepart, interval * -1, dbt_utils.current_timestamp())}}
 
 {% endmacro %}