Merge branch 'main' into dbeatty/date-macro

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.8.0b2
+current_version = 1.9.0a1
 parse = (?P<major>[\d]+) # major version number
 	\.(?P<minor>[\d]+) # minor version number
 	\.(?P<patch>[\d]+) # patch version number

CHANGELOG.md

@@ -5,64 +5,10 @@
 - "Breaking changes" listed under a version may require action from end users or external maintainers when upgrading to that version.
 - Do not edit this file directly. This file is auto-generated using [changie](https://github.com/miniscruff/changie). For details on how to document a change, see [the contributing guide](https://github.com/dbt-labs/dbt-spark/blob/main/CONTRIBUTING.md#adding-changelog-entry)
 
-## dbt-spark 1.8.0-b2 - April 03, 2024
-
-### Features
-
-- : Add new workflow for internal patch releases ([#38](https://github.com/dbt-labs/dbt-spark/issues/38))
-
-### Dependencies
-
-- Add `dbt-core` as a dependency to preserve backwards compatibility for installation ([#1002](https://github.com/dbt-labs/dbt-spark/pull/1002))
-
-### Security
-
-- Pin `black>=24.3` in `dev-requirements.txt` ([#1000](https://github.com/dbt-labs/dbt-spark/pull/1000))
-
-
-
-## dbt-spark 1.8.0-b1 - March 01, 2024
-
-### Features
-
-- Implement spark__safe_cast and add functional tests for unit testing ([#987](https://github.com/dbt-labs/dbt-spark/issues/987))
-
-### Fixes
-
-- Support new agate Integer type and empty seed test ([#935](https://github.com/dbt-labs/dbt-spark/issues/935))
-- Fix hardcoded file format for python models ([#803](https://github.com/dbt-labs/dbt-spark/issues/803))
-
-### Under the Hood
-
-- Add GitHub action for integration testing and use dagger-io to run tests. Remove CircleCI workflow. ([#719](https://github.com/dbt-labs/dbt-spark/issues/719))
-- Add tests for --empty flag ([#949](https://github.com/dbt-labs/dbt-spark/issues/949))
-- Remove unused `invalid_insert_overwrite_delta_msg` message ([#962](https://github.com/dbt-labs/dbt-spark/issues/962))
-- Update import paths and list_relations to support decoupling adapters/core ([#972](https://github.com/dbt-labs/dbt-spark/issues/972))
-
-### Dependencies
-
-- Update pre-commit-hooks requirement from ~=4.4 to ~=4.5 ([#903](https://github.com/dbt-labs/dbt-spark/pull/903))
-- Bump mypy from 1.5.1 to 1.6.0 ([#904](https://github.com/dbt-labs/dbt-spark/pull/904))
-- Update pyodbc requirement from ~=4.0.39 to ~=5.0.0 ([#905](https://github.com/dbt-labs/dbt-spark/pull/905))
-- Update pre-commit requirement from ~=3.4 to ~=3.5 ([#914](https://github.com/dbt-labs/dbt-spark/pull/914))
-- Update pyodbc requirement from ~=5.0.0 to ~=5.0.1 ([#925](https://github.com/dbt-labs/dbt-spark/pull/925))
-- Bump mypy from 1.6.0 to 1.6.1 ([#926](https://github.com/dbt-labs/dbt-spark/pull/926))
-- Update black requirement from ~=23.9 to ~=23.10 ([#927](https://github.com/dbt-labs/dbt-spark/pull/927))
-- Update black requirement from ~=23.10 to ~=23.11 ([#942](https://github.com/dbt-labs/dbt-spark/pull/942))
-- Bump mypy from 1.6.1 to 1.7.0 ([#946](https://github.com/dbt-labs/dbt-spark/pull/946))
-- Update pytest-xdist requirement from ~=3.3 to ~=3.4 ([#947](https://github.com/dbt-labs/dbt-spark/pull/947))
-- Update pytest-xdist requirement from ~=3.4 to ~=3.5 ([#951](https://github.com/dbt-labs/dbt-spark/pull/951))
-- Update wheel requirement from ~=0.41 to ~=0.42 ([#952](https://github.com/dbt-labs/dbt-spark/pull/952))
-- Bump mypy from 1.7.0 to 1.7.1 ([#953](https://github.com/dbt-labs/dbt-spark/pull/953))
-- Update freezegun requirement from ~=1.2 to ~=1.3 ([#956](https://github.com/dbt-labs/dbt-spark/pull/956))
-- Update black requirement from ~=23.11 to ~=23.12 ([#959](https://github.com/dbt-labs/dbt-spark/pull/959))
-
-### Contributors
-- [@JCZuurmond,](https://github.com/JCZuurmond,) ([#719](https://github.com/dbt-labs/dbt-spark/issues/719))
-- [@ben-schreiber](https://github.com/ben-schreiber) ([#803](https://github.com/dbt-labs/dbt-spark/issues/803))
-
 ## Previous Releases
 For information on prior major and minor releases, see their changelogs:
+- [1.8](https://github.com/dbt-labs/dbt-spark/blob/1.8.latest/CHANGELOG.md)
+- [1.7](https://github.com/dbt-labs/dbt-spark/blob/1.7.latest/CHANGELOG.md)
 - [1.6](https://github.com/dbt-labs/dbt-spark/blob/1.6.latest/CHANGELOG.md)
 - [1.5](https://github.com/dbt-labs/dbt-spark/blob/1.5.latest/CHANGELOG.md)
 - [1.4](https://github.com/dbt-labs/dbt-spark/blob/1.4.latest/CHANGELOG.md)

dbt/adapters/spark/__version__.py

@@ -1 +1 @@
-version = "1.8.0b2"
+version = "1.9.0a1"

setup.py

@@ -41,7 +41,7 @@ def _get_plugin_version_dict():
 
 
 package_name = "dbt-spark"
-package_version = "1.8.0b2"
+package_version = "1.9.0a1"
 description = """The Apache Spark adapter plugin for dbt"""
 
 odbc_extras = ["pyodbc~=4.0.39"]

tests/functional/adapter/test_constraints.py

@@ -358,6 +358,17 @@ def models(self):
             "constraints_schema.yml": constraints_yml,
         }
 
+    @pytest.mark.skip(
+        "Databricks now raises an exception, which gets raised prior to the `expected_pass` check."
+        "See https://github.com/dbt-labs/dbt-spark/issues/1009"
+    )
+    def test__constraints_enforcement_rollback(
+        self, project, expected_color, expected_error_messages, null_model_sql
+    ):
+        super().test__constraints_enforcement_rollback(
+            project, expected_color, expected_error_messages, null_model_sql
+        )
+
 
 # TODO: Like the tests above, this does test that model-level constraints don't
 # result in errors, but it does not verify that they are actually present in

tests/functional/adapter/test_python_model.py

@@ -24,6 +24,13 @@ class TestPythonIncrementalModelSpark(BasePythonIncrementalTests):
     def project_config_update(self):
         return {}
 
+    @pytest.mark.skip(
+        "Databricks can't find the transaction log"
+        "See https://github.com/dbt-labs/dbt-spark/issues/1033"
+    )
+    def test_incremental(self, project):
+        super().test_incremental(project)
+
 
 models__simple_python_model = """
 import pandas