Fix: Include unrendered query into the metadata hash (#3710)

Author: izeigerman

sqlmesh/core/model/definition.py

@@ -1386,6 +1386,10 @@ def _data_hash_values(self) -> t.List[str]:
         data.extend(self.jinja_macros.data_hash_values)
         return data
 
+    @property
+    def _additional_metadata(self) -> t.List[str]:
+        return [*super()._additional_metadata, gen(self.query)]
+
 
 class SeedModel(_Model):
     """The model definition which uses a pre-built static dataset to source the data from.

sqlmesh/migrations/v0068_include_unrendered_query_in_metadata_hash.py

@@ -0,0 +1,5 @@
+"""Include the unrendered query in the metadata hash."""
+
+
+def migrate(state_sync, **kwargs):  # type: ignore
+    pass

tests/core/test_model.py

@@ -6207,7 +6207,6 @@ def noop(evaluator) -> None:
         assert model.metadata_hash != new_model.metadata_hash
     else:
         assert "noop" in new_model._data_hash_values[0]
-        assert not new_model._additional_metadata
         assert model.data_hash != new_model.data_hash
         assert model.metadata_hash == new_model.metadata_hash
 

tests/core/test_snapshot.py

@@ -760,7 +760,7 @@ def test_fingerprint(model: Model, parent_model: Model):
 
     original_fingerprint = SnapshotFingerprint(
         data_hash="1312415267",
-        metadata_hash="2476734280",
+        metadata_hash="2967945306",
     )
 
     assert fingerprint == original_fingerprint
@@ -782,7 +782,7 @@ def test_fingerprint(model: Model, parent_model: Model):
     new_fingerprint = fingerprint_from_node(model, nodes={})
     assert new_fingerprint != fingerprint
     assert new_fingerprint.data_hash != fingerprint.data_hash
-    assert new_fingerprint.metadata_hash == fingerprint.metadata_hash
+    assert new_fingerprint.metadata_hash != fingerprint.metadata_hash
 
     model = SqlModel(**{**model.dict(), "query": parse_one("select 1, ds -- annotation")})
     fingerprint = fingerprint_from_node(model, nodes={})
@@ -796,13 +796,15 @@ def test_fingerprint(model: Model, parent_model: Model):
     fingerprint = fingerprint_from_node(model, nodes={})
     assert new_fingerprint != fingerprint
     assert new_fingerprint.data_hash != fingerprint.data_hash
-    assert new_fingerprint.metadata_hash == fingerprint.metadata_hash
+    assert new_fingerprint.metadata_hash != fingerprint.metadata_hash
+    assert fingerprint.metadata_hash == original_fingerprint.metadata_hash
 
     model = SqlModel(**{**original_model.dict(), "post_statements": [parse_one("DROP TABLE test")]})
     fingerprint = fingerprint_from_node(model, nodes={})
     assert new_fingerprint != fingerprint
     assert new_fingerprint.data_hash != fingerprint.data_hash
-    assert new_fingerprint.metadata_hash == fingerprint.metadata_hash
+    assert new_fingerprint.metadata_hash != fingerprint.metadata_hash
+    assert fingerprint.metadata_hash == original_fingerprint.metadata_hash
 
 
 def test_fingerprint_seed_model():
@@ -858,7 +860,7 @@ def test_fingerprint_jinja_macros(model: Model):
     )
     original_fingerprint = SnapshotFingerprint(
         data_hash="923305614",
-        metadata_hash="2476734280",
+        metadata_hash="2967945306",
     )
 
     fingerprint = fingerprint_from_node(model, nodes={})