diff --git a/.gitignore b/.gitignore index dad33a4..2710741 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ target/ dbt_modules/ logs/ + +dbt_packages/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 72468ba..0fefc4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ -# dbt_shopify (next release) +# dbt_shopify v0.6.0 +🎉 dbt v1.0.0 Compatibility 🎉 +## 🚨 Breaking Changes 🚨 +- Adjusts the `require-dbt-version` to now be within the range [">=1.0.0", "<2.0.0"]. Additionally, the package has been updated for dbt v1.0.0 compatibility. If you are using a dbt version <1.0.0, you will need to upgrade in order to leverage the latest version of the package. + - For help upgrading your package, I recommend reviewing this GitHub repo's Release Notes on what changes have been implemented since your last upgrade. + - For help upgrading your dbt project to dbt v1.0.0, I recommend reviewing dbt-labs [upgrading to 1.0.0 docs](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-1-0-0) for more details on what changes must be made. +- Upgrades the package dependency to refer to the latest `dbt_shopify_source`. Additionally, the latest `dbt_shopify_source` package has a dependency on the latest `dbt_fivetran_utils`. Further, the latest `dbt_fivetran_utils` package also has a dependency on `dbt_utils` [">=0.8.0", "<0.9.0"]. + - Please note, if you are installing a version of `dbt_utils` in your `packages.yml` that is not in the range above then you will encounter a package dependency error. + +- The `union_schemas` and `union_databases` variables have been replaced with `shopify_union_schemas` and `shopify_union_databases` respectively. This allows for multiple packages with the union ability to be used and not locked to a single variable that is used across packages. # dbt_shopify v0.1.0 -> v0.5.2 -Refer to the relevant release notes on the Github repository for specific details for the previous releases. Thank you! \ No newline at end of file +Refer to the relevant release notes on the Github repository for specific details for the previous releases. Thank you! diff --git a/README.md b/README.md index 95bdc7d..b77221c 100644 --- a/README.md +++ b/README.md @@ -1,4 +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) +[![Apache License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) # Shopify This package models Shopify data from [Fivetran's connector](https://fivetran.com/docs/applications/shopify). It uses data in the format described by [this ERD](https://fivetran.com/docs/applications/shopify#schemainformation). @@ -27,7 +27,7 @@ Include in your `packages.yml` ```yaml packages: - package: fivetran/shopify - version: [">=0.5.0", "<0.6.0"] + version: [">=0.6.0", "<0.7.0"] ``` ## Configuration @@ -44,7 +44,7 @@ vars: shopify_schema: your_schema_name ``` -If you have multiple Shopify connectors in Fivetran and would like to use this package on all of them simultaneously, we have provided functionality to do so. The package will union all of the data together and pass the unioned table into the transformations. You will be able to see which source it came from in the `source_relation` column of each model. To use this functionality, you will need to set either the `union_schemas` or `union_databases` variables: +If you have multiple Shopify connectors in Fivetran and would like to use this package on all of them simultaneously, we have provided functionality to do so. The package will union all of the data together and pass the unioned table into the transformations. You will be able to see which source it came from in the `source_relation` column of each model. To use this functionality, you will need to set either the `shopify_union_schemas` or `shopify_union_databases` variables: ```yml # dbt_project.yml @@ -53,8 +53,8 @@ If you have multiple Shopify connectors in Fivetran and would like to use this p config-version: 2 vars: - union_schemas: ['shopify_usa','shopify_canada'] # use this if the data is in different schemas/datasets of the same database/project - union_databases: ['shopify_usa','shopify_canada'] # use this if the data is in different databases/projects but uses the same schema name + shopify_union_schemas: ['shopify_usa','shopify_canada'] # use this if the data is in different schemas/datasets of the same database/project + shopify_union_databasesv: ['shopify_usa','shopify_canada'] # use this if the data is in different databases/projects but uses the same schema name ``` ### Add Passthrough Columns diff --git a/dbt_project.yml b/dbt_project.yml index 91acc75..cdb267b 100644 --- a/dbt_project.yml +++ b/dbt_project.yml @@ -1,7 +1,7 @@ name: 'shopify' -version: '0.5.2' +version: '0.6.0' config-version: 2 -require-dbt-version: [">=0.20.0"] +require-dbt-version: [">=1.0.0", "<2.0.0"] models: shopify: +schema: shopify diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt index dc77891..9edc95a 100644 --- a/integration_tests/requirements.txt +++ b/integration_tests/requirements.txt @@ -1,3 +1,6 @@ -dbt==0.20.1rc1 -dbt-spark==0.20.1rc1 -dbt-spark[PyHive]==0.20.1rc1 +dbt-snowflake==1.0.0 +dbt-bigquery==1.0.0 +dbt-redshift==1.0.0 +dbt-postgres==1.0.0 +dbt-spark==1.0.0 +dbt-spark[PyHive]==1.0.0 diff --git a/integration_tests/data/shopify_customer_data.csv b/integration_tests/seeds/shopify_customer_data.csv similarity index 100% rename from integration_tests/data/shopify_customer_data.csv rename to integration_tests/seeds/shopify_customer_data.csv diff --git a/integration_tests/data/shopify_order_adjustment_data.csv b/integration_tests/seeds/shopify_order_adjustment_data.csv similarity index 100% rename from integration_tests/data/shopify_order_adjustment_data.csv rename to integration_tests/seeds/shopify_order_adjustment_data.csv diff --git a/integration_tests/data/shopify_order_data.csv b/integration_tests/seeds/shopify_order_data.csv similarity index 100% rename from integration_tests/data/shopify_order_data.csv rename to integration_tests/seeds/shopify_order_data.csv diff --git a/integration_tests/data/shopify_order_line_data.csv b/integration_tests/seeds/shopify_order_line_data.csv similarity index 100% rename from integration_tests/data/shopify_order_line_data.csv rename to integration_tests/seeds/shopify_order_line_data.csv diff --git a/integration_tests/data/shopify_order_line_refund_data.csv b/integration_tests/seeds/shopify_order_line_refund_data.csv similarity index 100% rename from integration_tests/data/shopify_order_line_refund_data.csv rename to integration_tests/seeds/shopify_order_line_refund_data.csv diff --git a/integration_tests/data/shopify_product_data.csv b/integration_tests/seeds/shopify_product_data.csv similarity index 100% rename from integration_tests/data/shopify_product_data.csv rename to integration_tests/seeds/shopify_product_data.csv diff --git a/integration_tests/data/shopify_product_variant_data.csv b/integration_tests/seeds/shopify_product_variant_data.csv similarity index 100% rename from integration_tests/data/shopify_product_variant_data.csv rename to integration_tests/seeds/shopify_product_variant_data.csv diff --git a/integration_tests/data/shopify_refund_data.csv b/integration_tests/seeds/shopify_refund_data.csv similarity index 100% rename from integration_tests/data/shopify_refund_data.csv rename to integration_tests/seeds/shopify_refund_data.csv diff --git a/integration_tests/data/shopify_transaction_data.csv b/integration_tests/seeds/shopify_transaction_data.csv similarity index 100% rename from integration_tests/data/shopify_transaction_data.csv rename to integration_tests/seeds/shopify_transaction_data.csv diff --git a/packages.yml b/packages.yml index 2a75941..70e1eaa 100644 --- a/packages.yml +++ b/packages.yml @@ -1,3 +1,3 @@ packages: - - package: fivetran/shopify_source - version: [">=0.5.0", "<0.6.0"] +- package: fivetran/shopify_source + version: [">=0.6.0", "<0.7.0"]