Getting compatibility with 1.7.0 (#467)

databricks · Oct 10, 2023 · 29b4c20 · 29b4c20
2 parents eaef1da + 0de948e
commit 29b4c20
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## dbt-databricks 1.7.x (TBD)
 
+### Under the Hood
+
+- Compatibility with dbt-spark 1.7.0b2 ([467](https://github.com/databricks/dbt-databricks/pull/467))
+
 ## dbt-databricks 1.6.6 (October 9, 2023)
 
 ### Fixes

diff --git a/dbt/adapters/databricks/connections.py b/dbt/adapters/databricks/connections.py
@@ -100,7 +100,8 @@ def emit(self, record: logging.LogRecord) -> None:
 
 @dataclass
 class DatabricksCredentials(Credentials):
-    database: Optional[str]  # type: ignore[assignment]
+    database: Optional[str] = None  # type: ignore[assignment]
+    schema: Optional[str] = None  # type: ignore[assignment]
     host: Optional[str] = None
     http_path: Optional[str] = None
     token: Optional[str] = None
@@ -130,7 +131,7 @@ def __pre_deserialize__(cls, data: Dict[Any, Any]) -> Dict[Any, Any]:
         return data
 
     def __post_init__(self) -> None:
-        if "." in self.schema:
+        if "." in (self.schema or ""):
             raise dbt.exceptions.DbtValidationError(
                 f"The schema should not contain '.': {self.schema}\n"
                 "If you are trying to set a catalog, please use `catalog` instead.\n"

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -23,8 +23,8 @@ tox>=3.2.0
 types-requests
 types-mock
 
-dbt-core==1.6.0
-dbt-tests-adapter==1.6.0
+dbt-core==1.7.0b2
+dbt-tests-adapter==1.7.0b2
 # git+https://github.com/dbt-labs/[email protected]#egg=dbt-spark
 # git+https://github.com/dbt-labs/[email protected]#egg=dbt-core&subdirectory=core
 # git+https://github.com/dbt-labs/[email protected]#egg=dbt-tests-adapter&subdirectory=tests/adapter
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 databricks-sql-connector>=2.9.3, <3.0.0
-dbt-spark==1.6.0
+dbt-spark==1.7.0b2
 databricks-sdk==0.9.0
 keyring>=23.13.0
diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def _get_plugin_version():
     packages=find_namespace_packages(include=["dbt", "dbt.*"]),
     include_package_data=True,
     install_requires=[
-        "dbt-spark==1.6.0",
+        "dbt-spark==1.7.0b2",
         "databricks-sql-connector>=2.9.3, <3.0.0",
         "databricks-sdk>=0.9.0",
         "keyring>=23.13.0",