Skip to content

Commit 670cd7e

Browse files
fivetran-data-model-botClaude README Updaterfivetran-catfritzfivetran-jamiegithub-actions[bot]
authored
dbt bump to v3.0.0 (#126)
* MagicBot/bump-dbt-to-v3 * Q2 FY26 Automatic Package Updates (#122) * Q2 FY26: Apply automated update. * Update generate-docs.yml * Q2 FY26: Update auto-release workflow only. --------- Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Co-authored-by: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com> * Refactor salesforce_schema variable in dbt config * Update integration_tests/dbt_project.yml * Update .github/workflows/generate-docs.yml Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> * Generate dbt docs via GitHub Actions * Apply suggestions from code review * Update generate-docs.yml * Generate dbt docs via GitHub Actions * Generate dbt docs via GitHub Actions * Update .github/workflows/generate-docs.yml --------- Co-authored-by: Claude README Updater <noreply@fivetran.com> Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com> Co-authored-by: Jamie Rodriguez <65564846+fivetran-jamie@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent c7a1d59 commit 670cd7e

File tree

15 files changed

+366
-116
lines changed

15 files changed

+366
-116
lines changed

.buildkite/pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
key: "run-dbt-postgres"
44
plugins:
55
- docker#v3.13.0:
6-
image: "python:3.8"
6+
image: "python:3.10.13"
77
shell: [ "/bin/bash", "-e", "-c" ]
88
environment:
99
- "BASH_ENV=/tmp/.bashrc"
@@ -18,7 +18,7 @@ steps:
1818
key: "run_dbt_snowflake"
1919
plugins:
2020
- docker#v3.13.0:
21-
image: "python:3.8"
21+
image: "python:3.10.13"
2222
shell: [ "/bin/bash", "-e", "-c" ]
2323
environment:
2424
- "BASH_ENV=/tmp/.bashrc"
@@ -35,7 +35,7 @@ steps:
3535
key: "run_dbt_bigquery"
3636
plugins:
3737
- docker#v3.13.0:
38-
image: "python:3.8"
38+
image: "python:3.10.13"
3939
shell: [ "/bin/bash", "-e", "-c" ]
4040
environment:
4141
- "BASH_ENV=/tmp/.bashrc"
@@ -47,7 +47,7 @@ steps:
4747
key: "run_dbt_redshift"
4848
plugins:
4949
- docker#v3.13.0:
50-
image: "python:3.8"
50+
image: "python:3.10.13"
5151
shell: [ "/bin/bash", "-e", "-c" ]
5252
environment:
5353
- "BASH_ENV=/tmp/.bashrc"
@@ -62,7 +62,7 @@ steps:
6262
key: "run_dbt_databricks"
6363
plugins:
6464
- docker#v3.13.0:
65-
image: "python:3.8"
65+
image: "python:3.10.13"
6666
shell: [ "/bin/bash", "-e", "-c" ]
6767
environment:
6868
- "BASH_ENV=/tmp/.bashrc"
Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,38 @@
1-
## PR Overview
2-
**This PR will address the following Issue/Feature:**
1+
<!--
2+
Pre-Submission Reminders
3+
Before marking this PR as "ready for review":
34
4-
**This PR will result in the following new package version:**
5-
<!--- Please add details around your decision for breaking vs non-breaking version upgrade. If this is a breaking change, were backwards-compatible options explored? -->
5+
- `dbt run --full-refresh && dbt test`
6+
- `dbt run` && `dbt test` (if incremental models are present)
7+
- The related issue is linked, tagged, and appropriately assigned
8+
- Documentation and version updates are included, if applicable
9+
- `docs` have been regenerated (unless there are no code or YAML changes)
10+
- BuildKite integration tests are passing
11+
-->
612

7-
**Please provide the finalized CHANGELOG entry which details the relevant changes included in this PR:**
8-
<!--- Copy/paste the CHANGELOG for this version below. -->
13+
## PR Overview
14+
**Package version introduced in this PR:**
15+
-
916

10-
## PR Checklist
11-
### Basic Validation
12-
Please acknowledge that you have successfully performed the following commands locally:
13-
- [ ] dbt run –full-refresh && dbt test
14-
- [ ] dbt run (if incremental models are present) && dbt test
17+
**This PR addresses the following Issue/Feature(s):**
18+
<!-- Add Issue # or internal ticket reference -->
19+
-
1520

16-
Before marking this PR as "ready for review" the following have been applied:
17-
- [ ] The appropriate issue has been linked, tagged, and properly assigned
18-
- [ ] All necessary documentation and version upgrades have been applied
19-
- [ ] docs were regenerated (unless this PR does not include any code or yml updates)
20-
- [ ] BuildKite integration tests are passing
21-
- [ ] Detailed validation steps have been provided below
21+
**Summary of changes:**
22+
<!-- 1-2 sentences describing PR changes. -->
23+
-
2224

23-
### Detailed Validation
24-
Please share any and all of your validation steps:
25-
<!--- Provide the steps you took to validate your changes below. -->
25+
### Submission Checklist
26+
- [ ] Alignment meeting with the reviewer (if needed)
27+
- [ ] Timeline and validation requirements discussed
28+
- [ ] Provide validation details:
29+
- [ ] **Validation Steps:** Check for unintentional effects (e.g., add/run consistency & integrity tests)
30+
- [ ] **Testing Instructions:** Confirm the change addresses the issue(s)
31+
- [ ] **Focus Areas:** Complex logic or queries that need extra attention
32+
- [ ] Merge any relevant open PRs into this PR
2633

27-
### If you had to summarize this PR in an emoji, which would it be?
28-
<!--- For a complete list of markdown compatible emojis check our this git repo (https://gist.github.com/rxaviers/7360908) -->
29-
:dancer:
34+
### Changelog
35+
<!-- Recommend drafting changelog notes, then refining via ChatGPT using:
36+
"Draft a changelog entry based on the following notes." -->
37+
- [ ] Draft changelog for PR
38+
- [ ] Final changelog for release review

.github/workflows/auto-release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ on:
33
pull_request:
44
types:
55
- closed
6-
branches:
7-
- main
6+
- labeled
87

98
jobs:
10-
call-workflow-passing-data:
11-
if: github.event.pull_request.merged
9+
release:
10+
if: |
11+
(github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main') ||
12+
github.event.label.name == 'pre-release'
1213
uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
13-
secrets: inherit
14+
secrets: inherit
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: 'generate dbt docs'
2+
on:
3+
pull_request:
4+
types:
5+
- labeled
6+
7+
jobs:
8+
generate-docs:
9+
if: github.event.label.name == 'docs:ready'
10+
uses: fivetran/dbt_package_automations/.github/workflows/generate-docs.yml@main
11+
secrets: inherit
12+
with:
13+
schema_var_name: salesforce_schema

.gitignore

Lines changed: 70 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,73 @@
1-
2-
target/
1+
# dbt
2+
**/package-lock.yml
3+
package-lock.yml
4+
.dbt/
35
dbt_modules/
6+
dbt_packages/
47
logs/
8+
profiles.yml
9+
target/
10+
*.log
11+
12+
# IDE files
13+
.idea/
14+
.vscode/
15+
*~
16+
*.swp
17+
*.swo
18+
19+
# Jupyter Notebook
20+
.ipynb_checkpoints
21+
22+
# OS generated files
23+
**/.DS_Store
24+
.DS_Store
25+
.Spotlight-V100
26+
.Trashes
27+
._*
28+
Thumbs.db
29+
ehthumbs.db
30+
31+
# Python
32+
*.egg
33+
*.egg-info/
34+
*.py[cod]
35+
*.so
36+
*$py.class
37+
.Python
38+
__pycache__/
39+
build/
40+
develop-eggs/
41+
dist/
42+
downloads/
43+
eggs/
44+
.env
45+
.installed.cfg
46+
lib/
47+
lib64/
48+
MANIFEST
49+
parts/
50+
sdist/
51+
var/
52+
wheels/
53+
54+
# Secrets and credentials
55+
.env.*
56+
.secrets
57+
credentials.json
58+
service-account.json
59+
60+
# Temporary files
61+
.cache/
62+
*.temp
63+
*.tmp
564

6-
dbt_packages/
65+
# Virtual environments
66+
.conda/
67+
.env
68+
.venv
69+
ENV/
70+
env/
71+
env.bak/
72+
venv/
73+
venv.bak/

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# dbt_salesforce_formula_utils v0.11.0
2+
3+
[PR #126](https://github.com/fivetran/dbt_salesforce_formula_utils/pull/126) includes the following updates:
4+
5+
## Features
6+
- Increases the required dbt version upper limit to v3.0.0
7+
8+
## Under the Hood
9+
- Updates the README and integration tests architecture to align with other packages
10+
111
# dbt_salesforce_formula_utils v0.10.0
212
[PR #109](https://github.com/fivetran/dbt_salesforce_formula_utils/pull/109) includes the following updates:
313

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright © 2025 Fivetran Inc.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
href="https://github.com/fivetran/dbt_salesforce_formula_utils/blob/main/LICENSE">
66
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
77
<a alt="dbt-core">
8-
<img src="https://img.shields.io/badge/dbt_Core™_version->=1.3.0_<2.0.0-orange.svg" /></a>
8+
<img src="https://img.shields.io/badge/dbt_Core™_version->=1.3.0_,<2.0.0-orange.svg" /></a>
99
<a alt="Maintained?">
1010
<img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg" /></a>
1111
<a alt="PRs">
1212
<img src="https://img.shields.io/badge/Contributions-welcome-blueviolet" /></a>
13+
<a alt="Fivetran Quickstart Compatible"
14+
href="https://fivetran.com/docs/transformations/dbt/quickstart">
15+
<img src="https://img.shields.io/badge/Fivetran_Quickstart_Compatible%3F-yes-green.svg" /></a>
1316
</p>
1417

1518
## What does this dbt package do?
@@ -30,7 +33,7 @@ The [`sfdc_formula_view`](https://github.com/fivetran/dbt_salesforce_formula_uti
3033
```yml
3134
packages:
3235
- package: fivetran/salesforce_formula_utils
33-
version: [">=0.10.0", "<0.11.0"] # we recommend using ranges to capture non-breaking changes automatically
36+
version: [">=0.11.0", "<0.12.0"] # we recommend using ranges to capture non-breaking changes automatically
3437
```
3538
3639
### Step 3: Define required source tables
@@ -63,7 +66,6 @@ To create a model that includes all formula fields:
6366

6467
**Output**: All formulas for the chosen source table will be included in the resulting `select` statement.
6568

66-
6769
#### Automate model creation
6870
If you have multiple models you need to create, you can also leverage the [sfdc_formula_model_automation](https://github.com/fivetran/dbt_salesforce_formula_utils#sfdc_formula_model_automationsh-source) script within this project to automatically create models locally via the command line. Below is an example command to copy and edit.
6971

@@ -75,14 +77,13 @@ source dbt_packages/salesforce_formula_utils/sfdc_formula_model_automation.sh ".
7577

7678
> Note: In order for this command to work, you must currently be within the root directory of your dbt project.
7779

78-
7980
### Step 5: Execute models
8081
Once you have created all your desired models and copied/modified the sql snippet into each model you will execute `dbt deps` to install the macro package, then execute `dbt run` to generate the models. Additionally, you can reference the [integration_tests](https://github.com/fivetran/dbt_salesforce_formula_utils/tree/main/integration_tests/models) folder for examples on how to use the macro within your models.
8182

8283
### (Optional) Step 6: Orchestrate your models with Fivetran Transformations for dbt Core™
8384
<details><summary>Expand to view details</summary>
8485
<br>
85-
86+
8687
Fivetran offers the ability for you to orchestrate your dbt project through [Fivetran Transformations for dbt Core™](https://fivetran.com/docs/transformations/dbt). Learn how to set up your project for orchestration through Fivetran in our [Transformations for dbt Core setup guides](https://fivetran.com/docs/transformations/dbt#setupguide).
8788
</details>
8889

dbt_project.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name: 'salesforce_formula_utils'
2-
version: '0.10.0'
2+
version: '0.11.0'
33
config-version: 2
4-
require-dbt-version: [">=1.3.0", "<2.0.0"]
4+
require-dbt-version: [">=1.3.0", "<3.0.0"]

docs/catalog.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)