From 21df00df0c13b9e152525c76e095fa33ff21eb12 Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 13:43:02 +0100 Subject: [PATCH 01/18] Bumped 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 6a7765be..84c07455 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.18.1' \ No newline at end of file +version = '0.19.0' \ No newline at end of file diff --git a/setup.py b/setup.py index 6fdce2d3..d42688ac 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.18.1' +dbt_version = '0.19.0' # 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 e597a4a939955695a9889abbd1c09350697d4bb4 Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 14:20:20 +0100 Subject: [PATCH 02/18] Added get_response to comply with changes in 0.19.0 --- dbt/adapters/sqlserver/connections.py | 27 +++++++++---- .../materializations/snapshot/strategies.sql | 38 ------------------- 2 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dbt/adapters/sqlserver/connections.py b/dbt/adapters/sqlserver/connections.py index 35027fab..7348b9ab 100644 --- a/dbt/adapters/sqlserver/connections.py +++ b/dbt/adapters/sqlserver/connections.py @@ -10,6 +10,7 @@ import dbt.exceptions from dbt.adapters.base import Credentials from dbt.adapters.sql import SQLConnectionManager +from dbt.contracts.connection import AdapterResponse from azure.core.credentials import AccessToken from azure.identity import AzureCliCredential, DefaultAzureCredential @@ -347,7 +348,7 @@ def add_query(self, sql, auto_begin=True, bindings=None, abridge_sql_log=False): logger.debug( "SQL status: {} in {:0.2f} seconds".format( - self.get_status(cursor), (time.time() - pre) + self.get_response(cursor), (time.time() - pre) ) ) @@ -358,16 +359,26 @@ def get_credentials(cls, credentials): return credentials @classmethod - def get_status(cls, cursor): - if cursor.rowcount == -1: - status = "OK" - else: - status = str(cursor.rowcount) - return status + def get_response(cls, cursor) -> AdapterResponse: + #message = str(cursor.statusmessage) + message = 'OK' + rows = cursor.rowcount + #status_message_parts = message.split() if message is not None else [] + #status_messsage_strings = [ + # part + # for part in status_message_parts + # if not part.isdigit() + #] + #code = ' '.join(status_messsage_strings) + return AdapterResponse( + _message=message, + #code=code, + rows_affected=rows + ) def execute(self, sql, auto_begin=True, fetch=False): _, cursor = self.add_query(sql, auto_begin) - status = self.get_status(cursor) + status = self.get_response(cursor) if fetch: table = self.get_result_from_cursor(cursor) else: diff --git a/dbt/include/sqlserver/macros/materializations/snapshot/strategies.sql b/dbt/include/sqlserver/macros/materializations/snapshot/strategies.sql index 812f63fc..b728adb0 100644 --- a/dbt/include/sqlserver/macros/materializations/snapshot/strategies.sql +++ b/dbt/include/sqlserver/macros/materializations/snapshot/strategies.sql @@ -4,41 +4,3 @@ {% endfor %}), 2) {% endmacro %} -{% macro snapshot_check_strategy(node, snapshotted_rel, current_rel, config, target_exists) %} - {% set check_cols_config = config['check_cols'] %} - {% set primary_key = config['unique_key'] %} - {% set updated_at = snapshot_get_time() %} - - {% if check_cols_config == 'all' %} - {% set check_cols = get_columns_in_query(node['injected_sql']) %} - {% elif check_cols_config is iterable and (check_cols_config | length) > 0 %} - {% set check_cols = check_cols_config %} - {% else %} - {% do exceptions.raise_compiler_error("Invalid value for 'check_cols': " ~ check_cols_config) %} - {% endif %} - - {% set row_changed_expr -%} - ( - {% for col in check_cols %} - {{ snapshotted_rel }}.{{ col }} != {{ current_rel }}.{{ col }} - or - ( - (({{ snapshotted_rel }}.{{ col }} is null) and not ({{ current_rel }}.{{ col }} is null)) - or - ((not {{ snapshotted_rel }}.{{ col }} is null) and ({{ current_rel }}.{{ col }} is null)) - ) - {%- if not loop.last %} or {% endif %} - - {% endfor %} - ) - {%- endset %} - - {% set scd_id_expr = sqlserver__snapshot_hash_arguments([primary_key, updated_at]) %} - - {% do return({ - "unique_key": primary_key, - "updated_at": updated_at, - "row_changed": row_changed_expr, - "scd_id": scd_id_expr - }) %} -{% endmacro %} \ No newline at end of file From a7d7bfbe6cd858b95dcbd081ffbe115025039404 Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 14:23:34 +0100 Subject: [PATCH 03/18] Bumbed dbt version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d42688ac..b5664da2 100644 --- a/setup.py +++ b/setup.py @@ -56,5 +56,5 @@ def _dbt_sqlserver_version(): "include/sqlserver/macros/**/**/*.sql", ] }, - install_requires=["dbt-core~=0.18.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0"], + install_requires=["dbt-core~=0.19.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0"], ) \ No newline at end of file From eb2e6dbfd0d5aac7d2e00181fd18a352d4adb3eb Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 15:07:34 +0100 Subject: [PATCH 04/18] Added snapshot_merge.sql to fix changes in dbt-core. This can be deleted if https://github.com/fishtown-analytics/dbt/pull/3004 is approved. --- .../snapshot/snapshot_merge.sql | 19 +++++++++++++++++++ requirements.txt | 2 +- setup.py | 6 +++++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql diff --git a/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql b/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql new file mode 100644 index 00000000..205fa7d2 --- /dev/null +++ b/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql @@ -0,0 +1,19 @@ +{% macro sqlserver__snapshot_merge_sql(target, source, insert_cols) -%} + {%- set insert_cols_csv = insert_cols | join(', ') -%} + + merge into {{ target }} as DBT_INTERNAL_DEST + using {{ source }} as DBT_INTERNAL_SOURCE + on DBT_INTERNAL_SOURCE.dbt_scd_id = DBT_INTERNAL_DEST.dbt_scd_id + + when matched + and DBT_INTERNAL_DEST.dbt_valid_to is null + and DBT_INTERNAL_SOURCE.dbt_change_type in ('update', 'delete') + then update + set dbt_valid_to = DBT_INTERNAL_SOURCE.dbt_valid_to + + when not matched + and DBT_INTERNAL_SOURCE.dbt_change_type = 'insert' + then insert ({{ insert_cols_csv }}) + values ({{ insert_cols_csv }}) + ; +{% endmacro %} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 3d44b029..b6003d11 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -dbt-core~=0.18.0 +dbt-core~=0.19.0 pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index b5664da2..a13d6767 100644 --- a/setup.py +++ b/setup.py @@ -56,5 +56,9 @@ def _dbt_sqlserver_version(): "include/sqlserver/macros/**/**/*.sql", ] }, - install_requires=["dbt-core~=0.19.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0"], + install_requires=[ + #"dbt-core~=0.19.0", + "pyodbc>=4.0.27", + "azure-identity>=1.4.0", + ], ) \ No newline at end of file From e8bde1e00a18ea72d5026263af55f3496b8ea89a Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 15:13:38 +0100 Subject: [PATCH 05/18] Added version 0.19.0rc1 since pip cant recognise 0.19.0rc1 to be ~=0.19.0 --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b6003d11..7518f3c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -dbt-core~=0.19.0 +dbt-core~=0.19.0rc1 pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index a13d6767..1fd919e7 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,7 @@ def _dbt_sqlserver_version(): ] }, install_requires=[ - #"dbt-core~=0.19.0", + "dbt-core~=0.19.0rc1", "pyodbc>=4.0.27", "azure-identity>=1.4.0", ], From 9fbc28a5e8f2e4f2c8d5ce281e61f92ed4031f6f Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 16:47:21 +0100 Subject: [PATCH 06/18] Removed snapshot_merge.sql since this was changed in dbt core and will be in 0.19.0 --- .../snapshot/snapshot_merge.sql | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql diff --git a/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql b/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql deleted file mode 100644 index 205fa7d2..00000000 --- a/dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql +++ /dev/null @@ -1,19 +0,0 @@ -{% macro sqlserver__snapshot_merge_sql(target, source, insert_cols) -%} - {%- set insert_cols_csv = insert_cols | join(', ') -%} - - merge into {{ target }} as DBT_INTERNAL_DEST - using {{ source }} as DBT_INTERNAL_SOURCE - on DBT_INTERNAL_SOURCE.dbt_scd_id = DBT_INTERNAL_DEST.dbt_scd_id - - when matched - and DBT_INTERNAL_DEST.dbt_valid_to is null - and DBT_INTERNAL_SOURCE.dbt_change_type in ('update', 'delete') - then update - set dbt_valid_to = DBT_INTERNAL_SOURCE.dbt_valid_to - - when not matched - and DBT_INTERNAL_SOURCE.dbt_change_type = 'insert' - then insert ({{ insert_cols_csv }}) - values ({{ insert_cols_csv }}) - ; -{% endmacro %} \ No newline at end of file From 013cebd2122de7f811510d03482db6ae712c76c1 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Mon, 11 Jan 2021 08:51:47 -0800 Subject: [PATCH 07/18] TEMP: revert once v0.19.0 is officially published --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7518f3c4..f73e4e6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -dbt-core~=0.19.0rc1 +git+https://github.com/fishtown-analytics/dbt.git pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 From 92abbb49ff21bdc525574936537997efaa7f163e Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Mon, 11 Jan 2021 08:55:16 -0800 Subject: [PATCH 08/18] TEMP: remove once v0.19.0 is officially published --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3efe84aa..fb9067ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,10 @@ jobs: MSSQL_IP_ADDRESS: 0.0.0.0 executor: python/default steps: + - run: &install-git + name: "TEMP: install Git" + command: | + apt-get install -y git - checkout - run: name: wait for SQL Server container to set up From 9cc5544eec4eb9f9cb1f64262b119ea2680cbcff Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Mon, 11 Jan 2021 08:59:36 -0800 Subject: [PATCH 09/18] TEMP: remove when v0.19.0 is published --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb9067ab..64d32051 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,6 +34,7 @@ jobs: connection-sqlserver: <<: *sqlserver steps: + - run: *install-git - checkout - python/install-packages: pkg-manager: pip @@ -75,6 +76,7 @@ jobs: - image: dataders/pyodbc:1.4 executor: python/default steps: + - run: *install-git - checkout - python/install-packages: pkg-manager: pip @@ -91,6 +93,7 @@ jobs: - image: dataders/pyodbc:1.4 executor: python/default steps: + - run: *install-git - checkout - python/install-packages: pkg-manager: pip From 6abcf44db5f7ddc03d15bb4d5964defea6ffda1a Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 19:11:56 +0100 Subject: [PATCH 10/18] Lets try this for the ci builds until 0.19.0 is released. --- requirements.txt | 3 ++- setup.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7518f3c4..b59b14f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -dbt-core~=0.19.0rc1 +#dbt-core~=0.19.0 +git+https://github.com/mikaelene/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index 1fd919e7..52598bdf 100644 --- a/setup.py +++ b/setup.py @@ -57,8 +57,9 @@ def _dbt_sqlserver_version(): ] }, install_requires=[ - "dbt-core~=0.19.0rc1", + #"dbt-core~=0.19.0", "pyodbc>=4.0.27", "azure-identity>=1.4.0", ], + dependency_links=['git+https://github.com/mikaelene/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt'], ) \ No newline at end of file From 4b29e3a50e1c8ecb5be59247f560ae46b3808bfb Mon Sep 17 00:00:00 2001 From: mikaelene Date: Mon, 11 Jan 2021 19:21:22 +0100 Subject: [PATCH 11/18] Last try didn't go well. Lets try this. Otherwise we may have to wait for the proper release... --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index b59b14f4..3be16fbe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ #dbt-core~=0.19.0 -git+https://github.com/mikaelene/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt +git+https://github.com/fishtown-analytics/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index 52598bdf..0cd4c0c5 100644 --- a/setup.py +++ b/setup.py @@ -61,5 +61,5 @@ def _dbt_sqlserver_version(): "pyodbc>=4.0.27", "azure-identity>=1.4.0", ], - dependency_links=['git+https://github.com/mikaelene/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt'], + dependency_links=['git+https://github.com/fishtown-analytics/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt'], ) \ No newline at end of file From 7ccfaebec878518e7948a78ccd9a948f91dcdfdc Mon Sep 17 00:00:00 2001 From: mikaelene Date: Tue, 12 Jan 2021 08:52:31 +0100 Subject: [PATCH 12/18] Added the -e flag to requirements.txt to force pip to download the latest version --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3be16fbe..5c2787d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ #dbt-core~=0.19.0 -git+https://github.com/fishtown-analytics/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt +-e git+https://github.com/fishtown-analytics/dbt.git#egg=dbt pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index 0cd4c0c5..d7f4242e 100644 --- a/setup.py +++ b/setup.py @@ -61,5 +61,5 @@ def _dbt_sqlserver_version(): "pyodbc>=4.0.27", "azure-identity>=1.4.0", ], - dependency_links=['git+https://github.com/fishtown-analytics/dbt.git@10b33ccaf6a4db5fd89a80709579bbb46fe8de09#egg=dbt'], + dependency_links=['-e git+https://github.com/fishtown-analytics/dbt.git'], ) \ No newline at end of file From d505be0c14f9ff0c5ce2f5946f90cec2744ada5e Mon Sep 17 00:00:00 2001 From: mikaelene Date: Wed, 13 Jan 2021 08:07:42 +0100 Subject: [PATCH 13/18] Added application name to connection string. Solves #63 --- dbt/adapters/sqlserver/connections.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbt/adapters/sqlserver/connections.py b/dbt/adapters/sqlserver/connections.py index 7348b9ab..cbb86905 100644 --- a/dbt/adapters/sqlserver/connections.py +++ b/dbt/adapters/sqlserver/connections.py @@ -259,6 +259,9 @@ def open(cls, connection): if getattr(credentials, "trust_cert", False) is True: con_str.append(f"TrustServerCertificate=Yes") + application_name = f"dbt-{credentials.type}" + con_str.append(f"APP={application_name}") + con_str_concat = ';'.join(con_str) index = [] From cbc2523c7206c7e13ca23a5cbe8ddb8b595ed6a1 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Wed, 13 Jan 2021 18:24:28 -0800 Subject: [PATCH 14/18] orbs == leaky abstraction --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 64d32051..087296e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,7 @@ jobs: command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - python/install-packages: pkg-manager: pip + pypi-cache: false - run: name: Test adapter on SQL Server against dbt-adapter-tests command: tox -e integration-sqlserver @@ -38,6 +39,7 @@ jobs: - checkout - python/install-packages: pkg-manager: pip + pypi-cache: false - run: name: wait for SQL Server container to set up command: sleep 30 @@ -80,6 +82,7 @@ jobs: - checkout - python/install-packages: pkg-manager: pip + pypi-cache: false - run: name: wake up serverless db command: | @@ -97,6 +100,7 @@ jobs: - checkout - python/install-packages: pkg-manager: pip + pypi-cache: false - run: name: install gnupg command: apt-get install gnupg -y From 2db8144300723132baf32cf8081f57d43991a546 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Wed, 13 Jan 2021 18:32:57 -0800 Subject: [PATCH 15/18] get new commit now? --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5c2787d6..89d0f78b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -#dbt-core~=0.19.0 --e git+https://github.com/fishtown-analytics/dbt.git#egg=dbt +git+https://github.com/fishtown-analytics/dbt.git@dev/kiyoshi-kuromiya pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 From ee04bfe8cc899dbec55e9ccb210b24859b5d2bc6 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Thu, 14 Jan 2021 00:16:41 -0800 Subject: [PATCH 16/18] requirement for v0.19.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 89d0f78b..b5f927d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ git+https://github.com/fishtown-analytics/dbt.git@dev/kiyoshi-kuromiya pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 -pytest-dbt-adapter~=0.3.0 +pytest-dbt-adapter~=0.4.0 tox==3.2.0 flake8>=3.5.0 certifi==2020.6.20 From aa84f818a06db06df9351335c605301ca7c37c94 Mon Sep 17 00:00:00 2001 From: Anders Swanson Date: Thu, 14 Jan 2021 10:51:35 -0800 Subject: [PATCH 17/18] move to releasee candidate 2 --- .circleci/config.yml | 4 ---- dbt/adapters/sqlserver/__version__.py | 2 +- requirements.txt | 2 +- setup.py | 5 ++--- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 087296e2..64d32051 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,6 @@ jobs: command: sqlcmd -S 'localhost,1433' -U sa -P 5atyaNadella -Q 'create database blog' - python/install-packages: pkg-manager: pip - pypi-cache: false - run: name: Test adapter on SQL Server against dbt-adapter-tests command: tox -e integration-sqlserver @@ -39,7 +38,6 @@ jobs: - checkout - python/install-packages: pkg-manager: pip - pypi-cache: false - run: name: wait for SQL Server container to set up command: sleep 30 @@ -82,7 +80,6 @@ jobs: - checkout - python/install-packages: pkg-manager: pip - pypi-cache: false - run: name: wake up serverless db command: | @@ -100,7 +97,6 @@ jobs: - checkout - python/install-packages: pkg-manager: pip - pypi-cache: false - run: name: install gnupg command: apt-get install gnupg -y diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py index 84c07455..5aef942a 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.19.0' \ No newline at end of file +version = '0.19.0-rc2' \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b5f927d7..ce397cdd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -git+https://github.com/fishtown-analytics/dbt.git@dev/kiyoshi-kuromiya +dbt-core==0.19.0rc2 pyodbc>=4.0.27 azure-identity>=1.4.0 black~=20.8b1 diff --git a/setup.py b/setup.py index d7f4242e..996eeaaf 100644 --- a/setup.py +++ b/setup.py @@ -57,9 +57,8 @@ def _dbt_sqlserver_version(): ] }, install_requires=[ - #"dbt-core~=0.19.0", + 'dbt-core==0.19.0rc2', "pyodbc>=4.0.27", "azure-identity>=1.4.0", - ], - dependency_links=['-e git+https://github.com/fishtown-analytics/dbt.git'], + ] ) \ No newline at end of file From 3fd76f6d6665401fe5939b1fbfd6dd8ef15f5b72 Mon Sep 17 00:00:00 2001 From: mikaelene Date: Fri, 15 Jan 2021 10:16:21 +0100 Subject: [PATCH 18/18] Removed the dash from version. Ok @swanderz ? --- 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 5aef942a..c5d79de0 100644 --- a/dbt/adapters/sqlserver/__version__.py +++ b/dbt/adapters/sqlserver/__version__.py @@ -1 +1 @@ -version = '0.19.0-rc2' \ No newline at end of file +version = '0.19.0rc2' \ No newline at end of file