Merge branch 'main' into add-support-for-trino

gastlich · Sep 20, 2023 · fceea28 · fceea28
2 parents 4950ce7 + b293dd6
commit fceea28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/integration_tests/models/reports/reports.yml b/integration_tests/models/reports/reports.yml
@@ -6,13 +6,18 @@ models:
     access: public
     config:
       materialized: table
+    columns:
+      - name: col 
+        description: col me maybe
+        data_type: boolean
+
   - name: report_2
+    description: the colbert report
     access: public
     config:
       materialized: table
       contract:
         enforced: true
-    description: the colbert report
     columns:
       - name: id 
         data_type: integer
diff --git a/integration_tests/seeds/governance/test_fct_undocumented_public_models.csv b/integration_tests/seeds/governance/test_fct_undocumented_public_models.csv
@@ -1,3 +1,2 @@
 resource_name,access,is_described,total_defined_columns,total_described_columns
-report_1,public,TRUE,0,0
 report_2,public,TRUE,1,0
diff --git a/macros/unpack/get_node_values.sql b/macros/unpack/get_node_values.sql
@@ -28,8 +28,8 @@
                 wrap_string_with_quotes(node.access),
                 wrap_string_with_quotes(node.latest_version),
                 "cast(" ~ contract | trim  ~ " as boolean)",
-                node.columns | length,
-                node.columns | selectattr('description' , 'defined') | list | length,
+                node.columns.values() | list | length,
+                node.columns.values() | list | selectattr('description') | list | length,
                 wrap_string_with_quotes(node.database),
                 wrap_string_with_quotes(node.schema),
                 wrap_string_with_quotes(node.package_name),