Consolidate source + remove tests (#41)

* Consolidate dbt source into transform

* Q2 FY26 Automatic Package Updates (#37)

* 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: Avinash Kunnath <108772760+fivetran-avinash@users.noreply.github.com>

* dbt_project.yml + seed file additions + schema updates + documentation

* Apply PR changes

* Generate dbt docs via GitHub Actions

---------

Co-authored-by: fivetran-catfritz <111930712+fivetran-catfritz@users.noreply.github.com>
Co-authored-by: Avinash Kunnath <108772760+fivetran-avinash@users.noreply.github.com>
Co-authored-by: Avinash Kunnath <avinash.kunnath@fivetran.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: 4 people

.buildkite/scripts/run_models.sh

@@ -16,8 +16,8 @@ db=$1
 echo `pwd`
 cd integration_tests
 dbt deps
-dbt source freshness --target "$db" || echo "...Only verifying freshness runs…"
 dbt seed --target "$db" --full-refresh
+dbt source freshness --target "$db" || echo "...Only verifying freshness runs…"
 dbt run --target "$db" --full-refresh
 dbt test --target "$db"
 dbt run --vars '{apple_store__using_subscriptions: true}' --target "$db" --full-refresh

.github/PULL_REQUEST_TEMPLATE/maintainer_pull_request_template.md

@@ -12,13 +12,15 @@ Before marking this PR as "ready for review":
 
 ## PR Overview 
 **Package version introduced in this PR:** 
- 
+- 
+
 **This PR addresses the following Issue/Feature(s):**
 <!-- Add Issue # or internal ticket reference -->
+- 
 
 **Summary of changes:**  
 <!-- 1-2 sentences describing PR changes. -->
-
+- 
 
 ### Submission Checklist  
 - [ ] Alignment meeting with the reviewer (if needed)  
@@ -27,9 +29,10 @@ Before marking this PR as "ready for review":
   - [ ] **Validation Steps:** Check for unintentional effects (e.g., add/run consistency & integrity tests)
   - [ ] **Testing Instructions:** Confirm the change addresses the issue(s)
   - [ ] **Focus Areas:** Complex logic or queries that need extra attention  
+- [ ] Merge any relevant open PRs into this PR
 
 ### Changelog  
 <!-- Recommend drafting changelog notes, then refining via ChatGPT using:  
 "Draft a changelog entry based on the following notes." -->
 - [ ] Draft changelog for PR  
-- [ ] Final changelog for release review
+- [ ] Final changelog for release review

.github/workflows/auto-release.yml

@@ -3,11 +3,12 @@ on:
   pull_request:
     types:
       - closed
-    branches:
-      - main
+      - labeled
 
 jobs:
-  call-workflow-passing-data:
-    if: github.event.pull_request.merged
+  release:
+    if: |
+      (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main') ||
+      github.event.label.name == 'pre-release'
     uses: fivetran/dbt_package_automations/.github/workflows/auto-release.yml@main
-    secrets: inherit
+    secrets: inherit

.github/workflows/generate-docs.yml

@@ -0,0 +1,13 @@
+name: 'generate dbt docs'
+on:
+  pull_request:
+    types:
+      - labeled
+
+jobs:
+  generate-docs:
+    if: github.event.label.name == 'docs:ready'
+    uses: fivetran/dbt_package_automations/.github/workflows/generate-docs.yml@main
+    secrets: inherit
+    with:
+      schema_var_name: apple_store_schema

.gitignore

@@ -1,6 +1,73 @@
-
-target/
+# dbt
+**/package-lock.yml
+package-lock.yml
+.dbt/
+dbt_modules/
 dbt_packages/
 logs/
-package-lock.yml
-env/
+profiles.yml
+target/
+*.log
+
+# IDE files
+.idea/
+.vscode/
+*~
+*.swp
+*.swo
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# OS generated files
+**/.DS_Store
+.DS_Store
+.Spotlight-V100
+.Trashes
+._*
+Thumbs.db
+ehthumbs.db
+
+# Python
+*.egg
+*.egg-info/
+*.py[cod]
+*.so
+*$py.class
+.Python
+__pycache__/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.env
+.installed.cfg
+lib/
+lib64/
+MANIFEST
+parts/
+sdist/
+var/
+wheels/
+
+# Secrets and credentials
+.env.*
+.secrets
+credentials.json
+service-account.json
+
+# Temporary files
+.cache/
+*.temp
+*.tmp
+
+# Virtual environments
+.conda/
+.env
+.venv
+ENV/
+env/
+env.bak/
+venv/
+venv.bak/

CHANGELOG.md

@@ -1,3 +1,26 @@
+# dbt_apple_store v1.0.0
+[PR #41](https://github.com/fivetran/dbt_apple_store/pull/41) includes the following updates:
+
+## Breaking Changes
+
+### Source Package Consolidation
+- Removed the dependency on the `fivetran/apple_store_source` package.
+  - All functionality from the source package has been merged into this transformation package for improved maintainability and clarity.
+  - If you reference `fivetran/apple_store_source` in your `packages.yml`, you must remove this dependency to avoid conflicts.
+  - Any source overrides referencing the `fivetran/apple_store_source` package will also need to be removed or updated to reference this package.
+  - Update any apple_store_source-scoped variables to be scoped to only under this package. See the [README](https://github.com/fivetran/dbt_apple_store/blob/main/README.md) for how to configure the build schema of staging models.
+- As part of the consolidation, vars are no longer used to reference staging models, and only sources are represented by vars. Staging models are now referenced directly with `ref()` in downstream models.
+
+### dbt Fusion Compatibility Updates
+- 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`).
+- 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.
+  - Removed all `dbt_utils.unique_combination_of_columns` tests.
+  - Moved `loaded_at_field: _fivetran_synced` under the `config:` block in `src_apple_store.yml`.
+
+### Under the Hood
+- Updated conditions in `.github/workflows/auto-release.yml`.
+- Added `.github/workflows/generate-docs.yml`. 
+
 # dbt_apple_store v0.6.0
 [PR #36](https://github.com/fivetran/dbt_apple_store/pull/36) includes the following updates:
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright © 2025 Fivetran Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,22 +1,22 @@
-# Apple App Store Transformation dbt Package ([Docs](https://fivetran.github.io/dbt_apple_store/))
+# Apple App Store dbt Package ([Docs](https://fivetran.github.io/dbt_apple_store/))
 
 <p align="left">
     <a alt="License"
         href="https://github.com/fivetran/dbt_apple_store/blob/main/LICENSE">
         <img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg" /></a>
-    <a alt="Fivetran-Release"
-        href="https://fivetran.com/docs/getting-started/core-concepts#releasephases">
-        <img src="https://img.shields.io/badge/Fivetran Release Phase-_Beta-orange.svg" /></a>
     <a alt="dbt-core">
         <img src="https://img.shields.io/badge/dbt_Core™_version->=1.3.0_,<2.0.0-orange.svg" /></a>
     <a alt="Maintained?">
         <img src="https://img.shields.io/badge/Maintained%3F-yes-green.svg" /></a>
     <a alt="PRs">
         <img src="https://img.shields.io/badge/Contributions-welcome-blueviolet" /></a>
+    <a alt="Fivetran Quickstart Compatible"
+        href="https://fivetran.com/docs/transformations/dbt/quickstart">
+        <img src="https://img.shields.io/badge/Fivetran_Quickstart_Compatible%3F-yes-green.svg" /></a>
 </p>
 
 ## What does this dbt package do?
-- Produces modeled tables that leverage Apple App Store data from [Fivetran's connector](https://fivetran.com/docs/connectors/applications/apple-app-store) in the format described by [this ERD](https://fivetran.com/docs/connectors/applications/apple-app-store#salesandfinancereportschema) and build off the output of our [Apple App Store source package](https://github.com/fivetran/dbt_apple_store_source).
+- Produces modeled tables that leverage Apple App Store data from [Fivetran's connector](https://fivetran.com/docs/connectors/applications/apple-app-store) in the format described by [this ERD](https://fivetran.com/docs/connectors/applications/apple-app-store#salesandfinancereportschema).
 - Enables you to better understand your Apple App Store metrics at different granularities. It achieves this by:
   - Providing intuitive reporting at the App Version, Platform Version, Device, Source Type, Territory, Subscription and Overview levels
   - Aggregates all relevant application metrics into each of the reporting levels above
@@ -55,11 +55,10 @@ Include the following apple_store package version in your `packages.yml` file:
 ```yaml
 packages:
   - package: fivetran/apple_store
-    version: [">=0.6.0", "<0.7.0"]
+    version: [">=1.0.0", "<1.1.0"]
 ```
 
-Do NOT include the `apple_store_source` package in this file. The transformation package itself has a dependency on it and will install the source package as well.
-
+> All required sources and staging models are now bundled into this transformation package. Do not include `fivetran/apple_store_source` in your `packages.yml` since this package has been deprecated.
 
 ### Step 3: Define database and schema variables
 By default, this package runs using your destination and the `apple_store` schema. If this is not where your apple_store data is (for example, if your apple_store schema is named `apple_store_fivetran`), add the following configuration to your root `dbt_project.yml` file:
@@ -82,7 +81,7 @@ vars:
 
 In order to map longform territory names to their ISO country codes, we have adapted the CSV from [lukes/ISO-3166-Countries-with-Regional-Codes](https://github.com/lukes/ISO-3166-Countries-with-Regional-Codes) to align with Apple's country output [format](https://developer.apple.com/help/app-store-connect/reference/app-store-localizations/).
 
-You will need to `dbt seed` the `apple_store_country_codes` [file](https://github.com/fivetran/dbt_apple_store_source/blob/main/seeds/apple_store_country_codes.csv) just once.
+You will need to `dbt seed` the `apple_store_country_codes` [file](https://github.com/fivetran/dbt_apple_store/blob/main/seeds/apple_store_country_codes.csv) just once.
 
 ### (Optional) Step 6: Additional configurations
 <details open><summary>Expand/collapse configurations</summary>
@@ -112,20 +111,20 @@ By default, `Subscribe`, `Renew` and `Cancel` subscription events are included a
 ```
 
 #### Change the build schema
-By default, this package builds the apple_store staging models within a schema titled (`<target_schema>` + `_stg_apple_store`) and your apple_store modeling models within a schema titled (`<target_schema>` + `_apple_store`) in your destination. If this is not where you would like your apple_store data to be written to, add the following configuration to your root `dbt_project.yml` file:
+By default, this package builds the apple_store staging models within a schema titled (`<target_schema>` + `apple_store_source`) and your apple_store modeling models within a schema titled (`<target_schema>` + `_apple_store`) in your destination. If this is not where you would like your apple_store data to be written to, add the following configuration to your root `dbt_project.yml` file:
 
 ```yml
 models:
-    apple_store_source:
-      +schema: my_new_schema_name # leave blank for just the target_schema
     apple_store:
-      +schema: my_new_schema_name # leave blank for just the target_schema
+      +schema: my_new_schema_name # Leave +schema: blank to use the default target_schema.
+      staging:
+        +schema: my_new_schema_name # Leave +schema: blank to use the default target_schema.
 ```
-    
+
 #### Change the source table references
 If an individual source table has a different name than the package expects, add the table name as it appears in your destination to the respective variable:
 
-> IMPORTANT: See this project's [`dbt_project.yml`](https://github.com/fivetran/dbt_apple_store_source/blob/main/dbt_project.yml) variable declarations to see the expected names.
+> IMPORTANT: See this project's [`dbt_project.yml`](https://github.com/fivetran/dbt_apple_store/blob/main/dbt_project.yml) variable declarations to see the expected names.
 
 ```yml
 vars:
@@ -136,24 +135,24 @@ vars:
 ### (Optional) Step 7: Orchestrate your models with Fivetran Transformations for dbt Core™
 <details><summary>Expand for details</summary>
 <br>
-    
+
 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).
 </details>
 
 ## Does this package have dependencies?
 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.
 > IMPORTANT: 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.
-    
+
 ```yml
 packages:
-    - package: fivetran/apple_store_source
-      version: [">=0.6.0", "<0.7.0"]
-
     - package: fivetran/fivetran_utils
       version: [">=0.4.0", "<0.5.0"]
 
     - package: dbt-labs/dbt_utils
       version: [">=1.0.0", "<2.0.0"]
+
+    - package: dbt-labs/spark_utils
+      version: [">=0.3.0", "<0.4.0"]
 ```
 ## How is this package maintained and can I contribute?
 ### Package Maintenance

dbt_project.yml

@@ -1,19 +1,19 @@
 name: 'apple_store'
-version: '0.6.0'
+version: '1.0.0'
 config-version: 2
 require-dbt-version: [">=1.3.0", "<2.0.0"]
 vars:
   apple_store:
-    app_store_app: "{{ ref('stg_apple_store__app_store_app') }}"
-    sales_account: "{{ ref('stg_apple_store__sales_account') }}"
-    sales_subscription_events: "{{ ref('stg_apple_store__sales_subscription_events') }}"
-    sales_subscription_summary: "{{ ref('stg_apple_store__sales_subscription_summary') }}"
+    app_store_app: "{{ source('apple_store', 'app_store_app') }}"
+    sales_account: "{{ source('apple_store', 'sales_account') }}"
+    sales_subscription_events: "{{ source('apple_store', 'sales_subscription_events') }}"
+    sales_subscription_summary: "{{ source('apple_store', 'sales_subscription_summary') }}"
     apple_store_country_codes: "{{ ref('apple_store_country_codes') }}"
-    app_store_discovery_and_engagement_standard_daily: "{{ ref('stg_apple_store__app_store_discovery_and_engagement_daily')}}"
-    app_crash_daily: "{{ ref('stg_apple_store__app_crash_daily')}}"
-    app_store_download_standard_daily: "{{ ref('stg_apple_store__app_store_download_daily')}}"
-    app_session_standard_daily: "{{ ref('stg_apple_store__app_session_daily')}}"
-    app_store_installation_and_deletion_standard_daily: "{{ ref('stg_apple_store__app_store_installation_and_deletion_daily')}}"
+    app_store_discovery_and_engagement_standard_daily: "{{ source('apple_store', 'app_store_discovery_and_engagement_daily')}}"
+    app_crash_daily: "{{ source('apple_store', 'app_crash_daily')}}"
+    app_store_download_standard_daily: "{{ source('apple_store', 'app_store_download_daily')}}"
+    app_session_standard_daily: "{{ source('apple_store', 'app_session_daily')}}"
+    app_store_installation_and_deletion_standard_daily: "{{ source('apple_store', 'app_store_installation_and_deletion_daily')}}"
     apple_store__subscription_events:
     - 'Renew'
     - 'Cancel'
@@ -27,3 +27,8 @@ models:
       +materialized: ephemeral
       reporting_grain:
         +materialized: table
+    staging:
+      +materialized: table
+      +schema: apple_store_source
+      tmp:
+        +materialized: view