resolve conflicts

dbt-labs · Oct 31, 2023 · 7f26924 · 7f26924
2 parents e1b5dc5 + 13831bd
commit 7f26924
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 4 deletions.
diff --git a/schemas/1.5/dbt_project-1.5.json b/schemas/1.5/dbt_project-1.5.json
@@ -238,12 +238,18 @@
         "+enabled": {
           "$ref": "#/$defs/boolean_or_jinja_string"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+treat_null_values_as_zero": {
           "$ref": "#/$defs/boolean_or_jinja_string"
         },
         "enabled": {
           "$ref": "#/$defs/boolean_or_jinja_string"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "treat_null_values_as_zero": {
           "$ref": "#/$defs/boolean_or_jinja_string"
         }
@@ -295,6 +301,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+hours_to_expiration": {
           "$ref": "#/$defs/hours_to_expiration"
         },
@@ -371,6 +380,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "hours_to_expiration": {
           "$ref": "#/$defs/hours_to_expiration"
         },
@@ -460,6 +472,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -493,6 +508,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },
@@ -548,6 +566,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -596,6 +617,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },
@@ -708,6 +732,9 @@
         "+fail_calc": {
           "$ref": "#/$defs/fail_calc"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+limit": {
           "$ref": "#/$defs/limit"
         },
@@ -738,6 +765,9 @@
         "fail_calc": {
           "$ref": "#/$defs/fail_calc"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "limit": {
           "$ref": "#/$defs/limit"
         },
@@ -810,6 +840,9 @@
         },
         "additionalProperties": false
     },
+    "group": {
+      "type": "string"
+    },
     "hours_to_expiration": {
       "type": "number",
       "description": "Configuration specific to BigQuery adapter used to set an expiration delay (in hours) to a table."

diff --git a/schemas/1.5/dbt_yml_files-1.5.json b/schemas/1.5/dbt_yml_files-1.5.json
@@ -55,6 +55,9 @@
                 "type": "boolean"
               }
             }
+          },
+          "group": {
+            "$ref": "#/$defs/group"
           }
         }
       }
@@ -219,7 +222,7 @@
                 "$ref": "#/$defs/boolean_or_jinja_string"
               },
               "group": {
-                "type": "string"
+                "$ref": "#/$defs/group"
               }
             }
           },
@@ -254,6 +257,9 @@
               "additionalProperties": false
             }
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "label": {
             "type": "string"
           },
@@ -326,7 +332,7 @@
             }
           },
           "group": {
-            "type": "string"
+            "$ref": "#/$defs/group"
           },
           "latest_version": {
             "type": "number"
@@ -424,6 +430,9 @@
               }
             }
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "tests": {
             "type": "array",
             "items": {
@@ -507,6 +516,9 @@
               }
             }
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "meta": {
             "type": "object"
           },
@@ -802,6 +814,9 @@
         },
         "additionalProperties": false
     },
+    "group": {
+      "type": "string"
+    },
     "include_exclude": {
       "type": "object",
       "properties": {

diff --git a/schemas/1.6/dbt_project-1.6.json b/schemas/1.6/dbt_project-1.6.json
@@ -263,6 +263,9 @@
         "+grant_access_to": {
           "$ref": "#/$defs/grant_access_to"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+hours_to_expiration": {
           "$ref": "#/$defs/hours_to_expiration"
         },
@@ -339,6 +342,9 @@
         "grant_access_to": {
           "$ref": "#/$defs/grant_access_to"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "hours_to_expiration": {
           "$ref": "#/$defs/hours_to_expiration"
         },
@@ -428,6 +434,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -461,6 +470,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },
@@ -516,6 +528,9 @@
         "+grants": {
           "$ref": "#/$defs/grants"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+meta": {
           "$ref": "#/$defs/meta"
         },
@@ -564,6 +579,9 @@
         "grants": {
           "$ref": "#/$defs/grants"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "meta": {
           "$ref": "#/$defs/meta"
         },
@@ -676,6 +694,9 @@
         "+fail_calc": {
           "$ref": "#/$defs/fail_calc"
         },
+        "+group": {
+          "$ref": "#/$defs/group"
+        },
         "+limit": {
           "$ref": "#/$defs/limit"
         },
@@ -706,6 +727,9 @@
         "fail_calc": {
           "$ref": "#/$defs/fail_calc"
         },
+        "group": {
+          "$ref": "#/$defs/group"
+        },
         "limit": {
           "$ref": "#/$defs/limit"
         },
@@ -776,7 +800,10 @@
             "$ref": "#/$defs/string_or_array_of_strings"
           }
         },
-        "additionalProperties": false
+        "additionalProperties": false        
+    },
+    "group": {
+      "type": "string"
     },
     "hours_to_expiration": {
       "type": "number",

diff --git a/schemas/1.6/dbt_yml_files-1.6.json b/schemas/1.6/dbt_yml_files-1.6.json
@@ -55,6 +55,9 @@
                 "type": "boolean"
               }
             }
+          },
+          "group": {
+            "$ref": "#/$defs/group"
           }
         }
       }
@@ -196,6 +199,9 @@
           "filter": {
             "type": "string"
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "label": {
             "type": "string"
           },
@@ -259,7 +265,7 @@
             }
           },
           "group": {
-            "type": "string"
+            "$ref": "#/$defs/group"
           },
           "latest_version": {
             "type": "number"
@@ -357,6 +363,9 @@
               }
             }
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "tests": {
             "type": "array",
             "items": {
@@ -491,6 +500,9 @@
               }
             }
           },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
           "meta": {
             "type": "object"
           },
@@ -893,6 +905,9 @@
         },
         "additionalProperties": false
     },
+    "group": {
+      "type": "string"
+    },
     "include_exclude": {
       "type": "object",
       "properties": {

diff --git a/tests/1.5/valid/dbt_project.yml b/tests/1.5/valid/dbt_project.yml
@@ -44,6 +44,7 @@ models:
       materialized: table
     empty_subdirectory:
     another_one:
+      +group: real
       meta: 
         owner: Tony
     contracted_models:
@@ -61,6 +62,7 @@ models:
       jinja_key: "{{ target.name }}"
 
 seeds:
+  +group: sunflower
   test:
     +enabled: false
     empty_subdirectory:

diff --git a/tests/1.6/invalid/dbt_yml_files.yml b/tests/1.6/invalid/dbt_yml_files.yml
@@ -23,6 +23,11 @@ models:
           - unique
           - not_null
 
+semantic_models:
+  - model: ref('models')
+    name: model 
+    group: farmhands_only
+
 metrics:
   - name: new_customers
     label: New Customers marked 'paying'

diff --git a/tests/1.6/valid/dbt_project.yml b/tests/1.6/valid/dbt_project.yml
@@ -44,6 +44,7 @@ models:
       materialized: table
     empty_subdirectory:
     another_one:
+      +group: real
       meta: 
         owner: Tony
     contracted_models:

diff --git a/tests/1.6/valid/dbt_yml_files.yml b/tests/1.6/valid/dbt_yml_files.yml
@@ -71,6 +71,7 @@ models:
 
 snapshots:
   - name: snapshot_name
+    group: analytics
     description: slowly changing dimension
     columns:
       - name: id