Skip to content

Commit

Permalink
Merge pull request #29 from fishtown-analytics/bump-utils-0.5.0
Browse files Browse the repository at this point in the history
Bump utils to v0.5.0
  • Loading branch information
Claire Carroll authored Jul 31, 2020
2 parents 6b222e5 + 0a3140d commit f2d12b5
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
40 changes: 20 additions & 20 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,35 +41,35 @@ jobs:
command: |
. venv/bin/activate
cd integration_tests
dbt deps --target postgres
dbt run-operation create_source_table --target postgres
dbt seed --target postgres --full-refresh
dbt run --target postgres
dbt test --target postgres
dbt --warn-error deps --target postgres
dbt --warn-error run-operation create_source_table --target postgres
dbt --warn-error seed --target postgres --full-refresh
dbt --warn-error run --target postgres
dbt --warn-error test --target postgres
- run:
name: "Run Tests - Redshift"
command: |
. venv/bin/activate
echo `pwd`
cd integration_tests
dbt deps --target redshift
dbt run-operation create_source_table --target redshift
dbt seed --target redshift --full-refresh
dbt run --target redshift
dbt test --target redshift
dbt --warn-error deps --target redshift
dbt --warn-error run-operation create_source_table --target redshift
dbt --warn-error seed --target redshift --full-refresh
dbt --warn-error run --target redshift
dbt --warn-error test --target redshift
- run:
name: "Run Tests - Snowflake"
command: |
. venv/bin/activate
echo `pwd`
cd integration_tests
dbt deps --target snowflake
dbt run-operation create_source_table --target snowflake
dbt seed --target snowflake --full-refresh
dbt run --target snowflake
dbt test --target snowflake
dbt --warn-error deps --target snowflake
dbt --warn-error run-operation create_source_table --target snowflake
dbt --warn-error seed --target snowflake --full-refresh
dbt --warn-error run --target snowflake
dbt --warn-error test --target snowflake
- run:
name: "Run Tests - BigQuery"
Expand All @@ -80,11 +80,11 @@ jobs:
. venv/bin/activate
echo `pwd`
cd integration_tests
dbt deps --target bigquery
dbt run-operation create_source_table --target bigquery
dbt seed --target bigquery --full-refresh
dbt run --target bigquery
dbt test --target bigquery
dbt --warn-error deps --target bigquery
dbt --warn-error run-operation create_source_table --target bigquery
dbt --warn-error seed --target bigquery --full-refresh
dbt --warn-error run --target bigquery
dbt --warn-error test --target bigquery
- save_cache:
Expand Down
6 changes: 3 additions & 3 deletions integration_tests/ci/sample.profiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ integration_tests:
host: "{{ env_var('POSTGRES_TEST_HOST') }}"
user: "{{ env_var('POSTGRES_TEST_USER') }}"
pass: "{{ env_var('POSTGRES_TEST_PASS') }}"
port: "{{ env_var('POSTGRES_TEST_PORT') }}"
port: "{{ env_var('POSTGRES_TEST_PORT') | as_number }}"
dbname: "{{ env_var('POSTGRES_TEST_DBNAME') }}"
schema: codegen_integration_tests_postgres
threads: 1
Expand All @@ -25,7 +25,7 @@ integration_tests:
user: "{{ env_var('REDSHIFT_TEST_USER') }}"
pass: "{{ env_var('REDSHIFT_TEST_PASS') }}"
dbname: "{{ env_var('REDSHIFT_TEST_DBNAME') }}"
port: "{{ env_var('REDSHIFT_TEST_PORT') }}"
port: "{{ env_var('REDSHIFT_TEST_PORT') | as_number }}"
schema: codegen_integration_tests_redshift
threads: 1

Expand All @@ -36,7 +36,7 @@ integration_tests:
project: "{{ env_var('BIGQUERY_TEST_DATABASE') }}"
schema: codegen_integration_tests_bigquery
threads: 1

snowflake:
type: snowflake
account: "{{ env_var('SNOWFLAKE_TEST_ACCOUNT') }}"
Expand Down
1 change: 1 addition & 0 deletions integration_tests/dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ clean-targets:

seeds:
+schema: raw_data
+quote_columns: false
17 changes: 8 additions & 9 deletions integration_tests/tests/test_generate_model_yaml.sql
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{% set actual_model_yaml = codegen.generate_model_yaml(
model_name='codegen_integration_tests__data_source_table'
model_name='data__a_relation'
)
%}

{% set expected_model_yaml %}
version: 2

models:
- name: model_yaml
tables:
- name: codegen_integration_tests__data_source_table
- name: data__a_relation
description: ""
columns:
- name: col_a
description: ""

- name: col_b
description: ""
columns:
- name: col_a
description: ""
- name: col_b
description: ""

{% endset %}

Expand Down
2 changes: 1 addition & 1 deletion packages.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
packages:
- package: fishtown-analytics/dbt_utils
version: [">=0.2.4", "<0.5.0"]
version: [">=0.4.0", "<0.6.0"]

0 comments on commit f2d12b5

Please sign in to comment.