no message

Author: omar

dbt-spark/src/dbt/adapters/spark/impl.py

@@ -201,6 +201,7 @@ def _build_spark_relation_list(
         self,
         row_list: "agate.Table",
         relation_info_func: Callable[["agate.Row"], RelationInfo],
+        schema_relation: Optional[BaseRelation] = None,
     ) -> List[BaseRelation]:
         """Aggregate relations with format metadata included."""
         relations = []
@@ -217,6 +218,7 @@ def _build_spark_relation_list(
             is_iceberg: bool = "Provider: iceberg" in information
 
             relation: BaseRelation = self.Relation.create(
+                database=schema_relation.database if schema_relation else None,
                 schema=_schema,
                 identifier=name,
                 type=rel_type,
@@ -241,6 +243,7 @@ def list_relations_without_caching(self, schema_relation: BaseRelation) -> List[
             return self._build_spark_relation_list(
                 row_list=show_table_extended_rows,
                 relation_info_func=self._get_relation_information,
+                schema_relation=schema_relation,
             )
         except DbtRuntimeError as e:
             errmsg = getattr(e, "msg", "")
@@ -258,6 +261,7 @@ def list_relations_without_caching(self, schema_relation: BaseRelation) -> List[
                     return self._build_spark_relation_list(
                         row_list=show_table_rows,
                         relation_info_func=self._get_relation_information_using_describe,
+                        schema_relation=schema_relation,
                     )
                 except DbtRuntimeError as e:
                     description = "Error while retrieving information about"
@@ -270,9 +274,6 @@ def list_relations_without_caching(self, schema_relation: BaseRelation) -> List[
                 return []
 
     def get_relation(self, database: str, schema: str, identifier: str) -> Optional[BaseRelation]:
-        if not self.Relation.get_default_include_policy().database:
-            database = None  # type: ignore
-
         return super().get_relation(database, schema, identifier)
 
     def parse_describe_extended(

dbt-spark/src/dbt/include/spark/macros/adapters.sql

@@ -294,7 +294,7 @@
 
 {% macro spark__list_relations_without_caching(relation) %}
   {% call statement('list_relations_without_caching', fetch_result=True) -%}
-    show table extended in {{ relation.schema }} like '*'
+    show table extended in {{ relation.include(identifier=false) }} like '*'
   {% endcall %}
 
   {% do return(load_result('list_relations_without_caching').table) %}
@@ -305,7 +305,7 @@
   {#-- V2 iceberg tables #}
   {#-- https://issues.apache.org/jira/browse/SPARK-33393 #}
   {% call statement('list_relations_without_caching_show_tables', fetch_result=True) -%}
-    show tables in {{ schema_relation.schema }} like '*'
+    show tables in {{ schema_relation.include(identifier=false) }} like '*'
   {% endcall %}
 
   {% do return(load_result('list_relations_without_caching_show_tables').table) %}
@@ -323,7 +323,7 @@
 
 {% macro spark__list_schemas(database) -%}
   {% call statement('list_schemas', fetch_result=True, auto_begin=False) %}
-    show databases
+    show databases {% if database %}in {{ database }}{% endif %}
   {% endcall %}
   {{ return(load_result('list_schemas').table) }}
 {% endmacro %}
@@ -350,7 +350,7 @@
 
 
 {% macro spark__generate_database_name(custom_database_name=none, node=none) -%}
-  {% do return(None) %}
+  {{ return(default__generate_database_name(custom_database_name, node)) }}
 {%- endmacro %}
 
 {% macro spark__persist_docs(relation, model, for_relation, for_columns) -%}