update placement of if else

dbt-labs · May 6, 2024 · b5b72df · b5b72df
1 parent 1b5dc0c
commit b5b72df
Showing 1 changed file with 83 additions and 58 deletions.
diff --git a/schemas/latest/dbt_yml_files-latest.json b/schemas/latest/dbt_yml_files-latest.json
@@ -215,90 +215,76 @@
           "type",
           "type_params"
         ],
-        "properties": {
-          "name": {
-            "type": "string",
-            "pattern": "(?!.*__).*^[a-z][a-z0-9_]*[a-z0-9]$"
-          },
-          "description": {
-            "type": "string"
-          },
-          "type": {
-            "enum": [
-              "SIMPLE",
-              "RATIO",
-              "CUMULATIVE",
-              "DERIVED",
-              "CONVERSION",
-              "simple",
-              "ratio",
-              "cumulative",
-              "derived",
-              "conversion"
-            ]
-          },
-          "filter": {
-            "type": "string"
-          },
-          "group": {
-            "$ref": "#/$defs/group"
+        "if": {
+          "properties": {
+            "type": {
+              "enum": ["SIMPLE", "simple"]
+            }
+          }
+        },
+        "then": {
+          "properties": {
+            "type_params": {
+              "$ref": "#/$defs/simple_metric_type_params"
+            }
+          }
+        },
+        "else": {
+          "if": {
+            "properties": {
+              "type": {
+                "enum": ["derived", "DERIVED"]
+              }
+            }
           },
-          "label": {
-            "type": "string"
+          "then": {
+            "properties": {
+              "type_params": {
+                "$ref": "#/$defs/derived_metric_type_params"
+              }
+            }
           },
-          "type_params": {
+          "else": {
             "if": {
               "properties": {
                 "type": {
-                  "enum": ["SIMPLE", "simple"]
+                  "enum": ["cumulative", "CUMULATIVE"]
                 }
               }
             },
             "then": {
-              "$ref": "#/$defs/simple_metric_type_params"
+              "properties": {
+                "type_params": {
+                  "$ref": "#/$defs/cumulative_metric_type_params"
+                }
+              }
             },
             "else": {
               "if": {
                 "properties": {
                   "type": {
-                    "enum": ["derived", "DERIVED"]
+                    "enum": ["conversion", "CONVERSION"]
                   }
                 }
               },
               "then": {
-                "$ref": "#/$defs/derived_metric_type_params"
+                "properties": {
+                  "type_params": {
+                    "$ref": "#/$defs/conversion_metric_type_params"
+                  }
+                }
               },
               "else": {
                 "if": {
                   "properties": {
                     "type": {
-                      "enum": ["cumulative", "CUMULATIVE"]
+                      "enum": ["ratio", "RATIO"]
                     }
                   }
                 },
                 "then": {
-                  "$ref": "#/$defs/cumulative_metric_type_params"
-                },
-                "else": {
-                  "if": {
-                    "properties": {
-                      "type": {
-                        "enum": ["conversion", "CONVERSION"]
-                      }
-                    }
-                  },
-                  "then": {
-                    "$ref": "#/$defs/conversion_metric_type_params"
-                  },
-                  "else": {
-                    "if": {
-                      "properties": {
-                        "type": {
-                          "enum": ["ratio", "RATIO"]
-                        }
-                      }
-                    },
-                    "then": {
+                  "properties": {
+                    "type_params": {
                       "$ref": "#/$defs/ratio_metric_type_params"
                     }
                   }
@@ -307,6 +293,38 @@
             }
           }
         },
+        "properties": {
+          "name": {
+            "type": "string",
+            "pattern": "(?!.*__).*^[a-z][a-z0-9_]*[a-z0-9]$"
+          },
+          "description": {
+            "type": "string"
+          },
+          "type": {
+            "enum": [
+              "SIMPLE",
+              "RATIO",
+              "CUMULATIVE",
+              "DERIVED",
+              "CONVERSION",
+              "simple",
+              "ratio",
+              "cumulative",
+              "derived",
+              "conversion"
+            ]
+          },
+          "filter": {
+            "type": "string"
+          },
+          "group": {
+            "$ref": "#/$defs/group"
+          },
+          "label": {
+            "type": "string"
+          }
+        },
         "additionalProperties": false
       }
     },
@@ -1447,7 +1465,14 @@
           "type": "string"
         },
         "fill_nulls_with": {
-          "type": ["string", "integer"]
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "integer"
+            }
+          ]
         },
         "filter": {
           "type": "string"