From c1e6772dbefb44ae6cb467e0cf83f93263be4888 Mon Sep 17 00:00:00 2001 From: Renee Li Date: Thu, 24 Oct 2024 10:23:26 -0400 Subject: [PATCH 1/5] quickstart update --- CHANGELOG.md | 4 ++++ dbt_project.yml | 2 +- integration_tests/dbt_project.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04fbd5f..c287b1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# dbt_hubspot v0.19.1 + +- Removed `hubspot__daily_ticket_history`, `hubspot__tickets` from the quickstart.yml since these models may not always be present. + # dbt_hubspot v0.19.0 [PR #147](https://github.com/fivetran/dbt_hubspot/pull/147) includes the following updates: ## Breaking Changes diff --git a/dbt_project.yml b/dbt_project.yml index ec8104c..19d5151 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,5 +1,5 @@ name: 'hubspot' -version: '0.19.0' +version: '0.19.1' config-version: 2 require-dbt-version: [">=1.3.0", "<2.0.0"] diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 49a3762..dc6878d 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'hubspot_integration_tests' -version: '0.19.0' +version: '0.19.1' profile: 'integration_tests' config-version: 2 From 1847168bc39b7f010a40338fedc4a72e412f55b1 Mon Sep 17 00:00:00 2001 From: Renee Li Date: Thu, 24 Oct 2024 10:45:02 -0400 Subject: [PATCH 2/5] UPDATE --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c287b1f..f3261a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # dbt_hubspot v0.19.1 +[PR #149](https://github.com/fivetran/dbt_hubspot/pull/149) includes the following updates: +## Under the Hood - Removed `hubspot__daily_ticket_history`, `hubspot__tickets` from the quickstart.yml since these models may not always be present. # dbt_hubspot v0.19.0 From e3654b5c8aeb4db65f33664d2583b75cab19ec9a Mon Sep 17 00:00:00 2001 From: Renee Li <91097070+fivetran-reneeli@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:49:43 -0400 Subject: [PATCH 3/5] Update CHANGELOG.md Co-authored-by: Joe Markiewicz <74217849+fivetran-joemarkiewicz@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3261a6..3b9e044 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # dbt_hubspot v0.19.1 -[PR #149](https://github.com/fivetran/dbt_hubspot/pull/149) includes the following updates: +[PR #148](https://github.com/fivetran/dbt_hubspot/pull/148) includes the following updates: ## Under the Hood - Removed `hubspot__daily_ticket_history`, `hubspot__tickets` from the quickstart.yml since these models may not always be present. From b29b8c7b5ae9036c2ea44429324183be4d8ea72b Mon Sep 17 00:00:00 2001 From: Renee Li Date: Thu, 24 Oct 2024 11:03:59 -0400 Subject: [PATCH 4/5] new schema --- integration_tests/ci/sample.profiles.yml | 10 +++++----- integration_tests/dbt_project.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml index 98c840f..68a732d 100644 --- a/integration_tests/ci/sample.profiles.yml +++ b/integration_tests/ci/sample.profiles.yml @@ -16,13 +16,13 @@ integration_tests: pass: "{{ env_var('CI_REDSHIFT_DBT_PASS') }}" dbname: "{{ env_var('CI_REDSHIFT_DBT_DBNAME') }}" port: 5439 - schema: hubspot_integration_tests_58 + schema: hubspot_integration_tests_59 threads: 8 bigquery: type: bigquery method: service-account-json project: 'dbt-package-testing' - schema: hubspot_integration_tests_58 + schema: hubspot_integration_tests_59 threads: 8 keyfile_json: "{{ env_var('GCLOUD_SERVICE_KEY') | as_native }}" snowflake: @@ -33,7 +33,7 @@ integration_tests: role: "{{ env_var('CI_SNOWFLAKE_DBT_ROLE') }}" database: "{{ env_var('CI_SNOWFLAKE_DBT_DATABASE') }}" warehouse: "{{ env_var('CI_SNOWFLAKE_DBT_WAREHOUSE') }}" - schema: hubspot_integration_tests_58 + schema: hubspot_integration_tests_59 threads: 8 postgres: type: postgres @@ -42,13 +42,13 @@ integration_tests: pass: "{{ env_var('CI_POSTGRES_DBT_PASS') }}" dbname: "{{ env_var('CI_POSTGRES_DBT_DBNAME') }}" port: 5432 - schema: hubspot_integration_tests_58 + schema: hubspot_integration_tests_59 threads: 8 databricks: catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}" host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}" http_path: "{{ env_var('CI_DATABRICKS_DBT_HTTP_PATH') }}" - schema: hubspot_integration_tests_58 + schema: hubspot_integration_tests_59 threads: 8 token: "{{ env_var('CI_DATABRICKS_DBT_TOKEN') }}" type: databricks diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index dc6878d..621d7e2 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -9,7 +9,7 @@ models: # +schema: "hubspot_{{ var('directed_schema','dev') }}" ## To be used for validation testing vars: - hubspot_schema: hubspot_integration_tests_58 + hubspot_schema: hubspot_integration_tests_59 # hubspot__pass_through_all_columns: true # hubspot__company_pass_through_columns: # - name: "property_hs_all-funky-a9384-syntax" From 20db9d432174386d5cf8dd21aa28b8be597b2e59 Mon Sep 17 00:00:00 2001 From: Renee Li Date: Thu, 24 Oct 2024 12:02:24 -0400 Subject: [PATCH 5/5] try new databricks sql schema --- .buildkite/scripts/run_models.sh | 12 ++++++------ integration_tests/ci/sample.profiles.yml | 2 +- integration_tests/dbt_project.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildkite/scripts/run_models.sh b/.buildkite/scripts/run_models.sh index b7b2db2..1f80963 100644 --- a/.buildkite/scripts/run_models.sh +++ b/.buildkite/scripts/run_models.sh @@ -17,12 +17,12 @@ echo `pwd` cd integration_tests dbt deps if [ "$db" = "databricks-sql" ]; then -dbt seed --vars '{hubspot_schema: hubspot_sqlw_tests_2}' --target "$db" --full-refresh -dbt compile --vars '{hubspot_schema: hubspot_sqlw_tests_2}' --target "$db" -dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_2}' --target "$db" --full-refresh -dbt test --vars '{hubspot_schema: hubspot_sqlw_tests_2}' --target "$db" -dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_2, hubspot_marketing_enabled: true, hubspot_contact_merge_audit_enabled: true, hubspot_sales_enabled: false}' --target "$db" -dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_2, hubspot_marketing_enabled: false, hubspot_sales_enabled: true, hubspot_merged_deal_enabled: true, hubspot__pass_through_all_columns: true, hubspot_using_all_email_events: false, hubspot_owner_enabled: false}' --target "$db" +dbt seed --vars '{hubspot_schema: hubspot_sqlw_tests_3}' --target "$db" --full-refresh +dbt compile --vars '{hubspot_schema: hubspot_sqlw_tests_3}' --target "$db" +dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_3}' --target "$db" --full-refresh +dbt test --vars '{hubspot_schema: hubspot_sqlw_tests_3}' --target "$db" +dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_3, hubspot_marketing_enabled: true, hubspot_contact_merge_audit_enabled: true, hubspot_sales_enabled: false}' --target "$db" +dbt run --vars '{hubspot_schema: hubspot_sqlw_tests_3, hubspot_marketing_enabled: false, hubspot_sales_enabled: true, hubspot_merged_deal_enabled: true, hubspot__pass_through_all_columns: true, hubspot_using_all_email_events: false, hubspot_owner_enabled: false}' --target "$db" else dbt seed --target "$db" --full-refresh dbt compile --target "$db" --select hubspot # source does not compile at this time diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml index 68a732d..0f8ea8d 100644 --- a/integration_tests/ci/sample.profiles.yml +++ b/integration_tests/ci/sample.profiles.yml @@ -56,7 +56,7 @@ integration_tests: catalog: "{{ env_var('CI_DATABRICKS_DBT_CATALOG') }}" host: "{{ env_var('CI_DATABRICKS_DBT_HOST') }}" http_path: "{{ env_var('CI_DATABRICKS_SQL_DBT_HTTP_PATH') }}" - schema: hubspot_sqlw_tests_2 + schema: hubspot_sqlw_tests_3 threads: 8 token: "{{ env_var('CI_DATABRICKS_SQL_DBT_TOKEN') }}" type: databricks \ No newline at end of file diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 621d7e2..bfd2d35 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -5,7 +5,7 @@ profile: 'integration_tests' config-version: 2 models: - +schema: "{{ 'hubspot_sqlw_tests_2' if target.name == 'databricks-sql' else 'hubspot' }}" + +schema: "{{ 'hubspot_sqlw_tests_3' if target.name == 'databricks-sql' else 'hubspot' }}" # +schema: "hubspot_{{ var('directed_schema','dev') }}" ## To be used for validation testing vars: