Merge branch 'master' into fix-deadlocks

dataders · web-flow · commit eb3e2653b4b4 · 2023-05-12T12:52:07.000-04:00
diff --git a/.github/workflows/integration-tests-azure.yml b/.github/workflows/integration-tests-azure.yml
@@ -15,7 +15,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.ref_name == 'master' || github.ref_name == 'azure-testing'
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         profile: ["ci_azure_cli", "ci_azure_auto", "ci_azure_environment", "ci_azure_basic"]
         msodbc_version: ["17", "18"]
       max-parallel: 1
diff --git a/.github/workflows/integration-tests-sqlserver.yml b/.github/workflows/integration-tests-sqlserver.yml
@@ -15,7 +15,7 @@ jobs:
     name: Integration tests on SQL Server
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         msodbc_version: ["17", "18"]
         sqlserver_version: ["2017", "2019", "2022"]
     runs-on: ubuntu-latest
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -12,7 +12,7 @@ jobs:
   publish-docker-client:
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         docker_target: ["msodbc17", "msodbc18"]
     runs-on: ubuntu-latest
     permissions:
@@ -30,7 +30,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: devops
           build-args: PYTHON_VERSION=${{ matrix.python_version }}
@@ -60,7 +60,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4.0.0
         with:
           context: devops
           build-args: MSSQL_VERSION=${{ matrix.mssql_version }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -15,7 +15,7 @@ jobs:
     name: Unit tests
     strategy:
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: mixed-line-ending
       - id: check-docstring-first
   - repo: 'https://github.com/adrienverge/yamllint'
-    rev: v1.28.0
+    rev: v1.31.0
     hooks:
       - id: yamllint
         args:
@@ -32,13 +32,13 @@ repos:
     hooks:
       - id: absolufy-imports
   - repo: 'https://github.com/hadialqattan/pycln'
-    rev: v2.1.2
+    rev: v2.1.3
     hooks:
       - id: pycln
         args:
           - '--all'
   - repo: 'https://github.com/pycqa/isort'
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
       - id: isort
         args:
@@ -50,7 +50,7 @@ repos:
           - '--python-version'
           - '39'
   - repo: 'https://github.com/psf/black'
-    rev: 22.10.0
+    rev: 23.3.0
     hooks:
       - id: black
         args:
@@ -65,8 +65,8 @@ repos:
           - '--target-version=py39'
           - '--check'
           - '--diff'
-  - repo: 'https://gitlab.com/pycqa/flake8'
-    rev: 3.9.2
+  - repo: 'https://github.com/pycqa/flake8'
+    rev: 6.0.0
     hooks:
       - id: flake8
         args:
@@ -78,7 +78,7 @@ repos:
         stages:
           - manual
   - repo: 'https://github.com/pre-commit/mirrors-mypy'
-    rev: v0.991
+    rev: v1.2.0
     hooks:
       - id: mypy
         args:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+### v1.4.0
+
+#### Features
+
+* Support for [dbt-core 1.4](https://github.com/dbt-labs/dbt-core/releases/tag/v1.4.1)
+  * [Incremental predicates](https://docs.getdbt.com/docs/build/incremental-models#about-incremental_predicates) are currently not supported in this adapter
+  * Add support for Python 3.11
+  * Replace deprecated exception functions
+  * Consolidate timestamp macros
+
 ### v1.3.0
 
 #### Features
diff --git a/dbt/adapters/sqlserver/__version__.py b/dbt/adapters/sqlserver/__version__.py
@@ -1 +1 @@
-version = "1.3.1"
+version = "1.4.0"
diff --git a/dbt/adapters/sqlserver/sql_server_adapter.py b/dbt/adapters/sqlserver/sql_server_adapter.py
@@ -76,7 +76,6 @@ def get_rows_different_sql(
         column_names: Optional[List[str]] = None,
         except_operator: str = "EXCEPT",
     ) -> str:
-
         """
         note: using is not supported on Synapse so COLUMNS_EQUAL_SQL is adjsuted
         Generate SQL for a query that returns a single row with a two
diff --git a/dbt/adapters/sqlserver/sql_server_connection_manager.py b/dbt/adapters/sqlserver/sql_server_connection_manager.py
@@ -250,23 +250,22 @@ def exception_handler(self, sql):
             except pyodbc.Error:
                 logger.debug("Failed to release connection!")
 
-            raise dbt.exceptions.DatabaseException(str(e).strip()) from e
+            raise dbt.exceptions.DbtDatabaseError(str(e).strip()) from e
 
         except Exception as e:
             logger.debug(f"Error running SQL: {sql}")
             logger.debug("Rolling back transaction.")
             self.release()
-            if isinstance(e, dbt.exceptions.RuntimeException):
+            if isinstance(e, dbt.exceptions.DbtRuntimeError):
                 # during a sql query, an internal to dbt exception was raised.
                 # this sounds a lot like a signal handler and probably has
                 # useful information, so raise it without modification.
                 raise
 
-            raise dbt.exceptions.RuntimeException(e)
+            raise dbt.exceptions.DbtRuntimeError(e)
 
     @classmethod
     def open(cls, connection: Connection) -> Connection:
-
         if connection.state == ConnectionState.OPEN:
             logger.debug("Connection is already open, skipping open.")
             return connection
@@ -276,7 +275,6 @@ def open(cls, connection: Connection) -> Connection:
         con_str = [f"DRIVER={{{credentials.driver}}}"]
 
         if "\\" in credentials.host:
-
             # If there is a backslash \ in the host name, the host is a
             # SQL Server named instance. In this case then port number has to be omitted.
             con_str.append(f"SERVER={credentials.host}")
@@ -374,7 +372,6 @@ def add_query(
         bindings: Optional[Any] = None,
         abridge_sql_log: bool = False,
     ) -> Tuple[Connection, Any]:
-
         connection = self.get_thread_connection()
 
         if auto_begin and connection.transaction_open is False:
diff --git a/dbt/include/sqlserver/macros/adapters/freshness.sql b/dbt/include/sqlserver/macros/adapters/freshness.sql
diff --git a/dbt/include/sqlserver/macros/materializations/models/incremental/merge.sql b/dbt/include/sqlserver/macros/materializations/models/incremental/merge.sql
@@ -9,7 +9,10 @@
   {{ default__get_merge_sql(target, source, unique_key, dest_columns, predicates) }};
 {% endmacro %}
 
-{% macro sqlserver__get_delete_insert_merge_sql(target, source, unique_key, dest_columns) %}
+{% macro sqlserver__get_delete_insert_merge_sql(target, source, unique_key, dest_columns, incremental_predicates) %}
+      {% if incremental_predicates %}
+          {{ exceptions.raise_not_implemented('incremental_predicates are not implemented in dbt-sqlserver') }}
+      {% endif %}
 
       {%- set dest_cols_csv = get_quoted_csv(dest_columns | map(attribute="name")) -%}
 
diff --git a/dbt/include/sqlserver/macros/materializations/snapshots/strategies.sql b/dbt/include/sqlserver/macros/materializations/snapshots/strategies.sql
@@ -3,8 +3,3 @@
         coalesce(cast({{ arg }} as varchar(max)), '') {% if not loop.last %} + '|' + {% endif %}
     {% endfor %}), 2)
 {% endmacro %}
-
-{% macro sqlserver__snapshot_string_as_time(timestamp) -%}
-    {%- set result = "CONVERT(DATETIME2, '" ~ timestamp ~ "')" -%}
-    {{ return(result) }}
-{%- endmacro %}
diff --git a/dbt/include/sqlserver/macros/utils/timestamps.sql b/dbt/include/sqlserver/macros/utils/timestamps.sql
@@ -0,0 +1,8 @@
+{% macro sqlserver__current_timestamp() -%}
+  SYSDATETIME()
+{%- endmacro %}
+
+{% macro sqlserver__snapshot_string_as_time(timestamp) -%}
+    {%- set result = "CONVERT(DATETIME2, '" ~ timestamp ~ "')" -%}
+    {{ return(result) }}
+{%- endmacro %}
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -1,7 +1,8 @@
 pytest==7.1.3
 twine==4.0.2
-wheel==0.38.4
-pre-commit==2.20.0
+wheel==0.40.0
+pre-commit==2.21.0;python_version<"3.8"
+pre-commit==3.3.1;python_version>="3.8"
 pytest-dotenv==0.5.2
-dbt-tests-adapter==1.3.1
+dbt-tests-adapter~=1.4.5
 -e .
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 
 package_name = "dbt-sqlserver"
 authors_list = ["Mikael Ene", "Anders Swanson", "Sam Debruyn", "Cor Zuurmond"]
-dbt_version = "1.3"
+dbt_version = "1.4"
 description = """A Microsoft SQL Server adapter plugin for dbt"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))
@@ -66,9 +66,9 @@ def run(self):
     packages=find_namespace_packages(include=["dbt", "dbt.*"]),
     include_package_data=True,
     install_requires=[
-        "dbt-core>=1.3.0",
-        "pyodbc>=4.0.32,!=4.0.34",
-        "azure-identity>=1.10.0",
+        "dbt-core~=1.4.5",
+        "pyodbc~=4.0.35,!=4.0.36,!=4.0.37",
+        "azure-identity>=1.12.0",
     ],
     cmdclass={
         "verify": VerifyVersionCommand,
@@ -83,5 +83,6 @@ def run(self):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 )
diff --git a/tests/functional/adapter/test_timestamps.py b/tests/functional/adapter/test_timestamps.py
@@ -0,0 +1,18 @@
+import pytest
+from dbt.tests.adapter.utils.test_timestamps import BaseCurrentTimestamps
+
+
+class TestCurrentTimestampSQLServer(BaseCurrentTimestamps):
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "get_current_timestamp.sql": 'select {{ current_timestamp() }} as "current_timestamp"'
+        }
+
+    @pytest.fixture(scope="class")
+    def expected_schema(self):
+        return {"current_timestamp": "datetime2"}
+
+    @pytest.fixture(scope="class")
+    def expected_sql(self):
+        return '''select SYSDATETIME() as "current_timestamp"'''
