address comments

Author: ericj-db

dbt/include/databricks/macros/relations/components/column_mask.sql

@@ -13,27 +13,12 @@
     column_name,
     mask_name,
     using_columns
-  FROM `{{ relation.database|lower }}`.information_schema.column_masks
+  FROM `system`.`information_schema`.`column_masks`
   WHERE table_catalog = '{{ relation.database|lower }}'
     AND table_schema = '{{ relation.schema|lower }}'
     AND table_name = '{{ relation.identifier|lower }}';
 {%- endmacro -%}
 
-{% macro apply_column_masks_from_model_columns(relation) -%}
-  {% if relation.is_hive_metastore() %}
-    {{ exceptions.raise_compiler_error("Column masks are not supported for Hive Metastore") }}
-  {%- endif %}
-  {{ log("Applying column masks from model to relation " ~ relation) }}
-  {% set columns = model.get('columns', {}) %}
-  {% for column_name, column_def in columns.items() %}
-    {% if column_def is mapping and column_def.get('column_mask') %}
-      {%- call statement('main') -%}
-        {{ alter_set_column_mask(relation, column_name, column_def.column_mask) }}
-      {%- endcall -%}
-    {% endif %}
-  {% endfor %}
-{%- endmacro -%}
-
 {% macro apply_column_masks(relation, column_masks) -%}
   {% if relation.is_hive_metastore() %}
     {{ exceptions.raise_compiler_error("Column masks are not supported for Hive Metastore") }}
@@ -56,13 +41,13 @@
 {%- endmacro -%}
 
 {% macro alter_drop_column_mask(relation, column) -%}
-  ALTER TABLE {{ relation.render() }}
+  ALTER {{ relation.type }} {{ relation.render() }}
   ALTER COLUMN {{ column }}
   DROP MASK;
 {%- endmacro -%}
 
 {% macro alter_set_column_mask(relation, column, mask) -%}
-  ALTER TABLE {{ relation.render() }}
+  ALTER {{ relation.type }} {{ relation.render() }}
   ALTER COLUMN {{ column }}
   SET MASK {{ mask.function }}
   {%- if mask.using_columns %}

dbt/include/databricks/macros/relations/materialized_view/create.sql

@@ -1,7 +1,7 @@
 {% macro databricks__get_create_materialized_view_as_sql(relation, sql) -%}
-  {# Column masks result in silent failure for materialized views, so throw custom compiler error #}
+  {# Column masks are supported in DBSQL, but not yet wired up to the adapter. Return a helpful error until supported. #}
   {% if column_mask_exists() %}
-    {% do exceptions.raise_compiler_error("Column masks are not supported for materialized views. Column '" ~ column_name ~ "' has a mask defined.") %}
+    {% do exceptions.raise_compiler_error("Column masks are not supported for materialized views.") %}
   {% endif %}
   {%- set materialized_view = adapter.get_config_from_model(config.model) -%}
   {%- set partition_by = materialized_view.config["partition_by"].partition_by -%}

dbt/include/databricks/macros/relations/view/create.sql

@@ -1,7 +1,7 @@
 {% macro databricks__create_view_as(relation, sql) %}
-  {# Column masks result in silent failure for views, so throw custom compiler error #}
+  {# Column masks are supported in DBSQL, but not yet wired up to the adapter. Return a helpful error until supported. #}
   {% if column_mask_exists() %}
-    {% do exceptions.raise_compiler_error("Column masks are not supported for views. Column '" ~ column_name ~ "' has a mask defined.") %}
+    {% do exceptions.raise_compiler_error("Column masks are not supported for views.") %}
   {% endif %}
   {{ log("Creating view " ~ relation) }}
   create or replace view {{ relation.render() }}