From 802ee030eaf48f61f9da21fdbec9b56590f4ebf3 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 13 Oct 2021 19:04:17 -0600 Subject: [PATCH 01/18] TSQL has top instead of limit --- dbt/include/sqlserver/macros/materializations/test.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index 6b3cb0ee..f1540fa1 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -1,5 +1,6 @@ {% macro sqlserver__get_test_sql(main_sql, fail_calc, warn_if, error_if, limit) -%} select + {{ "top (" ~ limit ~ ')' if limit != none }} {{ fail_calc }} as failures, case when {{ fail_calc }} {{ warn_if }} then 'true' else 'false' end as should_warn, @@ -7,6 +8,5 @@ then 'true' else 'false' end as should_error from ( {{ main_sql }} - {{ "limit " ~ limit if limit != none }} ) dbt_internal_test {%- endmacro %} \ No newline at end of file From c5a8c9b8d76baad70d0983c71324efff71621a0c Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 13 Oct 2021 19:07:54 -0600 Subject: [PATCH 02/18] initial copy from global_project --- .../macros/materializations/test.sql | 53 ++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index f1540fa1..26cc87eb 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -9,4 +9,55 @@ from ( {{ main_sql }} ) dbt_internal_test -{%- endmacro %} \ No newline at end of file +{%- endmacro %} + +{%- materialization test, adapter='sqlserver' -%} + + {% set relations = [] %} + + {% if should_store_failures() %} + + {% set identifier = model['alias'] %} + {% set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %} + {% set target_relation = api.Relation.create( + identifier=identifier, schema=schema, database=database, type='table') -%} %} + + {% if old_relation %} + {% do adapter.drop_relation(old_relation) %} + {% endif %} + + {% call statement(auto_begin=True) %} + {{ create_table_as(False, target_relation, sql) }} + {% endcall %} + + {% do relations.append(target_relation) %} + + {% set main_sql %} + select * + from {{ target_relation }} + {% endset %} + + {{ adapter.commit() }} + + {% else %} + + {% set main_sql = sql %} + + {% endif %} + + {% set limit = config.get('limit') %} + {% set fail_calc = config.get('fail_calc') %} + {% set warn_if = config.get('warn_if') %} + {% set error_if = config.get('error_if') %} + + {% call statement('main', fetch_result=True) -%} + + {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit)}} + + {%- endcall %} + + + + {{ return({'relations': relations}) }} + +{%- endmaterialization -%} \ No newline at end of file From b28282dd8385b41caa2a01dfd0439482e4a675bb Mon Sep 17 00:00:00 2001 From: swanderz Date: Thu, 14 Oct 2021 12:31:38 -0600 Subject: [PATCH 03/18] add unique field property --- dbt/adapters/sqlserver/connections.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dbt/adapters/sqlserver/connections.py b/dbt/adapters/sqlserver/connections.py index 59a75e77..3ec0ee53 100644 --- a/dbt/adapters/sqlserver/connections.py +++ b/dbt/adapters/sqlserver/connections.py @@ -79,6 +79,10 @@ def _connection_keys(self): "trust_cert" ) + @property + def unique_field(self): + return self.host + def convert_bytes_to_mswindows_byte_string(value: bytes) -> bytes: """ From 42ff6ea937f65e3d688a0f76fd3c03641e73f534 Mon Sep 17 00:00:00 2001 From: swanderz Date: Thu, 14 Oct 2021 12:37:39 -0600 Subject: [PATCH 04/18] reduce boilerplate --- .../macros/materializations/seed/seed.sql | 36 ++----------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/dbt/include/sqlserver/macros/materializations/seed/seed.sql b/dbt/include/sqlserver/macros/materializations/seed/seed.sql index 743005a1..6ff37739 100644 --- a/dbt/include/sqlserver/macros/materializations/seed/seed.sql +++ b/dbt/include/sqlserver/macros/materializations/seed/seed.sql @@ -13,40 +13,8 @@ {{ return(batch_size) }} {% endmacro %} -{% macro sqlserver__basic_load_csv_rows(model, max_batch_size, agate_table) %} - {% set cols_sql = get_seed_column_quoted_csv(model, agate_table.column_names) %} - - {% set batch_size = calc_batch_size(cols_sql|length, max_batch_size) %} - {% set bindings = [] %} - {% set statements = [] %} - - {% for chunk in agate_table.rows | batch(batch_size) %} - {% set bindings = [] %} - - {% for row in chunk %} - {% set _ = bindings.extend(row) %} - {% endfor %} - - {% set sql %} - insert into {{ this.render() }} ({{ cols_sql }}) values - {% for row in chunk -%} - ({%- for column in agate_table.column_names -%} - ? - {%- if not loop.last%},{%- endif %} - {%- endfor -%}) - {%- if not loop.last%},{%- endif %} - {%- endfor %} - {% endset %} - - {% set _ = adapter.add_query(sql, bindings=bindings, abridge_sql_log=True) %} - - {% if loop.index0 == 0 %} - {% set _ = statements.append(sql) %} - {% endif %} - {% endfor %} - - {# Return SQL so we can render it out into the compiled files #} - {{ return(statements[0]) }} +{% macro sqlserver__get_binding_char() %} + {{ return('?') }} {% endmacro %} {% macro sqlserver__load_csv_rows(model, agate_table) %} From 826f5b26769a32d2fd24e282045e707304705efa Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 3 Nov 2021 11:15:40 -0700 Subject: [PATCH 05/18] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 18160bd0..d5df0d86 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def _dbt_sqlserver_version(): packages=find_packages(), include_package_data=True, install_requires=[ - "dbt-core~=0.20.0", + "dbt-core==0.21.1rc1", "pyodbc~=4.0.31", "azure-identity>=1.6.0", ] From b0fcba0f50d6c23fd41bcaa14299af5b456cd9ce Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 3 Nov 2021 11:27:12 -0700 Subject: [PATCH 06/18] adopt new paradigm add back semi-colon dropped in core add back dynamic batch sizing additional merge needs semi-colon temp disable another macro improve naming comment forgot args reorder docs more docs re-enable user az login test --- CHANGELOG.md | 10 ++++ .../macros/materializations/seed/seed.sql | 49 +++++++++++++++++-- dbt/include/sqlserver/macros/merge.sql | 18 +++++++ 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 dbt/include/sqlserver/macros/merge.sql diff --git a/CHANGELOG.md b/CHANGELOG.md index a14d8f0b..7ae0e50c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +### v0.21.0 + +Please see [dbt-core v0.21.0 release notes](https://github.com/dbt-labs/dbt-core/releases/tag/v0.21.0) for upstream changes + +#### fixes + +- in dbt-sqlserver v0.20.0, users couldn't use some out of the box tests, such as accepted_values. users can now also use CTEs in their ~bespoke~ custom data tests +- fixes issue with changing column types in incremental table column type [#152](https://github.com/dbt-msft/dbt-sqlserver/issue/152) [#169](https://github.com/dbt-msft/dbt-sqlserver/pull/169) +- workaround for Azure CLI token expires after one hour. Now we get new tokens for every transaction. [#156](https://github.com/dbt-msft/dbt-sqlserver/issue/156) [#158](https://github.com/dbt-msft/dbt-sqlserver/pull/158) + ### v0.20.1 #### fixes: diff --git a/dbt/include/sqlserver/macros/materializations/seed/seed.sql b/dbt/include/sqlserver/macros/materializations/seed/seed.sql index 6ff37739..23035890 100644 --- a/dbt/include/sqlserver/macros/materializations/seed/seed.sql +++ b/dbt/include/sqlserver/macros/materializations/seed/seed.sql @@ -17,7 +17,50 @@ {{ return('?') }} {% endmacro %} +{% macro sqlserver__get_batch_size() %} + {{ return(400) }} +{% endmacro %} + +{% macro basic_load_csv_rows(model, batch_size, agate_table) %} + + {% set cols_sql = get_seed_column_quoted_csv(model, agate_table.column_names) %} + {% set bindings = [] %} + + {% set statements = [] %} + + {% for chunk in agate_table.rows | batch(batch_size) %} + {% set bindings = [] %} + + {% for row in chunk %} + {% do bindings.extend(row) %} + {% endfor %} + + {% set sql %} + insert into {{ this.render() }} ({{ cols_sql }}) values + {% for row in chunk -%} + ({%- for column in agate_table.column_names -%} + {{ get_binding_char() }} + {%- if not loop.last%},{%- endif %} + {%- endfor -%}) + {%- if not loop.last%},{%- endif %} + {%- endfor %} + {% endset %} + + {% do adapter.add_query(sql, bindings=bindings, abridge_sql_log=True) %} + + {% if loop.index0 == 0 %} + {% do statements.append(sql) %} + {% endif %} + {% endfor %} + + {# Return SQL so we can render it out into the compiled files #} + {{ return(statements[0]) }} +{% endmacro %} + {% macro sqlserver__load_csv_rows(model, agate_table) %} - {% set max_batch_size = var("max_batch_size", 400) %} - {{ return(sqlserver__basic_load_csv_rows(model, max_batch_size, agate_table) )}} -{% endmacro %} \ No newline at end of file + {% set max_batch_size = get_batch_size() %} + {% set cols_sql = get_seed_column_quoted_csv(model, agate_table.column_names) %} + {% set batch_size = calc_batch_size(cols_sql|length, max_batch_size) %} + + {{ return(basic_load_csv_rows(model, batch_size, agate_table) )}} +{% endmacro %} diff --git a/dbt/include/sqlserver/macros/merge.sql b/dbt/include/sqlserver/macros/merge.sql new file mode 100644 index 00000000..f498dfeb --- /dev/null +++ b/dbt/include/sqlserver/macros/merge.sql @@ -0,0 +1,18 @@ + {# global project no longer includes semi-colons in merge statements, so + default macro are invoked below w/ a semi-colons after it. + more context: + https://github.com/dbt-labs/dbt-core/pull/3510 + https://getdbt.slack.com/archives/C50NEBJGG/p1636045535056600 + #} + +{% macro sqlserver__get_merge_sql(target, source, unique_key, dest_columns, predicates) %} + {{ default__get_merge_sql(target, source, unique_key, dest_columns, predicates) }}; +{% endmacro %} + +{% macro sqlserver__get_insert_overwrite_merge_sql(target, source, dest_columns, predicates, include_sql_header) %} + {{ default__get_insert_overwrite_merge_sql(target, source, dest_columns, predicates, include_sql_header) }}; +{% endmacro %} + +{% macro sqlserver__snapshot_merge_sql(target, source, insert_cols) %} + {{ default__snapshot_merge_sql(target, source, insert_cols) }}; +{% endmacro %} \ No newline at end of file From 515b60f9733fd7f7ecc498f475dd8a186e2a9351 Mon Sep 17 00:00:00 2001 From: David Larsen Date: Fri, 15 Oct 2021 15:25:23 -0400 Subject: [PATCH 07/18] add sqlserver__alter_column_type macro --- dbt/include/sqlserver/macros/adapters.sql | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dbt/include/sqlserver/macros/adapters.sql b/dbt/include/sqlserver/macros/adapters.sql index b5af3044..fdf87d1e 100644 --- a/dbt/include/sqlserver/macros/adapters.sql +++ b/dbt/include/sqlserver/macros/adapters.sql @@ -225,3 +225,18 @@ {%- set result = "CONVERT(DATETIME2, '" ~ timestamp ~ "')" -%} {{ return(result) }} {%- endmacro %} + +{% macro sqlserver__alter_column_type(relation, column_name, new_column_type) %} + + {%- set tmp_column = column_name + "__dbt_alter" -%} + + {% call statement('alter_column_type') -%} + + alter {{ relation.type }} {{ relation }} add {{ tmp_column }} {{ new_column_type }}; + update {{ relation }} set {{ tmp_column }} = {{ column_name }}; + alter {{ relation.type }} {{ relation }} drop column {{ column_name }}; + exec sp_rename '{{ relation | replace('"', '') }}.{{ tmp_column }}', '{{ column_name }}', 'column' + + {%- endcall -%} + +{% endmacro %} From 7d6781989e1a1cfb15f2a0401309d8058fa1f6c1 Mon Sep 17 00:00:00 2001 From: swanderz Date: Fri, 5 Nov 2021 15:05:04 -0700 Subject: [PATCH 08/18] long-standing typo --- dbt/include/sqlserver/macros/adapters.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/include/sqlserver/macros/adapters.sql b/dbt/include/sqlserver/macros/adapters.sql index b5af3044..a644218b 100644 --- a/dbt/include/sqlserver/macros/adapters.sql +++ b/dbt/include/sqlserver/macros/adapters.sql @@ -166,7 +166,7 @@ {{ sqlserver__create_clustered_columnstore_index(relation) }} {% endif %} -{% endmacro %}_ +{% endmacro %} {% macro sqlserver__insert_into_from(to_relation, from_relation) -%} SELECT * INTO {{ to_relation }} FROM {{ from_relation }} From cee50d726060060fe3d85a8b69374e37236c6208 Mon Sep 17 00:00:00 2001 From: swanderz Date: Fri, 5 Nov 2021 17:12:51 -0700 Subject: [PATCH 09/18] hard copy existing mat --- dbt/include/sqlserver/macros/materializations/test.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index 26cc87eb..ea150a57 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -55,8 +55,6 @@ {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit)}} {%- endcall %} - - {{ return({'relations': relations}) }} From 7e92daa05209a98f87c6d54ff14acf31c8f2e585 Mon Sep 17 00:00:00 2001 From: swanderz Date: Fri, 5 Nov 2021 17:33:29 -0700 Subject: [PATCH 10/18] always store results; but drop them unless specified to store --- .../macros/materializations/test.sql | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index ea150a57..7ecc2437 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -15,35 +15,26 @@ {% set relations = [] %} - {% if should_store_failures() %} + {% set identifier = model['alias'] %} + {% set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %} + {% set target_relation = api.Relation.create( + identifier=identifier, schema=schema, database=database, type='table') -%} %} - {% set identifier = model['alias'] %} - {% set old_relation = adapter.get_relation(database=database, schema=schema, identifier=identifier) %} - {% set target_relation = api.Relation.create( - identifier=identifier, schema=schema, database=database, type='table') -%} %} - - {% if old_relation %} - {% do adapter.drop_relation(old_relation) %} - {% endif %} - - {% call statement(auto_begin=True) %} - {{ create_table_as(False, target_relation, sql) }} - {% endcall %} - - {% do relations.append(target_relation) %} + {% if old_relation %} + {% do adapter.drop_relation(old_relation) %} + {% endif %} - {% set main_sql %} - select * - from {{ target_relation }} - {% endset %} - - {{ adapter.commit() }} + {% call statement(auto_begin=True) %} + {{ create_table_as(False, target_relation, sql) }} + {% endcall %} + + {% set main_sql %} + select * + from {{ target_relation }} + {% endset %} - {% else %} - - {% set main_sql = sql %} + {{ adapter.commit() }} - {% endif %} {% set limit = config.get('limit') %} {% set fail_calc = config.get('fail_calc') %} @@ -55,6 +46,12 @@ {{ get_test_sql(main_sql, fail_calc, warn_if, error_if, limit)}} {%- endcall %} + + {% if should_store_failures() %} + {% do relations.append(target_relation) %} + {% elif not should_store_failures() %} + {% do adapter.drop_relation(target_relation) %} + {% endif %} {{ return({'relations': relations}) }} From 6e31ad310f3193a9bb77a00f3432d0cb2e0450d6 Mon Sep 17 00:00:00 2001 From: swanderz Date: Fri, 5 Nov 2021 17:56:47 -0700 Subject: [PATCH 11/18] temp disable --- test/integration/azuresql.dbtspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/azuresql.dbtspec b/test/integration/azuresql.dbtspec index daef69a8..71311d80 100644 --- a/test/integration/azuresql.dbtspec +++ b/test/integration/azuresql.dbtspec @@ -38,5 +38,5 @@ sequences: test_dbt_snapshot_strategy_timestamp: snapshot_strategy_timestamp test_dbt_snapshot_strategy_check_cols: snapshot_strategy_check_cols test_dbt_data_test: data_test - test_dbt_schema_test: schema_test + # test_dbt_schema_test: schema_test # test_dbt_ephemeral_data_tests: data_test_ephemeral_models From 01a3a06b89ed9d00d65420aae32c5f52e6f7472e Mon Sep 17 00:00:00 2001 From: swanderz Date: Fri, 5 Nov 2021 17:58:56 -0700 Subject: [PATCH 12/18] bump version --- dbt/adapters/sqlserver/__version__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py index 1b34671e..cebffb39 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.20.1' +version = '0.21.0rc1' diff --git a/setup.py b/setup.py index d5df0d86..afbac43a 100644 --- a/setup.py +++ b/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.20' +dbt_version = '0.21' # 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): From f23f7d885a1964e60824a85b2ec189a3e37dc659 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 10 Nov 2021 20:36:09 -0800 Subject: [PATCH 13/18] setuptools instead --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index afbac43a..688d7595 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ #!/usr/bin/env python -from setuptools import find_packages -from distutils.core import setup +from setuptools import find_namespace_packages, setup import os import re @@ -47,7 +46,7 @@ def _dbt_sqlserver_version(): author="Mikael Ene", author_email="mikael.ene@eneanalytics.com", url="https://github.com/mikaelene/dbt-sqlserver", - packages=find_packages(), + packages=find_namespace_packages(include=['dbt', 'dbt.*']), include_package_data=True, install_requires=[ "dbt-core==0.21.1rc1", From 34aa9fd117e890950ba1b6d18182e63804a0b559 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 10 Nov 2021 20:36:16 -0800 Subject: [PATCH 14/18] lint --- dbt/include/sqlserver/macros/materializations/test.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index 7ecc2437..3c6be121 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -23,7 +23,7 @@ {% if old_relation %} {% do adapter.drop_relation(old_relation) %} {% endif %} - + {% call statement(auto_begin=True) %} {{ create_table_as(False, target_relation, sql) }} {% endcall %} @@ -32,9 +32,9 @@ select * from {{ target_relation }} {% endset %} - + {{ adapter.commit() }} - + {% set limit = config.get('limit') %} {% set fail_calc = config.get('fail_calc') %} @@ -52,7 +52,7 @@ {% elif not should_store_failures() %} {% do adapter.drop_relation(target_relation) %} {% endif %} - + {{ return({'relations': relations}) }} -{%- endmaterialization -%} \ No newline at end of file +{%- endmaterialization -%} From bd3c221275edb3bed5cc2c22b2b8c1694e4f4e66 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 10 Nov 2021 20:46:46 -0800 Subject: [PATCH 15/18] force create schema --- dbt/include/sqlserver/macros/materializations/test.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dbt/include/sqlserver/macros/materializations/test.sql b/dbt/include/sqlserver/macros/materializations/test.sql index 3c6be121..8942c4cc 100644 --- a/dbt/include/sqlserver/macros/materializations/test.sql +++ b/dbt/include/sqlserver/macros/materializations/test.sql @@ -20,8 +20,11 @@ {% set target_relation = api.Relation.create( identifier=identifier, schema=schema, database=database, type='table') -%} %} + {% if old_relation %} - {% do adapter.drop_relation(old_relation) %} + {% do adapter.drop_relation(old_relation) %} + {% elif not old_relation %} + {% do adapter.create_schema(target_relation) %} {% endif %} {% call statement(auto_begin=True) %} From e73263be3c54b00e2f1dce1d62abca3e7df39eb4 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 10 Nov 2021 20:58:40 -0800 Subject: [PATCH 16/18] release cut 2 --- dbt/adapters/sqlserver/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py index cebffb39..b692a296 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.21.0rc1' +version = '0.21.0rc2' From c77f977b6d946db6fc28fc668b8a43e4a0fe55e3 Mon Sep 17 00:00:00 2001 From: swanderz Date: Wed, 10 Nov 2021 22:20:09 -0800 Subject: [PATCH 17/18] re-enable test --- test/integration/azuresql.dbtspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/azuresql.dbtspec b/test/integration/azuresql.dbtspec index 71311d80..daef69a8 100644 --- a/test/integration/azuresql.dbtspec +++ b/test/integration/azuresql.dbtspec @@ -38,5 +38,5 @@ sequences: test_dbt_snapshot_strategy_timestamp: snapshot_strategy_timestamp test_dbt_snapshot_strategy_check_cols: snapshot_strategy_check_cols test_dbt_data_test: data_test - # test_dbt_schema_test: schema_test + test_dbt_schema_test: schema_test # test_dbt_ephemeral_data_tests: data_test_ephemeral_models From bbe08139a8fa8901ec94166733456635004a9610 Mon Sep 17 00:00:00 2001 From: swanderz Date: Mon, 29 Nov 2021 09:38:56 -0800 Subject: [PATCH 18/18] bump version --- dbt/adapters/sqlserver/__version__.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py index b692a296..17fea6d1 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.21.0rc2' +version = '0.21.0' diff --git a/setup.py b/setup.py index 688d7595..a25c472b 100644 --- a/setup.py +++ b/setup.py @@ -49,8 +49,8 @@ def _dbt_sqlserver_version(): packages=find_namespace_packages(include=['dbt', 'dbt.*']), include_package_data=True, install_requires=[ - "dbt-core==0.21.1rc1", + "dbt-core~=0.21.1", "pyodbc~=4.0.31", - "azure-identity>=1.6.0", + "azure-identity>=1.7.0", ] )