merge conflicts:

dbt-labs · Dec 12, 2023 · e681dea · e681dea
2 parents 91f7603 + 5072929
commit e681dea
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 100 deletions.
diff --git a/schemas/1.5/dbt_project-1.5.json b/schemas/1.5/dbt_project-1.5.json
@@ -207,6 +207,9 @@
       },
       "additionalProperties": false
     },
+    "invalidate_hard_deletes": {
+      "$ref": "#/$defs/boolean_or_jinja_string"
+    },
     "jinja_string": {
       "type": "string",
       "pattern": "\\{\\{.*\\}\\}"
@@ -569,6 +572,9 @@
         "+group": {
           "$ref": "#/$defs/group"
         },
+        "+invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -620,6 +626,9 @@
         "group": {
           "$ref": "#/$defs/group"
         },
+        "invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },

diff --git a/schemas/1.5/dbt_yml_files-1.5.json b/schemas/1.5/dbt_yml_files-1.5.json
@@ -48,13 +48,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "required": ["show"],
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -138,7 +132,7 @@
                 "type": "string"
               }
             },
-            "additionalProperties": false
+            "additionalProperties": true
           }
         },
         "additionalProperties": false
@@ -176,13 +170,8 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
-          }
+            "$ref": "#/$defs/docs_config"
+        }
         },
         "additionalProperties": false
       }
@@ -324,12 +313,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -423,12 +407,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -509,12 +488,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -758,6 +732,23 @@
         }
       }
     },
+    "docs_config": {
+      "title": "Docs config",
+      "type": "object",
+      "description": "Configurations for the appearance of nodes in the dbt documentation.",
+      "properties": {
+        "node_color": {
+          "type": "string",
+          "description": "The color of the node on the DAG in the documentation. It must be an Hex code or a valid CSS color name.",
+          "pattern": "^(#[a-fA-F0-9]{3}|#[a-fA-F0-9]{6}|[^#][a-zA-Z]*)$"
+        },
+        "show": {
+          "type": "boolean",
+          "default": true
+        }
+      },
+      "additionalProperties": false
+    },
     "freshness_definition": {
       "default": {
         "warn_after": {

diff --git a/schemas/1.6/dbt_project-1.6.json b/schemas/1.6/dbt_project-1.6.json
@@ -204,6 +204,9 @@
       },
       "additionalProperties": false
     },
+    "invalidate_hard_deletes": {
+      "$ref": "#/$defs/boolean_or_jinja_string"
+    },
     "jinja_string": {
       "type": "string",
       "pattern": "\\{\\{.*\\}\\}"
@@ -531,6 +534,9 @@
         "+group": {
           "$ref": "#/$defs/group"
         },
+        "+invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -582,6 +588,9 @@
         "group": {
           "$ref": "#/$defs/group"
         },
+        "invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },

diff --git a/schemas/1.6/dbt_yml_files-1.6.json b/schemas/1.6/dbt_yml_files-1.6.json
@@ -48,13 +48,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "required": ["show"],
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -138,7 +132,7 @@
                 "type": "string"
               }
             },
-            "additionalProperties": false
+            "additionalProperties": true
           }
         },
         "additionalProperties": false
@@ -176,12 +170,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           }
         },
         "additionalProperties": false
@@ -257,12 +246,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -356,12 +340,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -493,12 +472,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "$ref": "#/$defs/group"
@@ -817,6 +791,23 @@
       },
       "additionalProperties": false
     },
+    "docs_config": {
+      "title": "Docs config",
+      "type": "object",
+      "description": "Configurations for the appearance of nodes in the dbt documentation.",
+      "properties": {
+        "node_color": {
+          "type": "string",
+          "description": "The color of the node on the DAG in the documentation. It must be an Hex code or a valid CSS color name.",
+          "pattern": "^(#[a-fA-F0-9]{3}|#[a-fA-F0-9]{6}|[^#][a-zA-Z]*)$"
+        },
+        "show": {
+          "type": "boolean",
+          "default": true
+        }
+      },
+      "additionalProperties": false
+    },
     "entity": {
       "required": ["name", "type"],
       "type": "object",

diff --git a/schemas/dbt_project.json b/schemas/dbt_project.json
@@ -198,6 +198,9 @@
       },
       "additionalProperties": false
     },
+    "invalidate_hard_deletes": {
+      "$ref": "#/$defs/boolean_or_jinja_string"
+    },
     "jinja_string": {
       "type": "string",
       "pattern": "\\{\\{.*\\}\\}"
@@ -539,6 +542,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -587,6 +593,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "invalidate_hard_deletes": {
+          "$ref": "#/$defs/invalidate_hard_deletes"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },

diff --git a/schemas/dbt_yml_files.json b/schemas/dbt_yml_files.json
@@ -48,13 +48,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "required": ["show"],
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           }
         }
       }
@@ -135,7 +129,7 @@
                 "type": "string"
               }
             },
-            "additionalProperties": false
+            "additionalProperties": true
           }
         },
         "additionalProperties": false
@@ -173,12 +167,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           }
         },
         "additionalProperties": false
@@ -318,12 +307,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "group": {
             "type": "string"
@@ -402,9 +386,6 @@
               "enabled": {
                 "$ref": "#/$defs/boolean_or_jinja_string"
               },
-              "grants": {
-                "$ref": "#/$defs/grants"
-              },
               "quote_columns": {
                 "$ref": "#/$defs/boolean_or_jinja_string"
               },
@@ -417,12 +398,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "tests": {
             "type": "array",
@@ -500,12 +476,7 @@
             "type": "string"
           },
           "docs": {
-            "type": "object",
-            "properties": {
-              "show": {
-                "type": "boolean"
-              }
-            }
+            "$ref": "#/$defs/docs_config"
           },
           "meta": {
             "type": "object"

diff --git a/tests/1.5/valid/dbt_project.yml b/tests/1.5/valid/dbt_project.yml
@@ -84,6 +84,7 @@ tests:
 snapshots:
   test:
     +target_schema: schema
+    +invalidate_hard_deletes: true
     +target_database: database
     +grants:
       select: ["role"]