Skip to content

Commit d26374c

Browse files
fivetran-data-model-botfivetran-catfritzfivetran-jamiegithub-actions[bot]
authored
Remove combo tests and move loaded_at_field (#12)
* Remove YAML tests and bump patch to v0.3.0 * Q2 FY26 Automatic Package Updates (#10) * Q2 FY26: Apply automated update. * 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> * snowflake * readme * Generate dbt docs via GitHub Actions --------- 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 865d32f commit d26374c

18 files changed

Lines changed: 375 additions & 174 deletions

‎.buildkite/pipeline.yml‎

Lines changed: 6 additions & 6 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"
@@ -77,7 +77,7 @@ steps:
7777
key: "run_dbt_databricks_sql"
7878
plugins:
7979
- docker#v3.13.0:
80-
image: "python:3.8"
80+
image: "python:3.10.13"
8181
shell: [ "/bin/bash", "-e", "-c" ]
8282
environment:
8383
- "BASH_ENV=/tmp/.bashrc"

‎.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md‎

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

‎.github/workflows/generate-docs.yml‎

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_marketing_cloud_schema

‎.gitignore‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,73 @@
1-
target/
1+
# dbt
2+
**/package-lock.yml
3+
package-lock.yml
4+
.dbt/
25
dbt_modules/
3-
logs/
46
dbt_packages/
7+
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
524
.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
64+
65+
# Virtual environments
66+
.conda/
67+
.env
68+
.venv
69+
ENV/
670
env/
7-
package-lock.yml
71+
env.bak/
72+
venv/
73+
venv.bak/

‎CHANGELOG.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# dbt_salesforce_marketing_cloud v0.3.0
2+
[PR #12](https://github.com/fivetran/dbt_salesforce_marketing_cloud/pull/12) includes the following updates:
3+
4+
### dbt Fusion Compatibility Updates
5+
- Updated package to maintain compatibility with dbt-core versions both before and after v1.10.6, which introduced a breaking change to multi-argument test syntax (e.g., `unique_combination_of_columns`).
6+
- Temporarily removed unsupported tests to avoid errors and ensure smoother upgrades across different dbt-core versions. These tests will be reintroduced once a safe migration path is available.
7+
- Removed all `dbt_utils.unique_combination_of_columns` tests.
8+
- Moved `loaded_at_field: _fivetran_synced` under the `config:` block in `src_salesforce_marketing_cloud.yml`.
9+
10+
### Under the Hood
11+
- Updated conditions in `.github/workflows/auto-release.yml`.
12+
- Added `.github/workflows/generate-docs.yml`.
13+
114
# dbt_salesforce_marketing_cloud version.version
215

316
## Documentation

‎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: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
<p align="center">
1+
# Salesforce Marketing Cloud dbt Package ([Docs](https://fivetran.github.io/dbt_salesforce_marketing_cloud/))
2+
3+
<p align="left">
24
<a alt="License"
35
href="https://github.com/fivetran/dbt_salesforce_marketing_cloud/blob/main/LICENSE">
46
<img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
57
<a alt="dbt-core">
6-
<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>
79
<a alt="Maintained?">
810
<img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg" /></a>
911
<a alt="PRs">
1012
<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>
1116
</p>
1217

13-
# Salesforce Marketing Cloud dbt Package ([Docs](https://fivetran.github.io/dbt_salesforce_marketing_cloud/))
14-
1518
## What does this dbt package do?
1619

1720
This package models Salesforce Marketing Cloud data from [Fivetran's connector](https://fivetran.com/docs/connectors/applications/salesforce-marketing-cloud). It uses data in the format described by [this ERD](https://fivetran.com/docs/connectors/applications/salesforce-marketing-cloud#schemainformation).
@@ -74,7 +77,7 @@ Include the following Salesforce Marketing Cloud package version in your `packag
7477
```yml
7578
packages:
7679
- package: fivetran/salesforce_marketing_cloud
77-
version: [">=0.2.0", "<0.3.0"] # we recommend using ranges to capture non-breaking changes automatically
80+
version: [">=0.3.0", "<0.4.0"] # we recommend using ranges to capture non-breaking changes automatically
7881
```
7982

8083
### Step 3: Define database and schema variables
@@ -139,12 +142,11 @@ vars:
139142
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).
140143
</details>
141144

142-
143145
## Does this package have dependencies?
144146
This dbt package is dependent on the following dbt packages. These dependencies are installed by default within this package. For more information on the following packages, refer to the [dbt hub](https://hub.getdbt.com/) site.
145147
> [!IMPORTANT]
146148
> If you have any of these dependent packages in your own `packages.yml` file, we highly recommend that you remove them from your root `packages.yml` to avoid package version conflicts.
147-
149+
148150
```yml
149151
packages:
150152
- package: fivetran/fivetran_utils

‎dbt_project.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config-version: 2
22
name: 'salesforce_marketing_cloud'
3-
version: '0.2.0'
3+
version: '0.3.0'
44
require-dbt-version: [">=1.3.0", "<2.0.0"]
55

66
models:

‎docs/catalog.json‎

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

0 commit comments

Comments
 (0)