Merge pull request #75 from Snowflake-Labs/Remove-parent-to-child-tra…

…versal-for-FK merge earlier emergency fixes
Snowflake-Labs · Aug 19, 2024 · 1a45df7 · 1a45df7
2 parents 682e5ef + b496da7
commit 1a45df7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/macros/create_constraints.sql b/macros/create_constraints.sql
@@ -270,13 +270,13 @@
 
         {%- set test_parameters = test_model.test_metadata.kwargs -%}
         {%- set test_name = test_model.test_metadata.name -%}
-        {%- set selected = test_selected(test_model) -%}
+        {%- set selected = dbt_constraints.test_selected(test_model) -%}
 
         {#- We can shortcut additional tests if the constraint was not selected -#}
         {%- if selected is not none -%}
             {#- rely_clause clause will be RELY if a test passed, NORELY if it failed, and '' if it was skipped -#}
-            {%- set rely_clause = lookup_should_rely(test_model) -%}
-            {%- set always_create_constraint = should_always_create_constraint(test_model) -%}
+            {%- set rely_clause = dbt_constraints.lookup_should_rely(test_model) -%}
+            {%- set always_create_constraint = dbt_constraints.should_always_create_constraint(test_model) -%}
         {%- else -%}
             {%- set rely_clause = '' -%}
             {%- set always_create_constraint = false -%}
@@ -300,7 +300,7 @@
             {#- Find the table models that are referenced by this test. -#}
             {%- for table_node in test_model.depends_on.nodes -%}
                 {%- for node in graph.nodes.values() | selectattr("unique_id", "equalto", table_node)
-                    if node.config.get("materialized", "other") not in ("view", "ephemeral")
+                    if node.config.get("materialized", "other") not in ("view", "ephemeral", "dynamic_table")
                     and ( node.resource_type in ("model", "snapshot", "seed")
                         or ( node.resource_type == "source" and var('dbt_constraints_sources_enabled', false)
                             and ( ( var('dbt_constraints_sources_pk_enabled', false) and test_name in("primary_key") )

diff --git a/macros/snowflake__create_constraints.sql b/macros/snowflake__create_constraints.sql
@@ -22,7 +22,7 @@
 {#- Check that the table does not already have this PK/UK -#}
 {%- set existing_constraint = dbt_constraints.unique_constraint_exists(table_relation, column_names, lookup_cache) -%}
 {%- if constraint_name == existing_constraint -%}
-    {%- do set_rely_norely(table_relation, constraint_name, lookup_cache.unique_keys[table_relation][constraint_name].rely, rely_clause) -%}
+    {%- do dbt_constraints.set_rely_norely(table_relation, constraint_name, lookup_cache.unique_keys[table_relation][constraint_name].rely, rely_clause) -%}
     {%- do lookup_cache.unique_keys.update({table_relation: {constraint_name:
         {  "constraint_name": constraint_name,
             "columns": column_names,
@@ -63,7 +63,7 @@
 {#- Check that the table does not already have this PK/UK -#}
 {%- set existing_constraint = dbt_constraints.unique_constraint_exists(table_relation, column_names, lookup_cache) -%}
 {%- if constraint_name == existing_constraint -%}
-    {%- do set_rely_norely(table_relation, constraint_name, lookup_cache.unique_keys[table_relation][constraint_name].rely, rely_clause) -%}
+    {%- do dbt_constraints.set_rely_norely(table_relation, constraint_name, lookup_cache.unique_keys[table_relation][constraint_name].rely, rely_clause) -%}
     {%- do lookup_cache.unique_keys.update({table_relation: {constraint_name:
         {  "constraint_name": constraint_name,
             "columns": column_names,
@@ -107,7 +107,7 @@
         {#- Check if the table already has this foreign key -#}
         {%- set existing_constraint = dbt_constraints.foreign_key_exists(fk_table_relation, fk_column_names, lookup_cache) -%}
         {%- if constraint_name == existing_constraint -%}
-            {%- do set_rely_norely(fk_table_relation, constraint_name, lookup_cache.foreign_keys[fk_table_relation][constraint_name].rely, rely_clause) -%}
+            {%- do dbt_constraints.set_rely_norely(fk_table_relation, constraint_name, lookup_cache.foreign_keys[fk_table_relation][constraint_name].rely, rely_clause) -%}
             {%- do lookup_cache.foreign_keys.update({fk_table_relation: {constraint_name:
                 {"constraint_name": constraint_name,
                     "columns": fk_column_names,