Behavior for external path

CHANGELOG.md

@@ -13,6 +13,7 @@
 - Allow for the use of custom constraints, using the `custom` constraint type with an `expression` as the constraint (thanks @roydobbe). ([792](https://github.com/databricks/dbt-databricks/pull/792))
 - Add "use_info_schema_for_columns" behavior flag to turn on use of information_schema to get column info where possible. This may have more latency but will not truncate complex data types the way that 'describe' can. ([808](https://github.com/databricks/dbt-databricks/pull/808))
 - Add support for table_format: iceberg. This uses UniForm under the hood to provide iceberg compatibility for tables or incrementals. ([815](https://github.com/databricks/dbt-databricks/pull/815))
+- Add `include_full_name_in_path` config boolean for external locations. This writes tables to {location_root}/{catalog}/{schema}/{table} ([823](https://github.com/databricks/dbt-databricks/pull/823))
 - Add a new `workflow_job` submission method for python, which creates a long-lived Databricks Workflow instead of a one-time run (thanks @kdazzle!) ([762](https://github.com/databricks/dbt-databricks/pull/762))
 - Allow for additional options to be passed to the Databricks Job API when using other python submission methods. For example, enable email_notifications (thanks @kdazzle!) ([762](https://github.com/databricks/dbt-databricks/pull/762))
 

dbt/adapters/databricks/impl.py

@@ -115,6 +115,7 @@ class DatabricksConfig(AdapterConfig):
     file_format: str = "delta"
     table_format: TableFormat = TableFormat.DEFAULT
     location_root: Optional[str] = None
+    include_full_name_in_path: bool = False
     partition_by: Optional[Union[List[str], str]] = None
     clustered_by: Optional[Union[List[str], str]] = None
     liquid_clustered_by: Optional[Union[List[str], str]] = None
@@ -209,6 +210,25 @@ def update_tblproperties_for_iceberg(
             result["delta.universalFormat.enabledFormats"] = "iceberg"
         return result
 
+    @available.parse(lambda *a, **k: 0)
+    def compute_external_path(
+        self, config: BaseConfig, model: BaseConfig, is_incremental: bool = False
+    ) -> str:
+        location_root = config.get("location_root")
+        database = model.get("database", "hive_metastore")
+        schema = model.get("schema", "default")
+        identifier = model.get("alias")
+        if location_root is None:
+            raise DbtConfigError("location_root is required for external tables.")
+        include_full_name_in_path = config.get("include_full_name_in_path", False)
+        if include_full_name_in_path:
+            path = os.path.join(location_root, database, schema, identifier)
+        else:
+            path = os.path.join(location_root, identifier)
+        if is_incremental:
+            path = path + "_tmp"
+        return path
+
     # override/overload
     def acquire_connection(
         self, name: Optional[str] = None, query_header_context: Any = None

dbt/include/databricks/macros/adapters/python.sql

@@ -60,11 +60,8 @@ writer.saveAsTable("{{ target_relation }}")
 {%- set buckets = config.get('buckets', validator=validation.any[int]) -%}
 .format("{{ file_format }}")
 {%- if location_root is not none %}
-{%- set identifier = model['alias'] %}
-{%- if is_incremental() %}
-{%- set identifier = identifier + '__dbt_tmp' %}
-{%- endif %}
-.option("path", "{{ location_root }}/{{ identifier }}")
+{%- set model_path = adapter.compute_external_path(config, model, is_incremental()) %}
+.option("path", "{{ model_path }}")
 {%- endif -%}
 {%- if partition_by is not none -%}
     {%- if partition_by is string -%}

dbt/include/databricks/macros/relations/location.sql

@@ -3,7 +3,8 @@
   {%- set file_format = config.get('file_format', default='delta') -%}
   {%- set identifier = model['alias'] -%}
   {%- if location_root is not none %}
-    location '{{ location_root }}/{{ identifier }}'
+  {%- set model_path = adapter.compute_external_path(config, model, is_incremental()) %}
+    location '{{ model_path }}'
   {%- elif (not relation.is_hive_metastore()) and file_format != 'delta' -%}
     {{ exceptions.raise_compiler_error(
         'Incompatible configuration: `location_root` must be set when using a non-delta file format with Unity Catalog'

tests/functional/adapter/basic/test_incremental.py

@@ -34,6 +34,7 @@ def project_config_update(self):
             "models": {
                 "+file_format": "parquet",
                 "+location_root": f"{location_root}/parquet",
+                "+include_full_name_in_path": "true",
                 "+incremental_strategy": "append",
             },
         }
@@ -61,6 +62,7 @@ def project_config_update(self):
             "models": {
                 "+file_format": "csv",
                 "+location_root": f"{location_root}/csv",
+                "+include_full_name_in_path": "true",
                 "+incremental_strategy": "append",
             },
         }

tests/functional/adapter/incremental/test_incremental_strategies.py

@@ -52,6 +52,7 @@ def project_config_update(self):
             "models": {
                 "+file_format": "parquet",
                 "+location_root": f"{location_root}/parquet_append",
+                "+include_full_name_in_path": "true",
                 "+incremental_strategy": "append",
             },
         }
@@ -129,6 +130,7 @@ def project_config_update(self):
             "models": {
                 "+file_format": "parquet",
                 "+location_root": f"{location_root}/parquet_insert_overwrite",
+                "+include_full_name_in_path": "true",
                 "+incremental_strategy": "insert_overwrite",
             },
         }
@@ -144,6 +146,7 @@ def project_config_update(self):
             "models": {
                 "+file_format": "parquet",
                 "+location_root": f"{location_root}/parquet_insert_overwrite_partitions",
+                "+include_full_name_in_path": "true",
                 "+incremental_strategy": "insert_overwrite",
                 "+partition_by": "id",
             },

tests/functional/adapter/persist_docs/fixtures.py

@@ -5,6 +5,7 @@
     description: 'A seed description'
     config:
       location_root: '{{ env_var("DBT_DATABRICKS_LOCATION_ROOT") }}'
+      include_full_name_in_path: true
       persist_docs:
         relation: True
         columns: True
@@ -22,6 +23,7 @@
     description: 'A seed description'
     config:
       location_root: '/mnt/dbt_databricks/seeds'
+      include_full_name_in_path: true
       persist_docs:
         relation: True
         columns: True

tests/functional/adapter/python_model/fixtures.py

@@ -117,7 +117,8 @@ def model(dbt, spark):
       marterialized: table
       tags: ["python"]
       create_notebook: true
-      location_root: "{root}/{schema}"
+      include_full_name_in_path: true
+      location_root: "{{ env_var('DBT_DATABRICKS_LOCATION_ROOT') }}"
     columns:
       - name: date
         tests:

tests/functional/adapter/python_model/test_python_model.py

@@ -119,15 +119,6 @@ def project_config_update(self):
         }
 
     def test_expected_handling_of_complex_config(self, project):
-        unformatted_schema_yml = util.read_file("models", "schema.yml")
-        util.write_file(
-            unformatted_schema_yml.replace(
-                "root", os.environ["DBT_DATABRICKS_LOCATION_ROOT"]
-            ).replace("{schema}", project.test_schema),
-            "models",
-            "schema.yml",
-        )
-
         util.run_dbt(["seed"])
         util.run_dbt(["build", "-s", "complex_config"])
         util.run_dbt(["build", "-s", "complex_config"])

tests/unit/macros/adapters/test_python_macros.py

@@ -1,5 +1,4 @@
 import pytest
-from jinja2 import Template
 from mock import MagicMock
 
 from tests.unit.macros.base import MacroTestBase
@@ -33,21 +32,12 @@ def test_py_get_writer__specified_file_format(self, config, template):
 
     def test_py_get_writer__specified_location_root(self, config, template, context):
         config["location_root"] = "s3://fake_location"
+        template.globals["adapter"].compute_external_path.return_value = "s3://fake_location/schema"
         result = self.run_macro_raw(template, "py_get_writer_options")
 
         expected = '.format("delta")\n.option("path", "s3://fake_location/schema")'
         assert result == expected
 
-    def test_py_get_writer__specified_location_root_on_incremental(
-        self, config, template: Template, context
-    ):
-        config["location_root"] = "s3://fake_location"
-        context["is_incremental"].return_value = True
-        result = self.run_macro_raw(template, "py_get_writer_options")
-
-        expected = '.format("delta")\n.option("path", "s3://fake_location/schema__dbt_tmp")'
-        assert result == expected
-
     def test_py_get_writer__partition_by_single_column(self, config, template):
         config["partition_by"] = "name"
         result = self.run_macro_raw(template, "py_get_writer_options")

tests/unit/macros/relations/test_table_macros.py

@@ -28,6 +28,10 @@ def context(self, template) -> dict:
         return template.globals
 
     def render_create_table_as(self, template_bundle, temporary=False, sql="select 1"):
+        external_path = f"/mnt/root/{template_bundle.relation.identifier}"
+        template_bundle.template.globals["adapter"].compute_external_path.return_value = (
+            external_path
+        )
         return self.run_macro(
             template_bundle.template,
             "databricks__create_table_as",