Merge pull request #222 from brooklyn-data/add-invocation-args-to-inv…

…ocations-models

Add invocation args column to invocation models

.github/workflows/ci_test_package.yml

@@ -109,13 +109,13 @@ jobs:
       name: Approve Integration Tests
 
     steps:
-      - name: Checkout branch
+      - name: Checkout Branch
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }} # Check out the code of the PR
 
       - name: Install Python packages
-        run: python -m pip install dbt-snowflake~=1.2.0 sqlfluff-templater-dbt
+        run: python -m pip install dbt-snowflake~=1.3.0 sqlfluff-templater-dbt
 
       - name: Test database connection
         run: dbt debug

.github/workflows/main_test_package.yml

@@ -98,7 +98,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install Python packages
-        run: python -m pip install dbt-snowflake~=1.2.0 sqlfluff-templater-dbt
+        run: python -m pip install dbt-snowflake~=1.3.0 sqlfluff-templater-dbt
 
       - name: Test database connection
         run: dbt debug

dbt_project.yml

@@ -1,7 +1,7 @@
 name: 'dbt_artifacts'
 version: '2.1.1'
 config-version: 2
-require-dbt-version: ">=1.2.0"
+require-dbt-version: ">=1.3.0"
 profile: "dbt_artifacts"
 
 clean-targets: # folders to be removed by `dbt clean`

macros/upload_invocations.sql

@@ -21,7 +21,8 @@
         nullif({{ adapter.dispatch('column_identifier', 'dbt_artifacts')(14) }}, ''),
         nullif({{ adapter.dispatch('column_identifier', 'dbt_artifacts')(15) }}, ''),
         {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(16)) }},
-        {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(17)) }}
+        {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(17)) }},
+        {{ adapter.dispatch('parse_json', 'dbt_artifacts')(adapter.dispatch('column_identifier', 'dbt_artifacts')(18)) }}
     from values
     (
         '{{ invocation_id }}', {# command_invocation_id #}
@@ -56,10 +57,13 @@
             {% for dbt_var in var('dbt_vars') %}
                 {% do dbt_vars_dict.update({dbt_var: var(dbt_var)}) %}
             {% endfor %}
-            '{{ tojson(dbt_vars_dict) }}' {# dbt_vars #}
+            '{{ tojson(dbt_vars_dict) }}', {# dbt_vars #}
         {% else %}
-            null {# dbt_vars #}
+            null, {# dbt_vars #}
         {% endif %}
+
+        '{{ tojson(invocation_args_dict) }}' {# invocation_args #}
+
     )
     {% endset %}
     {{ invocation_values }}
@@ -101,10 +105,13 @@
             {% for dbt_var in var('dbt_vars') %}
                 {% do dbt_vars_dict.update({dbt_var: var(dbt_var)}) %}
             {% endfor %}
-            parse_json('{{ tojson(dbt_vars_dict) }}') {# dbt_vars #}
+            parse_json('{{ tojson(dbt_vars_dict) }}'), {# dbt_vars #}
         {% else %}
-            null {# dbt_vars #}
+            null, {# dbt_vars #}
         {% endif %}
+
+        parse_json('{{ tojson(invocation_args_dict) }}') {# invocation_args #}
+
         )
     {% endset %}
     {{ invocation_values }}

models/docs.md

@@ -376,3 +376,9 @@ Total time spent executing the node's last run (seconds).
 The meta field of the config associated with the node.
 
 {% enddocs %}
+
+{% docs invocation_args %}
+
+Key-value pairs of args passed to invocation.
+
+{% enddocs %}

models/fct_dbt__invocations.sql

@@ -24,7 +24,8 @@ invocations as (
         dbt_cloud_run_reason_category,
         dbt_cloud_run_reason,
         env_vars,
-        dbt_vars
+        dbt_vars,
+        invocation_args
     from base
 
 )

models/fct_dbt__invocations.yml

@@ -38,3 +38,5 @@ models:
     description: '{{ doc("env_vars") }}'
   - name: dbt_vars
     description: '{{ doc("dbt_vars") }}'
+  - name: invocation_args
+    description: '{{ doc("invocation_args") }}'

models/sources/invocations.sql

@@ -20,6 +20,7 @@ select
     cast(null as {{ type_string() }}) as dbt_cloud_run_reason_category,
     cast(null as {{ type_string() }}) as dbt_cloud_run_reason,
     cast(null as {{ type_json() }}) as env_vars,
-    cast(null as {{ type_json() }}) as dbt_vars
+    cast(null as {{ type_json() }}) as dbt_vars,
+    cast(null as {{ type_json() }}) as invocation_args
 from dummy_cte
 where 1 = 0

models/staging/stg_dbt__invocations.sql

@@ -24,7 +24,8 @@ enhanced as (
         dbt_cloud_run_reason_category,
         dbt_cloud_run_reason,
         env_vars,
-        dbt_vars
+        dbt_vars,
+        invocation_args
     from base
 
 )

models/staging/stg_dbt__invocations.yml

@@ -38,3 +38,5 @@ models:
     description: '{{ doc("env_vars") }}'
   - name: dbt_vars
     description: '{{ doc("dbt_vars") }}'
+  - name: invocation_args
+    description: '{{ doc("invocation_args") }}'

tox.ini

@@ -43,7 +43,7 @@ rules = L001,L003,L004,L005,L006,L007,L008,L010,L011,L012,L014,L015,L017,L018,L0
 
 deps =
     sqlfluff-templater-dbt
-    dbt-snowflake~=1.2.0
+    dbt-snowflake~=1.3.0
 
 [sqlfluff:rules:L004]
 indent_unit = space
@@ -112,33 +112,33 @@ deps = {[sqlfluff]deps}
 commands = sqlfluff fix models --ignore parsing
 
 [testenv:generate_docs]
-deps = dbt-snowflake~=1.2.0
+deps = dbt-snowflake~=1.3.0
 commands = dbt docs generate --profiles-dir integration_test_project
 
 [testenv:integration_snowflake]
 changedir = integration_test_project
-deps = dbt-snowflake~=1.2.0
+deps = dbt-snowflake~=1.3.0
 commands =
     dbt deps
     dbt build --target snowflake
 
 [testenv:integration_databricks]
 changedir = integration_test_project
-deps = dbt-databricks~=1.2.0
+deps = dbt-databricks~=1.3.0
 commands =
     dbt deps
     dbt build --target databricks
 
 [testenv:integration_bigquery]
 changedir = integration_test_project
-deps = dbt-bigquery~=1.2.0
+deps = dbt-bigquery~=1.3.0
 commands =
     dbt deps
     dbt build --target bigquery
 
 [testenv:integration_spark]
 changedir = integration_test_project
-deps = dbt-spark[ODBC]~=1.2.0
+deps = dbt-spark[ODBC]~=1.3.0
 commands =
     dbt deps
     dbt build --target spark