pr feedback 2

Author: themisvaltinos

sqlmesh/core/config/model.py

@@ -78,9 +78,3 @@ def _audits_validator(cls, v: t.Any) -> t.Any:
             return [extract_func_call(parse_one(audit)) for audit in v]
 
         return v
-
-    @field_validator("pre_statements", "post_statements", "on_virtual_update", mode="before")
-    def _statements_validator(cls, v: t.Any) -> t.Any:
-        if isinstance(v, list):
-            return [parse_one(stmt) if isinstance(stmt, str) else stmt for stmt in v]
-        return v

sqlmesh/core/model/definition.py

@@ -2474,21 +2474,21 @@ def _create_model(
 
     # Merge default pre_statements with model-specific pre_statements
     if "pre_statements" in defaults:
-        kwargs["pre_statements"] = list(defaults["pre_statements"]) + list(
-            kwargs.get("pre_statements", [])
-        )
+        kwargs["pre_statements"] = [
+            exp.maybe_parse(stmt, dialect=dialect) for stmt in defaults["pre_statements"]
+        ] + kwargs.get("pre_statements", [])
 
     # Merge default post_statements with model-specific post_statements
     if "post_statements" in defaults:
-        kwargs["post_statements"] = list(defaults["post_statements"]) + list(
-            kwargs.get("post_statements", [])
-        )
+        kwargs["post_statements"] = [
+            exp.maybe_parse(stmt, dialect=dialect) for stmt in defaults["post_statements"]
+        ] + kwargs.get("post_statements", [])
 
     # Merge default on_virtual_update with model-specific on_virtual_update
     if "on_virtual_update" in defaults:
-        kwargs["on_virtual_update"] = list(defaults["on_virtual_update"]) + list(
-            kwargs.get("on_virtual_update", [])
-        )
+        kwargs["on_virtual_update"] = [
+            exp.maybe_parse(stmt, dialect=dialect) for stmt in defaults["on_virtual_update"]
+        ] + kwargs.get("on_virtual_update", [])
 
     if "pre_statements" in kwargs:
         statements.extend(kwargs["pre_statements"])

tests/core/test_config.py

@@ -702,18 +702,37 @@ def test_load_model_defaults_statements(tmp_path):
 
     assert config.model_defaults.pre_statements is not None
     assert len(config.model_defaults.pre_statements) == 2
-    assert isinstance(config.model_defaults.pre_statements[0], exp.Set)
-    assert isinstance(config.model_defaults.pre_statements[1], exp.Create)
+    assert isinstance(exp.maybe_parse(config.model_defaults.pre_statements[0]), exp.Set)
+    assert isinstance(exp.maybe_parse(config.model_defaults.pre_statements[1]), exp.Create)
 
     assert config.model_defaults.post_statements is not None
     assert len(config.model_defaults.post_statements) == 3
-    assert isinstance(config.model_defaults.post_statements[0], exp.Drop)
-    assert isinstance(config.model_defaults.post_statements[1], exp.Analyze)
-    assert isinstance(config.model_defaults.post_statements[2], exp.Set)
+    assert isinstance(exp.maybe_parse(config.model_defaults.post_statements[0]), exp.Drop)
+    assert isinstance(exp.maybe_parse(config.model_defaults.post_statements[1]), exp.Analyze)
+    assert isinstance(exp.maybe_parse(config.model_defaults.post_statements[2]), exp.Set)
 
     assert config.model_defaults.on_virtual_update is not None
     assert len(config.model_defaults.on_virtual_update) == 1
-    assert isinstance(config.model_defaults.on_virtual_update[0], exp.Update)
+    assert isinstance(exp.maybe_parse(config.model_defaults.on_virtual_update[0]), exp.Update)
+
+
+def test_load_model_defaults_validation_statements(tmp_path):
+    config_path = tmp_path / "config_model_defaults_statements_wrong.yaml"
+    with open(config_path, "w", encoding="utf-8") as fd:
+        fd.write(
+            """
+model_defaults:
+    dialect: duckdb
+    pre_statements:
+        - 313
+        """
+        )
+
+    with pytest.raises(TypeError, match=r"expected str instance, int found"):
+        config = load_config_from_paths(
+            Config,
+            project_paths=[config_path],
+        )
 
 
 def test_scheduler_config(tmp_path_factory):