From d05d160059344dff50e2f25e9fbc165e3e64dd12 Mon Sep 17 00:00:00 2001
From: Themis Valtinos <73662635+themisvaltinos@users.noreply.github.com>
Date: Thu, 19 Mar 2026 21:33:58 +0200
Subject: [PATCH] Chore: Fix flaky test and adapt for sqlglot30.0.3

Signed-off-by: Themis Valtinos <73662635+themisvaltinos@users.noreply.github.com>
---
 sqlmesh/core/dialect.py   | 4 ++++
 sqlmesh/utils/jinja.py    | 5 +++++
 tests/dbt/cli/test_run.py | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/sqlmesh/core/dialect.py b/sqlmesh/core/dialect.py
index ad2d799a6b..3e8f4fe9a7 100644
--- a/sqlmesh/core/dialect.py
+++ b/sqlmesh/core/dialect.py
@@ -566,6 +566,10 @@ def _parse_if(self: Parser) -> t.Optional[exp.Expr]:
         if last_token.token_type == TokenType.R_PAREN:
             self._tokens[-2].comments.extend(last_token.comments)
             self._tokens.pop()
+            if hasattr(self, "_tokens_size"):
+                # keep _tokens_size in sync sqlglot 30.0.3 caches len(_tokens)
+                # _advance() tries to read tokens[index + 1] past the new end
+                self._tokens_size -= 1
         else:
             self.raise_error("Expecting )")
 
diff --git a/sqlmesh/utils/jinja.py b/sqlmesh/utils/jinja.py
index 725842c842..bd82cf225c 100644
--- a/sqlmesh/utils/jinja.py
+++ b/sqlmesh/utils/jinja.py
@@ -79,6 +79,11 @@ def extract(self, jinja: str, dialect: str = "") -> t.Dict[str, MacroInfo]:
         self.reset()
         self.sql = jinja
         self._tokens = Dialect.get_or_raise(dialect).tokenize(jinja)
+
+        # guard for older sqlglot versions (before 30.0.3)
+        if hasattr(self, "_tokens_size"):
+            # keep the cached length in sync
+            self._tokens_size = len(self._tokens)
         self._index = -1
         self._advance()
 
diff --git a/tests/dbt/cli/test_run.py b/tests/dbt/cli/test_run.py
index 4fdb7a0cdb..c640950a27 100644
--- a/tests/dbt/cli/test_run.py
+++ b/tests/dbt/cli/test_run.py
@@ -1,6 +1,7 @@
 import typing as t
 import pytest
 from pathlib import Path
+import shutil
 from click.testing import Result
 import time_machine
 from sqlmesh_dbt.operations import create
@@ -71,6 +72,10 @@ def test_run_with_changes_and_full_refresh(
     if partial_parse_file.exists():
         partial_parse_file.unlink()
 
+    cache_dir = project_path / ".cache"
+    if cache_dir.exists():
+        shutil.rmtree(cache_dir)
+
     # run with --full-refresh. this should:
     # - fully refresh model_a (pick up the new records from external_table)
     # - deploy the local change to model_b (introducing the 'changed' column)