From 426fff5b271c00d407c5c7416c6e25f1ad48d046 Mon Sep 17 00:00:00 2001 From: Joel Labes Date: Thu, 8 Aug 2024 14:58:40 +1200 Subject: [PATCH] Demo of fixing plussed/plusless strings --- schemas/latest/dbt_project-latest.json | 21 ++++++--------------- src/latest/dbt_project.py | 9 ++------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/schemas/latest/dbt_project-latest.json b/schemas/latest/dbt_project-latest.json index 3a7e1a4..092ed71 100644 --- a/schemas/latest/dbt_project-latest.json +++ b/schemas/latest/dbt_project-latest.json @@ -1165,13 +1165,14 @@ "+snowflake_warehouse": { "anyOf": [ { - "$ref": "#/$defs/SnowflakeWarehouse" + "type": "string" }, { "type": "null" } ], - "default": null + "default": null, + "title": "+Snowflake Warehouse" }, "+sql_header": { "anyOf": [ @@ -1537,15 +1538,9 @@ "default": false }, "snowflake_warehouse": { - "anyOf": [ - { - "$ref": "#/$defs/SnowflakeWarehouse" - }, - { - "type": "null" - } - ], - "default": null + "default": "", + "title": "Snowflake Warehouse", + "type": "string" }, "sql_header": { "anyOf": [ @@ -2489,10 +2484,6 @@ "title": "SnapshotConfigs", "type": "object" }, - "SnowflakeWarehouse": { - "title": "SnowflakeWarehouse", - "type": "string" - }, "SourceConfigs": { "properties": { "+enabled": { diff --git a/src/latest/dbt_project.py b/src/latest/dbt_project.py index 68be497..6a04283 100644 --- a/src/latest/dbt_project.py +++ b/src/latest/dbt_project.py @@ -190,11 +190,6 @@ class Severity1(Enum): class Severity(RootModel[Union[JinjaString, Severity1]]): root: Union[JinjaString, Severity1] - -class SnowflakeWarehouse(RootModel[str]): - root: str - - class SqlHeader(RootModel[str]): root: str @@ -474,7 +469,7 @@ class ModelConfigs(BaseModel): field_pre_hook: Optional[ArrayOfStrings] = Field(None, alias='+pre-hook') field_schema: Optional[Schema] = Field(None, alias='+schema') field_secure: Optional[BooleanOrJinjaString] = Field(False, alias='+secure') - field_snowflake_warehouse: Optional[SnowflakeWarehouse] = Field( + field_snowflake_warehouse: Optional[str] = Field( None, alias='+snowflake_warehouse' ) field_sql_header: Optional[SqlHeader] = Field(None, alias='+sql_header') @@ -510,7 +505,7 @@ class ModelConfigs(BaseModel): pre_hook: Optional[ArrayOfStrings] = Field(None, alias='pre-hook') schema_: Optional[Schema] = Field(None, alias='schema') secure: Optional[BooleanOrJinjaString] = False - snowflake_warehouse: Optional[SnowflakeWarehouse] = None + snowflake_warehouse: str = "" sql_header: Optional[SqlHeader] = None tags: Optional[Tags] = None target_lag: Optional[TargetLag] = None