Merge pull request #141 from dbt-msft/v0.20.0

v0.20.0

Author: dataders

.circleci/config.yml

@@ -42,7 +42,8 @@ jobs:
       - checkout
       - run: &install-dbt-sqlserver
           name: "install dbt-sqlserver"
-          command: pip install .
+          command: |
+            pip install .
       - run:
           name: wait for SQL Server container to set up
           command: sleep 30

CHANGELOG.md

@@ -2,14 +2,16 @@
 
 ### v0.20.0
 
-#### features
+#### features:
 
+- dbt-sqlserver will now work with dbt `v0.20.0`. Please see dbt's [upgrading to `v0.20.0` docs](https://docs.getdbt.com/docs/guides/migration-guide/upgrading-to-0-20-0) for more info.
 - users can now declare a custom `max_batch_size` in the project configuration to set the batch size used by the seed file loader. [#127](https://github.com/dbt-msft/dbt-sqlserver/issues/127) and [#151](https://github.com/dbt-msft/dbt-sqlserver/pull/151) thanks [@jacobm001](https://github.com/jacobm001)
 
 #### under the hood
 
 - `sqlserver__load_csv_rows` now has a safety provided by `calc_batch_size()` to ensure the insert statements won't exceed SQL Server's 2100 parameter limit. [#127](https://github.com/dbt-msft/dbt-sqlserver/issues/127) and [#151](https://github.com/dbt-msft/dbt-sqlserver/pull/151) thanks [@jacobm001](https://github.com/jacobm001)
-
+- switched to using a `MANIFEST.in` to declare which files should be included
+- updated `pyodbc` and `azure-identity` dependencies to their latest versions 
 ### v0.19.2
 
 #### fixes

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include dbt/include *.sql *.yml *.md

dbt/adapters/sqlserver/__version__.py

@@ -1 +1 @@
-version = '0.19.2'
+version = '0.20.0'

dbt/include/sqlserver/macros/materializations/test.sql

@@ -0,0 +1,12 @@
+{% macro sqlserver__get_test_sql(main_sql, fail_calc, warn_if, error_if, limit) -%}
+    select
+      {{ fail_calc }} as failures,
+      case when {{ fail_calc }} {{ warn_if }}
+        then 'true' else 'false' end as should_warn,
+      case when {{ fail_calc }} {{ error_if }}
+        then 'true' else 'false' end as should_error
+    from (
+      {{ main_sql }}
+      {{ "limit " ~ limit if limit != none }}
+    ) dbt_internal_test
+{%- endmacro %}

dev_requirements.txt

@@ -1,5 +1,5 @@
 black==20.8b1
-pytest-dbt-adapter==0.5.1
+pytest-dbt-adapter~=0.5.1
 pytest==6.2.2
 tox==3.2.0
 flake8==3.5.0

setup.py

@@ -28,7 +28,7 @@ def _dbt_sqlserver_version():
 package_version = _dbt_sqlserver_version()
 description = """A sqlserver adapter plugin for dbt (data build tool)"""
 
-dbt_version = '0.19'
+dbt_version = '0.20'
 # the package version should be the dbt version, with maybe some things on the
 # ends of it. (0.18.1 vs 0.18.1a1, 0.18.1.1, ...)
 if not package_version.startswith(dbt_version):
@@ -48,17 +48,10 @@ def _dbt_sqlserver_version():
     author_email="[email protected]",
     url="https://github.com/mikaelene/dbt-sqlserver",
     packages=find_packages(),
-    package_data={
-        "dbt": [
-            "include/sqlserver/dbt_project.yml",
-            "include/sqlserver/macros/*.sql",
-            "include/sqlserver/macros/**/*.sql",
-            "include/sqlserver/macros/**/**/*.sql",
-        ]
-    },
+    include_package_data=True,
     install_requires=[
-        "dbt-core~=0.19.0",
-        "pyodbc>=4.0.27",
-        "azure-identity>=1.4.0",
+        "dbt-core~=0.20.0",
+        "pyodbc~=4.0.31",
+        "azure-identity>=1.6.0",
     ]
 )

tox.ini

@@ -10,4 +10,4 @@ passenv =
   DBT_AZURESQL_UID
 deps =
   pytest~=6.2.2
-  pytest-dbt-adapter~=0.4.0
+  pytest-dbt-adapter~=0.5.0