Fix: Use version-specific compilation error for dbt projects (#1055)

Author: izeigerman

sqlmesh/dbt/adapter.py

@@ -157,12 +157,16 @@ def __init__(
             identifier=quote_param,
         )
 
-    def get_relation(self, database: str, schema: str, identifier: str) -> t.Optional[BaseRelation]:
+    def get_relation(
+        self, database: t.Optional[str], schema: str, identifier: str
+    ) -> t.Optional[BaseRelation]:
         relations_list = self.list_relations(database, schema)
         matching_relations = [
             r
             for r in relations_list
-            if r.identifier == identifier and r.schema == schema and r.database == database
+            if r.identifier == identifier
+            and r.schema == schema
+            and (r.database == database or database is None)
         ]
         return seq_get(matching_relations, 0)
 

sqlmesh/dbt/builtin.py

@@ -14,16 +14,22 @@
 
 from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.dbt.adapter import BaseAdapter, ParsetimeAdapter, RuntimeAdapter
+from sqlmesh.dbt.util import DBT_VERSION
 from sqlmesh.utils import AttributeDict, yaml
 from sqlmesh.utils.errors import ConfigError, MacroEvalError
 from sqlmesh.utils.jinja import JinjaMacroRegistry, MacroReturnVal
 
 
 class Exceptions:
     def raise_compiler_error(self, msg: str) -> None:
-        from dbt.exceptions import CompilationError
+        if DBT_VERSION >= (1, 4):
+            from dbt.exceptions import CompilationError
 
-        raise CompilationError(msg)
+            raise CompilationError(msg)
+        else:
+            from dbt.exceptions import CompilationException  # type: ignore
+
+            raise CompilationException(msg)
 
     def warn(self, msg: str) -> str:
         print(msg)

sqlmesh/dbt/manifest.py

@@ -14,7 +14,6 @@
 from dbt.config.renderer import DbtProjectYamlRenderer, ProfileRenderer
 from dbt.parser.manifest import ManifestLoader
 from dbt.tracking import do_not_track
-from dbt.version import get_installed_version
 
 from sqlmesh.dbt.basemodel import Dependencies
 from sqlmesh.dbt.macros import MACRO_OVERRIDES
@@ -23,6 +22,7 @@
 from sqlmesh.dbt.seed import SeedConfig
 from sqlmesh.dbt.source import SourceConfig
 from sqlmesh.dbt.test import TestConfig
+from sqlmesh.dbt.util import DBT_VERSION
 from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.jinja import MacroInfo, MacroReference
 
@@ -310,11 +310,6 @@ def _model_node_id(model_name: str, package: str) -> str:
     return f"model.{package}.{model_name}"
 
 
-def _get_dbt_version() -> t.Tuple[int, int]:
-    dbt_version = get_installed_version()
-    return (int(dbt_version.major or "0"), int(dbt_version.minor or "0"))
-
-
 def _test_owner(node: ManifestNode) -> t.Optional[str]:
     attached_node = getattr(node, "attached_node", None)
     if attached_node:
@@ -357,6 +352,3 @@ def _convert_jinja_test_to_macro(test_jinja: str) -> str:
 
     macro = "{% macro test_" + test_jinja[match.span()[-1] :]
     return re.sub(ENDTEST_REGEX, "{% endmacro %}", macro)
-
-
-DBT_VERSION = _get_dbt_version()

sqlmesh/dbt/util.py

@@ -1,5 +1,8 @@
+import typing as t
+
 import agate
 import pandas as pd
+from dbt.version import get_installed_version
 
 
 def pandas_to_agate(df: pd.DataFrame) -> agate.Table:
@@ -9,3 +12,11 @@ def pandas_to_agate(df: pd.DataFrame) -> agate.Table:
     from dbt.clients.agate_helper import table_from_data
 
     return table_from_data(df.to_dict(orient="records"), df.columns.tolist())
+
+
+def _get_dbt_version() -> t.Tuple[int, int]:
+    dbt_version = get_installed_version()
+    return (int(dbt_version.major or "0"), int(dbt_version.minor or "0"))
+
+
+DBT_VERSION = _get_dbt_version()