use raw sql for pre- / post- statements

Author: izeigerman

sqlmesh/core/audit/definition.py

@@ -78,9 +78,14 @@ def query(self) -> t.Union[exp.Query, d.JinjaQuery]:
 
     @property
     def expressions(self) -> t.List[exp.Expression]:
-        if self.expressions_:
-            return [e.parse(self.dialect) for e in self.expressions_]
-        return []
+        if not self.expressions_:
+            return []
+        result = []
+        for e in self.expressions_:
+            parsed = e.parse(self.dialect)
+            if not isinstance(parsed, exp.Semicolon):
+                result.append(parsed)
+        return result
 
     @property
     def macro_definitions(self) -> t.List[d.MacroDef]:
@@ -281,8 +286,8 @@ def metadata_hash(self) -> str:
                 self.cron_tz.key if self.cron_tz else None,
             ]
 
-            query = self.render_audit_query() or self.query
-            data.append(gen(query))
+            data.append(self.query_.sql)
+            data.extend([e.sql for e in self.expressions_ or []])
             self._metadata_hash = hash_data(data)
         return self._metadata_hash
 

sqlmesh/core/model/common.py

@@ -616,11 +616,6 @@ def parse_strings_with_macro_refs(value: t.Any, dialect: DialectType) -> t.Any:
 
 
 expression_validator: t.Callable = field_validator(
-    # "query",
-    # "expressions_",
-    "pre_statements_",
-    "post_statements_",
-    "on_virtual_update_",
     "unique_key",
     mode="before",
     check_fields=False,
@@ -719,9 +714,9 @@ def _validate_parsable_sql(
         return field_validator(
             "query_",
             "expressions_",
-            # "pre_statements_",
-            # "post_statements_",
-            # "on_virtual_update_",
+            "pre_statements_",
+            "post_statements_",
+            "on_virtual_update_",
             mode="before",
             check_fields=False,
         )(_validate_parsable_sql)