Merge pull request #35 from dbt-labs/feat/upgrade-dbt20-utils7

Upgrade dbt v0.20, dbt-utils v0.7
dbt-labs · Jul 7, 2021 · f0f0e4a · f0f0e4a
2 parents c6b917c + 16a62ac
commit f0f0e4a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -25,7 +25,7 @@ jobs:
             . venv/bin/activate
 
             pip install --upgrade pip setuptools
-            pip install dbt
+            pip install --pre dbt
 
             mkdir -p ~/.dbt
             cp integration_tests/ci/sample.profiles.yml ~/.dbt/profiles.yml

diff --git a/README.md b/README.md
@@ -10,13 +10,13 @@ Useful macros when performing data audits
 
 # Installation instructions
 New to dbt packages? Read more about them [here](https://docs.getdbt.com/docs/building-a-dbt-project/package-management/).
-1. Include this package in your `packages.yml` file — check [here](https://hub.getdbt.com/fishtown-analytics/audit_helper/latest/) for the latest version number.
+1. Include this package in your `packages.yml` file — check [here](https://hub.getdbt.com/dbt-labs/audit_helper/latest/) for the latest version number.
 2. Run `dbt deps` to install the package.
 
 # Macros
 ## compare_relations ([source](macros/compare_relations.sql))
 This macro generates SQL that can be used to do a row-by-row validation of two
-relations. It is largely based on the [equality](https://github.com/fishtown-analytics/dbt-utils#equality-source)
+relations. It is largely based on the [equality](https://github.com/dbt-labs/dbt-utils#equality-source)
 test in dbt-utils. By default, the generated query returns a summary of audit
 results, like so:
 

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -1,8 +1,8 @@
 name: 'audit_helper'
-version: '1.0'
+version: '0.4.0'
 config-version: 2
 
-require-dbt-version: ">=0.18.0"
+require-dbt-version: ">=0.20.0"
 
 target-path: "target"
 clean-targets: ["target", "dbt_modules"]

diff --git a/macros/_get_audit_helper_namespaces.sql b/macros/_get_audit_helper_namespaces.sql
diff --git a/macros/compare_column_values.sql b/macros/compare_column_values.sql
@@ -1,5 +1,5 @@
 {% macro compare_column_values(a_query, b_query, primary_key, column_to_compare) -%}
-  {{ return(adapter.dispatch('compare_column_values', packages = audit_helper._get_audit_helper_namespaces())(a_query, b_query, primary_key, column_to_compare)) }}
+  {{ return(adapter.dispatch('compare_column_values', 'audit_helper')(a_query, b_query, primary_key, column_to_compare)) }}
 {%- endmacro %}
 
 {% macro default__compare_column_values(a_query, b_query, primary_key, column_to_compare) -%}

diff --git a/macros/compare_queries.sql b/macros/compare_queries.sql
@@ -1,5 +1,5 @@
 {% macro compare_queries(a_query, b_query, primary_key=None) -%}
-  {{ return(adapter.dispatch('compare_queries', packages = audit_helper._get_audit_helper_namespaces())(a_query, b_query, primary_key)) }}
+  {{ return(adapter.dispatch('compare_queries', 'audit_helper')(a_query, b_query, primary_key)) }}
 {%- endmacro %}
 
 {% macro default__compare_queries(a_query, b_query, primary_key=None) %}

diff --git a/macros/compare_relation_columns.sql b/macros/compare_relation_columns.sql
@@ -1,5 +1,5 @@
 {% macro compare_relation_columns(a_relation, b_relation) %}
-  {{ return(adapter.dispatch('compare_relation_columns', packages=audit_helper._get_audit_helper_namespaces())(a_relation, b_relation)) }}
+  {{ return(adapter.dispatch('compare_relation_columns', 'audit_helper')(a_relation, b_relation)) }}
 {% endmacro %}
 
 {% macro default__compare_relation_columns(a_relation, b_relation) %}
@@ -29,13 +29,13 @@ order by coalesce(a_cols.ordinal_position, b_cols.ordinal_position)
 
 {% macro get_columns_in_relation_sql(relation) %}
 
-{{ adapter.dispatch('get_columns_in_relation_sql', packages=audit_helper._get_audit_helper_namespaces())(relation) }}
+{{ adapter.dispatch('get_columns_in_relation_sql', 'audit_helper')(relation) }}
 
 {% endmacro %}
 
 {% macro redshift__get_columns_in_relation_sql(relation) %}
 {#-
-See https://github.com/fishtown-analytics/dbt/blob/23484b18b71010f701b5312f920f04529ceaa6b2/plugins/redshift/dbt/include/redshift/macros/adapters.sql#L71
+See https://github.com/dbt-labs/dbt/blob/23484b18b71010f701b5312f920f04529ceaa6b2/plugins/redshift/dbt/include/redshift/macros/adapters.sql#L71
 Edited to include ordinal_position
 -#}
 with bound_views as (
@@ -108,7 +108,7 @@ order by ordinal_position
 
 {% macro snowflake__get_columns_in_relation_sql(relation) %}
 {#-
-From: https://github.com/fishtown-analytics/dbt/blob/dev/louisa-may-alcott/plugins/snowflake/dbt/include/snowflake/macros/adapters.sql#L48
+From: https://github.com/dbt-labs/dbt/blob/dev/louisa-may-alcott/plugins/snowflake/dbt/include/snowflake/macros/adapters.sql#L48
 Edited to include ordinal_position
 -#}
   select
@@ -134,7 +134,7 @@ Edited to include ordinal_position
 
 {% macro postgres__get_columns_in_relation_sql(relation) %}
 {#-
-From: https://github.com/fishtown-analytics/dbt/blob/23484b18b71010f701b5312f920f04529ceaa6b2/plugins/postgres/dbt/include/postgres/macros/adapters.sql#L32
+From: https://github.com/dbt-labs/dbt/blob/23484b18b71010f701b5312f920f04529ceaa6b2/plugins/postgres/dbt/include/postgres/macros/adapters.sql#L32
 Edited to include ordinal_position
 -#}
   select

diff --git a/packages.yml b/packages.yml
@@ -1,3 +1,3 @@
 packages:
-  - package: fishtown-analytics/dbt_utils
-    version: [">=0.6.0", "<0.7.0"]
+  - package: dbt-labs/dbt_utils
+    version: [">=0.7.0", "<0.8.0"]