Fix!: move cron to metadata hash (#1600)

Author: tobymao

setup.py

@@ -46,7 +46,7 @@
         "requests",
         "rich[jupyter]",
         "ruamel.yaml",
-        "sqlglot~=18.15.0",
+        "sqlglot~=18.16.1",
     ],
     extras_require={
         "bigquery": [

sqlmesh/core/model/definition.py

@@ -749,14 +749,13 @@ def _data_hash_values(self) -> t.List[str]:
         data = [
             str(self.sorted_python_env),
             *self.kind.data_hash_values,
-            self.cron,
             self.storage_format,
             str(self.lookback),
             *(expr.sql() for expr in (self.partitioned_by or [])),
             *(self.clustered_by or []),
             self.stamp,
             self.physical_schema,
-            str(self.interval_unit_) if self.interval_unit_ is not None else None,
+            str(self.interval_unit) if self.interval_unit is not None else None,
         ]
 
         for column_name, column_type in (self.columns_to_types_ or {}).items():
@@ -791,6 +790,7 @@ def metadata_hash(self, audits: t.Dict[str, ModelAudit]) -> str:
             self.dialect,
             self.owner,
             self.description,
+            self.cron,
             str(self.start) if self.start else None,
             str(self.retention) if self.retention else None,
             str(self.batch_size) if self.batch_size is not None else None,

tests/core/engine_adapter/test_mssql.py

@@ -110,7 +110,7 @@ def test_insert_overwrite_by_time_partition_supports_insert_overwrite_pandas(
         [(1, "2022-01-01"), (2, "2022-01-02")],
     )
     assert to_sql_calls(adapter) == [
-        f"""IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = '__temp_test_table_{temp_table_id}') EXEC('CREATE TABLE "__temp_test_table_{temp_table_id}" ("a" INTEGER, "ds" TEXT)');""",
+        f"""IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = '__temp_test_table_{temp_table_id}') EXEC('CREATE TABLE "__temp_test_table_{temp_table_id}" ("a" INTEGER, "ds" VARCHAR(MAX))');""",
         f"""MERGE INTO "test_table" AS "__MERGE_TARGET__" USING (SELECT "a", "ds" FROM (SELECT "a", "ds" FROM "__temp_test_table_{temp_table_id}") AS "_subquery" WHERE "ds" BETWEEN '2022-01-01' AND '2022-01-02') AS "__MERGE_SOURCE__" ON (1 = 0) WHEN NOT MATCHED BY SOURCE AND "ds" BETWEEN '2022-01-01' AND '2022-01-02' THEN DELETE WHEN NOT MATCHED THEN INSERT ("a", "ds") VALUES ("a", "ds");""",
         f'DROP TABLE IF EXISTS "__temp_test_table_{temp_table_id}";',
     ]
@@ -143,7 +143,7 @@ def test_insert_overwrite_by_time_partition_replace_where_pandas(
     )
 
     assert to_sql_calls(adapter) == [
-        f"""IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = '__temp_test_table_{temp_table_id}') EXEC('CREATE TABLE "__temp_test_table_{temp_table_id}" ("a" INTEGER, "ds" TEXT)');""",
+        f"""IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = '__temp_test_table_{temp_table_id}') EXEC('CREATE TABLE "__temp_test_table_{temp_table_id}" ("a" INTEGER, "ds" VARCHAR(MAX))');""",
         f"""MERGE INTO "test_table" AS "__MERGE_TARGET__" USING (SELECT "a", "ds" FROM (SELECT "a", "ds" FROM "__temp_test_table_{temp_table_id}") AS "_subquery" WHERE "ds" BETWEEN '2022-01-01' AND '2022-01-02') AS "__MERGE_SOURCE__" ON (1 = 0) WHEN NOT MATCHED BY SOURCE AND "ds" BETWEEN '2022-01-01' AND '2022-01-02' THEN DELETE WHEN NOT MATCHED THEN INSERT ("a", "ds") VALUES ("a", "ds");""",
         f'DROP TABLE IF EXISTS "__temp_test_table_{temp_table_id}";',
     ]
@@ -190,7 +190,7 @@ def test_create_table(make_mocked_engine_adapter: t.Callable):
     adapter.create_table("test_table", columns_to_types)
 
     adapter.cursor.execute.assert_called_once_with(
-        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" TEXT)');"""
+        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" VARCHAR(MAX))');"""
     )
 
 
@@ -209,7 +209,7 @@ def test_create_table_properties(make_mocked_engine_adapter: t.Callable):
     )
 
     adapter.cursor.execute.assert_called_once_with(
-        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" TEXT)');"""
+        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" VARCHAR(MAX))');"""
     )
 
 
@@ -321,7 +321,7 @@ def test_create_table_primary_key(make_mocked_engine_adapter: t.Callable):
     adapter.create_table("test_table", columns_to_types, primary_key=("cola", "colb"))
 
     adapter.cursor.execute.assert_called_once_with(
-        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" TEXT, PRIMARY KEY ("cola", "colb"))');"""
+        """IF NOT EXISTS (SELECT * FROM information_schema.tables WHERE table_name = 'test_table') EXEC('CREATE TABLE "test_table" ("cola" INTEGER, "colb" VARCHAR(MAX), PRIMARY KEY ("cola", "colb"))');"""
     )
 
 

tests/core/test_snapshot.py

@@ -512,8 +512,8 @@ def test_fingerprint(model: Model, parent_model: Model):
     fingerprint = fingerprint_from_node(model, nodes={})
 
     original_fingerprint = SnapshotFingerprint(
-        data_hash="3811098861",
-        metadata_hash="3858405978",
+        data_hash="3271791330",
+        metadata_hash="1583920325",
     )
 
     assert fingerprint == original_fingerprint
@@ -559,8 +559,8 @@ def test_fingerprint_seed_model():
     )
 
     expected_fingerprint = SnapshotFingerprint(
-        data_hash="3270932819",
-        metadata_hash="1017437962",
+        data_hash="3369758245",
+        metadata_hash="3176816456",
     )
 
     model = load_sql_based_model(expressions, path=Path("./examples/sushi/models/test_model.sql"))
@@ -599,8 +599,8 @@ def test_fingerprint_jinja_macros(model: Model):
         }
     )
     original_fingerprint = SnapshotFingerprint(
-        data_hash="2864998504",
-        metadata_hash="3858405978",
+        data_hash="3383317328",
+        metadata_hash="1583920325",
     )
 
     fingerprint = fingerprint_from_node(model, nodes={})