From 0e9ebe55c7c4d949480ab5127ecf17468641faa8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 23 Jul 2021 22:15:10 +0100 Subject: [PATCH 1/5] Updating package dependendcies --- packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages.yml b/packages.yml index 23093c0..cf3c3fd 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - - package: fivetran/salesforce_source - version: [">=0.2.1", "<0.3.0"] +- package: fivetran/salesforce_source + version: [">=0.3.0", "<0.4.0"] From f64d9ef8e2c4c0a583f20840bcca8320ae9a2b97 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 23 Jul 2021 22:15:11 +0100 Subject: [PATCH 2/5] Updating require-dbt-version --- dbt_project.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dbt_project.yml b/dbt_project.yml index 04d742f..e8009aa 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,27 +1,19 @@ config-version: 2 - name: 'salesforce' -version: '0.3.0' - -require-dbt-version: [">=0.18.0", "<0.20.0"] - +version: '0.4.0' +require-dbt-version: [">=0.20.0"] models: salesforce: materialized: table intermediate: materialized: ephemeral - vars: salesforce: account: "{{ ref('stg_salesforce__account') }}" opportunity: "{{ ref('stg_salesforce__opportunity') }}" user: "{{ ref('stg_salesforce__user') }}" user_role: "{{ ref('stg_salesforce__user_role') }}" - - # Use to add more field to the opportunity enhanced table. - # Note these columns must be present in the downstream account table or user table opportunity_enhanced_pass_through_columns: [] - clean-targets: - - target - - dbt_modules +- target +- dbt_modules From 95fee2f4a25b7abc5ffc796ebfa945dbb60b1709 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 23 Jul 2021 22:15:11 +0100 Subject: [PATCH 3/5] Updating dbt version in requirements.txt --- integration_tests/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt index eedcd25..b06ff52 100644 --- a/integration_tests/requirements.txt +++ b/integration_tests/requirements.txt @@ -1 +1,3 @@ -dbt==0.19.0 +dbt==0.20.0 +dbt-spark==0.20.0 +dbt-spark[PyHive]==0.20.0 From 5e6ac4999b4897ee4bd5c97fc8102b7d1ef90e3f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 23 Jul 2021 22:16:49 +0100 Subject: [PATCH 4/5] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 763661d..2d7e4ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,6 +18,7 @@ jobs: - run: name: "Setup dbt" command: | + sudo apt install libsasl2-dev python3 -m venv venv . venv/bin/activate pip install --upgrade pip setuptools From 8f102110d5fa709d061ea232880eee0401acc359 Mon Sep 17 00:00:00 2001 From: fivetran-joemarkiewicz Date: Tue, 27 Jul 2021 10:42:28 -0500 Subject: [PATCH 5/5] dbt20 readme and minor updates --- README.md | 9 +++++++++ integration_tests/dbt_project.yml | 2 +- packages.yml | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4009bb4..fb44069 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![dbt logo and version](https://img.shields.io/static/v1?logo=dbt&label=dbt-version&message=0.20.x&color=orange) # Salesforce ([docs](https://dbt-salesforce.netlify.app/)) This package models Salesforce data from [Fivetran's connector](https://fivetran.com/docs/applications/salesforce). It uses data in the format described by [this ERD](https://docs.google.com/presentation/d/1fB6aCiX_C1lieJf55TbS2v1yv9sp-AHNNAh2x7jnJ48/edit#slide=id.g3cb9b617d1_0_237). @@ -19,6 +20,14 @@ salesforce\_\_opportunity\_enhanced|Each record represents an opportunity, enric ## Installation Instructions Check [dbt Hub](https://hub.getdbt.com/) for the latest installation instructions, or [read the dbt docs](https://docs.getdbt.com/docs/package-management) for more information on installing packages. +Include in your `packages.yml` + +```yaml +packages: + - package: fivetran/salesforce + version: [">=0.4.0", "<0.5.0"] +``` + ## Configuration By default, this package looks for your Salesforce data in the `salesforce` schema of your [target database](https://docs.getdbt.com/docs/running-a-dbt-project/using-the-command-line-interface/configure-your-profile). If this is not where your Salesforce data is, add the following configuration to your `dbt_project.yml` file: diff --git a/integration_tests/dbt_project.yml b/integration_tests/dbt_project.yml index 9a89d98..ed2d7e8 100644 --- a/integration_tests/dbt_project.yml +++ b/integration_tests/dbt_project.yml @@ -1,5 +1,5 @@ name: 'salesforce_integration_tests' -version: '0.3.0' +version: '0.4.0' config-version: 2 profile: 'integration_tests' diff --git a/packages.yml b/packages.yml index cf3c3fd..7acf5f0 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: -- package: fivetran/salesforce_source - version: [">=0.3.0", "<0.4.0"] + - package: fivetran/salesforce_source + version: [">=0.3.0", "<0.4.0"]