From cfa475f559effbbe787f1417e4639b897397db1b Mon Sep 17 00:00:00 2001 From: Alieu Sanneh Date: Thu, 18 Mar 2021 15:15:30 -0700 Subject: [PATCH 1/8] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c510c119..311e640a 100644 --- a/setup.py +++ b/setup.py @@ -54,6 +54,7 @@ def _dbt_synapse_version(): "include/synapse/dbt_project.yml", "include/synapse/macros/*.sql", "include/synapse/macros/**/*.sql", + "include/sqlserver/macros/**/**/*.sql", ] }, install_requires=[ From 6775746ce3c81dfb1e491a7bee2b666f62b44ae4 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:25:21 -0700 Subject: [PATCH 2/8] MANIFEST for better recursive inclusion --- MANIFEST.in | 1 + setup.py | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..39795f41 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1 @@ +recursive-include dbt/include *.sql *.yml *.md \ No newline at end of file diff --git a/setup.py b/setup.py index 311e640a..47306f42 100644 --- a/setup.py +++ b/setup.py @@ -49,14 +49,7 @@ def _dbt_synapse_version(): author_email="swanson.anders@gmail.com", url="https://github.com/dbt-msft/dbt-synapse", packages=find_packages(), - package_data={ - "dbt": [ - "include/synapse/dbt_project.yml", - "include/synapse/macros/*.sql", - "include/synapse/macros/**/*.sql", - "include/sqlserver/macros/**/**/*.sql", - ] - }, + include_package_data=True, install_requires=[ "dbt-sqlserver==0.19.0.1", ] From 4157230c2d0313c5e9a0c9c5414953b34a964f6b Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:26:15 -0700 Subject: [PATCH 3/8] bump version --- dbt/adapters/synapse/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/adapters/synapse/__version__.py b/dbt/adapters/synapse/__version__.py index f8bf85e8..558d887b 100644 --- a/dbt/adapters/synapse/__version__.py +++ b/dbt/adapters/synapse/__version__.py @@ -1 +1 @@ -version = '0.19.0' +version = '0.19.0.1' From ecbe0eb23d4c40bf9848bf1eb9edb0c85459c26b Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:31:22 -0700 Subject: [PATCH 4/8] update contrib --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32a2ea09..048df987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v.0.19.0.1 + +### Fixes + +- Resolves bug where snapshot and seeds materializations weren't working correctly [#45](https://github.com/dbt-msft/dbt-synapse/pull/45) thanks [@alieus] ## v.0.19.0 ### BREAKING CHANGES diff --git a/setup.py b/setup.py index 47306f42..b76c5a3e 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ package_name = "dbt-synapse" -authors_list = ["Nandan Hegde", "Anders Swanson"] +authors_list = ["Nandan Hegde", "Chaerin Lee", "Alieu Sanneh", "Anders Swanson"] # get this from a separate file From 9c57098e2e957854daf26bd9965fa0a8930071f4 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:38:34 -0700 Subject: [PATCH 5/8] unpin dep --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b76c5a3e..f119d22b 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,6 @@ def _dbt_synapse_version(): packages=find_packages(), include_package_data=True, install_requires=[ - "dbt-sqlserver==0.19.0.1", + "dbt-sqlserver~=0.19.0", ] ) From 2963b49a9581e189dc38c29f77e03dd51a882b6d Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:40:52 -0700 Subject: [PATCH 6/8] typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 048df987..01315e40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ - dbt v0.19.0 ([release notes](https://github.com/fishtown-analytics/dbt/releases/tag/v0.19.0)) and - dbt-sqlserver v0.19.0.1 & v0.19.0 ([release](https://github.com/dbt-msft/dbt-sqlserver/releases/tag/v0.19.0.1) [notes](https://github.com/dbt-msft/dbt-sqlserver/releases/tag/v0.19.0)) -## Under the hood +### Under the hood - the snapshot materialization, except for the [`MERGE` workaround](dbt/include/synapse/macros/materializations/snapshot/snapshot_merge.sql), now depends entirely on dbt-core's global project. Made possible due to tempdb.INFO_SCHEMA workaround [#42](https://github.com/dbt-msft/dbt-synapse/pull/42) - make the adapter inheirit from `dbt-sqlserver` [#32](https://github.com/dbt-msft/dbt-synapse/pull/32) [#33](https://github.com/dbt-msft/dbt-synapse/pull/33) thanks [@jtcohen6](https://github.com/jtcohen6) [@chaerinlee1](https://github.com/chaerinlee1) - the snapshot materialization, now depends entirely on dbt-core's global project. See dbt-sqlserver release notes for more info [#44](https://github.com/dbt-msft/dbt-synapse/pull/44) From 5bdfd83dbbfd9923f06b21cb2598be15c3cbab3a Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:42:31 -0700 Subject: [PATCH 7/8] unpin specific patch --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01315e40..ff330efa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ ### Fixes - Resolves bug where snapshot and seeds materializations weren't working correctly [#45](https://github.com/dbt-msft/dbt-synapse/pull/45) thanks [@alieus] + +### Under the hood + +- `dbt-synapse` will allow all patches to `dbt-sqlserver` version 0.19 ## v.0.19.0 ### BREAKING CHANGES From 96a0a29ef87fe6e78c48e68a002ebec41f11fc71 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Fri, 19 Mar 2021 09:47:51 -0700 Subject: [PATCH 8/8] hotfix for agate dep issue --- CHANGELOG.md | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff330efa..b2aced8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ ### Under the hood - `dbt-synapse` will allow all patches to `dbt-sqlserver` version 0.19 +- Per issue with `pyICU` package ([fishtown-analytics/dbt/#3161](https://github.com/fishtown-analytics/dbt/pull/3161)), temporarily pin agate to between `1.6.0` and `1.6.2`, inclusive, until `dbt` `0.19.1` is released. ## v.0.19.0 ### BREAKING CHANGES diff --git a/setup.py b/setup.py index f119d22b..f8de03a0 100644 --- a/setup.py +++ b/setup.py @@ -52,5 +52,6 @@ def _dbt_synapse_version(): include_package_data=True, install_requires=[ "dbt-sqlserver~=0.19.0", + "agate>=1.6,<1.6.2" ] )