Fix: Adapt get_dbt_version tuple to include patch in version (#4619)

Author: themisvaltinos

sqlmesh/dbt/builtin.py

@@ -30,7 +30,7 @@
 
 class Exceptions:
     def raise_compiler_error(self, msg: str) -> None:
-        if DBT_VERSION >= (1, 4):
+        if DBT_VERSION >= (1, 4, 0):
             from dbt.exceptions import CompilationError
 
             raise CompilationError(msg)

sqlmesh/dbt/manifest.py

@@ -238,7 +238,7 @@ def _load_tests(self) -> None:
             dependencies.macros.append(MacroReference(package="dbt", name="get_where_subquery"))
             dependencies.macros.append(MacroReference(package="dbt", name="should_store_failures"))
 
-            sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+            sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
             dependencies = dependencies.union(self._extra_dependencies(sql, node.package_name))
             dependencies = dependencies.union(
                 self._flatten_dependencies_from_macros(dependencies.macros, node.package_name)
@@ -278,7 +278,7 @@ def _load_models_and_seeds(self) -> None:
                 node_name = f"{node_name}_v{node_version}"
 
             if node.resource_type in {"model", "snapshot"}:
-                sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+                sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
                 dependencies = Dependencies(
                     macros=macro_references, refs=_refs(node), sources=_sources(node)
                 )
@@ -305,7 +305,7 @@ def _load_on_run_start_end(self) -> None:
             if node.resource_type == "operation" and (
                 set(node.tags) & {"on-run-start", "on-run-end"}
             ):
-                sql = node.raw_code if DBT_VERSION >= (1, 3) else node.raw_sql  # type: ignore
+                sql = node.raw_code if DBT_VERSION >= (1, 3, 0) else node.raw_sql  # type: ignore
                 node_name = node.name
                 node_path = Path(node.original_file_path)
 
@@ -339,7 +339,7 @@ def _load_manifest(self) -> Manifest:
 
         variables = (
             self.variable_overrides
-            if DBT_VERSION >= (1, 5)
+            if DBT_VERSION >= (1, 5, 0)
             else json.dumps(self.variable_overrides)
         )
 
@@ -354,7 +354,7 @@ def _load_manifest(self) -> Manifest:
         )
         flags.set_from_args(args, None)
 
-        if DBT_VERSION >= (1, 8):
+        if DBT_VERSION >= (1, 8, 0):
             from dbt_common.context import set_invocation_context  # type: ignore
 
             set_invocation_context(os.environ)
@@ -371,7 +371,7 @@ def _load_manifest(self) -> Manifest:
 
         self._project_name = project.project_name
 
-        if DBT_VERSION >= (1, 8):
+        if DBT_VERSION >= (1, 8, 0):
             from dbt.mp_context import get_mp_context  # type: ignore
 
             register_adapter(runtime_config, get_mp_context())  # type: ignore
@@ -546,7 +546,7 @@ def _macro_references(
 
 
 def _refs(node: ManifestNode) -> t.Set[str]:
-    if DBT_VERSION >= (1, 5):
+    if DBT_VERSION >= (1, 5, 0):
         result = set()
         for r in node.refs:
             ref_name = f"{r.package}.{r.name}" if r.package else r.name

sqlmesh/dbt/relation.py

@@ -1,7 +1,7 @@
 from sqlmesh.dbt.util import DBT_VERSION
 
 
-if DBT_VERSION < (1, 8):
+if DBT_VERSION < (1, 8, 0):
     from dbt.contracts.relation import *  # type: ignore  # noqa: F403
 else:
     from dbt.adapters.contracts.relation import *  # type: ignore # noqa: F403

sqlmesh/dbt/target.py

@@ -167,7 +167,7 @@ def validate_authentication(cls, data: t.Any) -> t.Any:
         if not isinstance(data, dict):
             return data
 
-        if "database" not in data and DBT_VERSION >= (1, 5):
+        if "database" not in data and DBT_VERSION >= (1, 5, 0):
             path = data.get("path")
             data["database"] = (
                 "memory"
@@ -424,7 +424,7 @@ def relation_class(cls) -> t.Type[BaseRelation]:
 
     @classproperty
     def column_class(cls) -> t.Type[Column]:
-        if DBT_VERSION < (1, 6):
+        if DBT_VERSION < (1, 6, 0):
             from dbt.adapters.redshift import RedshiftColumn  # type: ignore
 
             return RedshiftColumn

sqlmesh/dbt/util.py

@@ -5,14 +5,18 @@
 from dbt.version import get_installed_version
 
 
-def _get_dbt_version() -> t.Tuple[int, int]:
+def _get_dbt_version() -> t.Tuple[int, int, int]:
     dbt_version = get_installed_version()
-    return (int(dbt_version.major or "0"), int(dbt_version.minor or "0"))
+    return (
+        int(dbt_version.major or "0"),
+        int(dbt_version.minor or "0"),
+        int(dbt_version.patch or "0"),
+    )
 
 
 DBT_VERSION = _get_dbt_version()
 
-if DBT_VERSION < (1, 8):
+if DBT_VERSION < (1, 8, 0):
     from dbt.clients.agate_helper import table_from_data_flat, empty_table, as_matrix  # type: ignore  # noqa: F401
 else:
     from dbt_common.clients.agate_helper import table_from_data_flat, empty_table, as_matrix  # type: ignore  # noqa: F401

tests/utils/test_metaprogramming.py

@@ -108,7 +108,7 @@ def other_func(a: int) -> int:
 
 
 @contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield
 
 
@@ -141,7 +141,7 @@ def main_func(y: int, foo=exp.true(), *, bar=expressions.Literal.number(1) + 2)
     def closure(z: int) -> int:
         return z + Z
 
-    with test_context_manager():
+    with sample_context_manager():
         pass
 
     return closure(y) + other_func(Y)
@@ -171,7 +171,7 @@ def test_func_globals() -> None:
         "exp": exp,
         "expressions": exp,
         "fetch_data": fetch_data,
-        "test_context_manager": test_context_manager,
+        "sample_context_manager": sample_context_manager,
         "function_with_custom_decorator": function_with_custom_decorator,
         "SQLGLOT_META": SQLGLOT_META,
     }
@@ -211,7 +211,7 @@ def test_normalize_source() -> None:
 
     def closure(z: int):
         return z + Z
-    with test_context_manager():
+    with sample_context_manager():
         pass
     return closure(y) + other_func(Y)"""
     )
@@ -261,7 +261,7 @@ def test_serialize_env() -> None:
 
     def closure(z: int):
         return z + Z
-    with test_context_manager():
+    with sample_context_manager():
         pass
     return closure(y) + other_func(Y)""",
         ),
@@ -318,9 +318,9 @@ def baz(self):
         ),
         "func": Executable(
             payload="""@contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield""",
-            name="test_context_manager",
+            name="sample_context_manager",
             path="test_metaprogramming.py",
             alias="func",
         ),
@@ -344,11 +344,11 @@ def test_context_manager():
     my_lambda()
     return X + a + W""",
         ),
-        "test_context_manager": Executable(
+        "sample_context_manager": Executable(
             payload="""@contextmanager
-def test_context_manager():
+def sample_context_manager():
     yield""",
-            name="test_context_manager",
+            name="sample_context_manager",
             path="test_metaprogramming.py",
         ),
         "wraps": Executable(payload="from functools import wraps", kind=ExecutableKind.IMPORT),