Merge pull request #287 from dbt-msft/v1.3.0

sdebruyn · web-flow · commit 1de0d7cfd396 · 2022-10-06T21:27:39.000+02:00
release prep for dbt 1.3.0
diff --git a/.gitignore b/.gitignore
@@ -68,9 +68,6 @@ target/
 # Pycharm
 .idea
 
-# VS Code
-.vscode/
-
 # Spyder
 .spyproject/
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+### v1.3.0
+
+#### Features
+
+* Support for [dbt-core 1.3](https://github.com/dbt-labs/dbt-core/releases/tag/v1.3.0)
+  * Python models are currently not supported in this adapter
+  * The following cross-db macros are not supported in this adapter: `bool_or`, `array_construct`, `array_concat`, `array_append`
+
+#### Fixes
+
+* The macro `type_boolean` now returns the correct data type (`bit`)
+
+#### Chores
+
+* Update adapter testing framework
+* Update dependencies and pre-commit hooks
+
 ### v1.2.0
 
 #### Possibly breaking change: connection encryption
diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py
@@ -1 +1 @@
-version = "1.2.0"
+version = "1.3.0rc1"
diff --git a/dbt/adapters/sqlserver/sql_server_adapter.py b/dbt/adapters/sqlserver/sql_server_adapter.py
@@ -101,6 +101,12 @@ def get_rows_different_sql(
 
         return sql
 
+    def valid_incremental_strategies(self):
+        """The set of standard builtin strategies which this adapter supports out-of-the-box.
+        Not used to validate custom strategies defined by end users.
+        """
+        return ["append", "delete+insert", "merge", "insert_overwrite"]
+
     # This is for use in the test suite
     def run_sql_for_tests(self, sql, fetch, conn):
         cursor = conn.handle.cursor()
diff --git a/dbt/adapters/sqlserver/sql_server_column.py b/dbt/adapters/sqlserver/sql_server_column.py
@@ -9,4 +9,5 @@ class SQLServerColumn(Column):
         "TIMESTAMP": "DATETIMEOFFSET",
         "FLOAT": "FLOAT",
         "INTEGER": "INT",
+        "BOOLEAN": "BIT",
     }
diff --git a/dbt/include/sqlserver/macros/materializations/models/incremental/incremental_strategies.sql b/dbt/include/sqlserver/macros/materializations/models/incremental/incremental_strategies.sql
@@ -0,0 +1,9 @@
+{% macro sqlserver__get_incremental_default_sql(arg_dict) %}
+
+    {% if arg_dict["unique_key"] %}
+        {% do return(get_incremental_delete_insert_sql(arg_dict)) %}
+    {% else %}
+        {% do return(get_incremental_append_sql(arg_dict)) %}
+    {% endif %}
+
+{% endmacro %}
diff --git a/dbt/include/sqlserver/macros/utils/array_construct.sql b/dbt/include/sqlserver/macros/utils/array_construct.sql
@@ -0,0 +1,3 @@
+{% macro sqlserver__array_construct(inputs, data_type) -%}
+    JSON_ARRAY({{ inputs|join(' , ') }})
+{%- endmacro %}
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -3,5 +3,5 @@ twine==4.0.1
 wheel==0.37.1
 pre-commit==2.20.0
 pytest-dotenv==0.5.2
-dbt-tests-adapter==1.2.2
+dbt-tests-adapter==1.3.0rc2
 -e .
diff --git a/setup.py b/setup.py
@@ -8,8 +8,8 @@
 
 package_name = "dbt-sqlserver"
 authors_list = ["Mikael Ene", "Anders Swanson", "Sam Debruyn", "Cor Zuurmond"]
-dbt_version = "1.2"
-description = """A Microsoft SQL Server adapter plugin for dbt"""
+dbt_version = "1.3"
+description = """A Microsoft SQL Server adapter plugin for dbt (data build tool)"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(this_directory, "README.md")) as f:
@@ -66,7 +66,7 @@ def run(self):
     packages=find_namespace_packages(include=["dbt", "dbt.*"]),
     include_package_data=True,
     install_requires=[
-        f"dbt-core~={dbt_version}.0",
+        "dbt-core==1.3.0rc2",
         "pyodbc==4.0.32",
         "azure-identity>=1.10.0",
     ],
diff --git a/tests/functional/adapter/test_basic.py b/tests/functional/adapter/test_basic.py
@@ -4,7 +4,10 @@
 from dbt.tests.adapter.basic.test_empty import BaseEmpty
 from dbt.tests.adapter.basic.test_ephemeral import BaseEphemeral
 from dbt.tests.adapter.basic.test_generic_tests import BaseGenericTests
-from dbt.tests.adapter.basic.test_incremental import BaseIncremental
+from dbt.tests.adapter.basic.test_incremental import (
+    BaseIncremental,
+    BaseIncrementalNotSchemaChange,
+)
 from dbt.tests.adapter.basic.test_singular_tests import BaseSingularTests
 from dbt.tests.adapter.basic.test_singular_tests_ephemeral import BaseSingularTestsEphemeral
 from dbt.tests.adapter.basic.test_snapshot_check_cols import BaseSnapshotCheckCols
@@ -37,6 +40,25 @@ class TestIncrementalSQLServer(BaseIncremental):
     pass
 
 
+class TestIncrementalNotSchemaChangeSQLServer(BaseIncrementalNotSchemaChange):
+    @pytest.fixture(scope="class")
+    def models(self):
+        incremental_not_schema_change_sql = """
+{{ config(
+    materialized="incremental",
+    unique_key="user_id_current_time",
+    on_schema_change="sync_all_columns") }}
+select
+    1 + '-' + current_timestamp as user_id_current_time,
+    {% if is_incremental() %}
+        'thisis18characters' as platform
+    {% else %}
+        'okthisis20characters' as platform
+    {% endif %}
+            """
+        return {"incremental_not_schema_change.sql": incremental_not_schema_change_sql}
+
+
 class TestGenericTestsSQLServer(BaseGenericTests):
     pass
 
diff --git a/tests/functional/adapter/test_data_types.py b/tests/functional/adapter/test_data_types.py
@@ -1,5 +1,6 @@
 import pytest
 from dbt.tests.adapter.utils.data_types.test_type_bigint import BaseTypeBigInt
+from dbt.tests.adapter.utils.data_types.test_type_boolean import BaseTypeBoolean
 from dbt.tests.adapter.utils.data_types.test_type_float import BaseTypeFloat
 from dbt.tests.adapter.utils.data_types.test_type_int import BaseTypeInt
 from dbt.tests.adapter.utils.data_types.test_type_numeric import BaseTypeNumeric
@@ -52,3 +53,7 @@ def seeds(self):
             "expected.csv": seeds__expected_csv,
             "expected.yml": seeds__expected_yml,
         }
+
+
+class TestTypeBooleanSQLServer(BaseTypeBoolean):
+    pass
diff --git a/tests/functional/adapter/test_docs.py b/tests/functional/adapter/test_docs.py
@@ -10,6 +10,7 @@
     ref_models__docs_md,
     ref_models__ephemeral_copy_sql,
     ref_models__schema_yml,
+    ref_sources__schema_yml,
 )
 
 
@@ -66,22 +67,6 @@ def models(self):
         select first_name, ct from {{ref('ephemeral_summary')}}
         """
 
-        ref_sources__schema_yml = """
-version: 2
-sources:
-  - name: my_source
-    description: "{{ doc('source_info') }}"
-    loader: a_loader
-    schema: "{{ var('test_schema') }}"
-    tables:
-      - name: my_table
-        description: "{{ doc('table_info') }}"
-        identifier: seed
-        columns:
-          - name: id
-            description: "{{ doc('column_info') }}"
-        """
-
         return {
             "schema.yml": ref_models__schema_yml,
             "sources.yml": ref_sources__schema_yml,
diff --git a/tests/functional/adapter/test_utils.py b/tests/functional/adapter/test_utils.py
@@ -5,9 +5,13 @@
     seeds__data_listagg_csv,
 )
 from dbt.tests.adapter.utils.test_any_value import BaseAnyValue
+from dbt.tests.adapter.utils.test_array_append import BaseArrayAppend
+from dbt.tests.adapter.utils.test_array_concat import BaseArrayConcat
+from dbt.tests.adapter.utils.test_array_construct import BaseArrayConstruct
 from dbt.tests.adapter.utils.test_bool_or import BaseBoolOr
 from dbt.tests.adapter.utils.test_cast_bool_to_text import BaseCastBoolToText
 from dbt.tests.adapter.utils.test_concat import BaseConcat
+from dbt.tests.adapter.utils.test_current_timestamp import BaseCurrentTimestampNaive
 from dbt.tests.adapter.utils.test_date_trunc import BaseDateTrunc
 from dbt.tests.adapter.utils.test_dateadd import BaseDateAdd
 from dbt.tests.adapter.utils.test_datediff import BaseDateDiff
@@ -222,3 +226,22 @@ class TestPositionSQLServer(BasePosition):
 
 class TestReplaceSQLServer(BaseReplace):
     pass
+
+
+class TestCurrentTimestampSQLServer(BaseCurrentTimestampNaive):
+    pass
+
+
+@pytest.mark.skip(reason="arrays not supported")
+class TestArrayAppendSQLServer(BaseArrayAppend):
+    pass
+
+
+@pytest.mark.skip(reason="arrays not supported")
+class TestArrayConcatSQLServer(BaseArrayConcat):
+    pass
+
+
+@pytest.mark.skip(reason="arrays not supported")
+class TestArrayConstructSQLServer(BaseArrayConstruct):
+    pass

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = "1.2.0"`
	`1`	`+version = "1.3.0rc1"`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ class SQLServerColumn(Column):`
`9`	`9`	`"TIMESTAMP": "DATETIMEOFFSET",`
`10`	`10`	`"FLOAT": "FLOAT",`
`11`	`11`	`"INTEGER": "INT",`
	`12`	`+ "BOOLEAN": "BIT",`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{% macro sqlserver__array_construct(inputs, data_type) -%}`
	`2`	`+ JSON_ARRAY({{ inputs\|join(' , ') }})`
	`3`	`+{%- endmacro %}`