fix: pii tag takes precedence over show_sample_rows tag

Author: joostboon

macros/edr/system/system_utils/get_pii_columns_from_parent_model.sql

@@ -49,12 +49,21 @@
     {% for column_node in column_nodes.values() %}
         {% set all_column_tags_lower = elementary.get_column_tags(column_node) %}
 
-        {# Skip columns explicitly tagged to show sample rows (if feature is enabled) #}
-        {% if enable_show_tags and elementary.lists_intersection(
-            all_column_tags_lower, show_tags
-        ) | length > 0 %}
-            {% continue %}
-        {% endif %}
+        {# PII takes precedence: only skip if show_sample_rows is set and pii is not #}
+        {% set has_show_tag = (
+            enable_show_tags
+            and elementary.lists_intersection(
+                all_column_tags_lower, show_tags
+            )
+            | length
+            > 0
+        ) %}
+        {% set has_pii_tag = (
+            elementary.lists_intersection(all_column_tags_lower, pii_tags)
+            | length
+            > 0
+        ) %}
+        {% if has_show_tag and not has_pii_tag %} {% continue %} {% endif %}
 
         {% for pii_tag in pii_tags %}
             {% if pii_tag in all_column_tags_lower %}

macros/edr/system/system_utils/is_show_sample_rows_table.sql

@@ -17,6 +17,15 @@
         | list
     ) %}
 
+    {# PII takes precedence: if model has a PII tag, show_sample_rows is ignored #}
+    {% set raw_pii_tags = elementary.get_config_var("pii_tags") %}
+    {% if raw_pii_tags is string %} {% set pii_tags = [raw_pii_tags | lower] %}
+    {% else %} {% set pii_tags = (raw_pii_tags or []) | map("lower") | list %}
+    {% endif %}
+    {% if elementary.lists_intersection(model_tags, pii_tags) | length > 0 %}
+        {% do return(false) %}
+    {% endif %}
+
     {% set intersection = elementary.lists_intersection(model_tags, show_tags) %}
     {% do return(intersection | length > 0) %}
 {% endmacro %}