Fix!: Remove SQL dialect config for dbt projects (#1189)

Author: treysp

docs/reference/cli.md

@@ -23,7 +23,7 @@ Commands:
   format                  Format all models in a given directory.
   ide                     Start a browser-based SQLMesh IDE.
   info                    Print info.
-  init                    Create a new SQLMesh repository with a default SQL dialect.
+  init                    Create a new SQLMesh repository.
   migrate                 Migrate SQLMesh to the current running version.
   plan                    Plan a migration of the current context's...
   prompt                  Uses LLM to generate a SQL query from a prompt.
@@ -149,9 +149,10 @@ Options:
 
 ## init
 ```
-Usage: sqlmesh init [OPTIONS] SQL_DIALECT
+Usage: sqlmesh init [SQL_DIALECT] [OPTIONS]
 
-  Create a new SQLMesh repository with a default SQL dialect.
+  Create a new SQLMesh repository. Argument SQL_DIALECT is required unless the dbt 
+  template option is specified.
 
 Options:
   -t, --template TEXT  Project template. Support values: airflow, dbt,

docs/reference/notebook.md

@@ -55,9 +55,10 @@ positional arguments:
 
 ## init
 ```
-%init [--template TEMPLATE] path sql_dialect
+%init path sql_dialect [--template TEMPLATE]
 
-Creates a SQLMesh project scaffold with a default SQL dialect.
+Creates a SQLMesh project scaffold. Argument `sql_dialect` is required unless the dbt 
+template option is specified.
 
 positional arguments:
   path                  The path where the new SQLMesh project should be

examples/sushi_dbt/config.py

@@ -3,7 +3,7 @@
 from sqlmesh.core.config import AirflowSchedulerConfig
 from sqlmesh.dbt.loader import sqlmesh_config
 
-config = sqlmesh_config(Path(__file__).parent, default_sql_dialect="duckdb")
+config = sqlmesh_config(Path(__file__).parent)
 
 
 test_config = config
@@ -12,5 +12,4 @@
 airflow_config = sqlmesh_config(
     Path(__file__).parent,
     default_scheduler=AirflowSchedulerConfig(),
-    default_sql_dialect="duckdb",
 )

sqlmesh/cli/example_project.py

@@ -11,7 +11,7 @@ class ProjectTemplate(Enum):
     DEFAULT = "default"
 
 
-def _gen_config(dialect: str, template: ProjectTemplate) -> str:
+def _gen_config(dialect: t.Optional[str], template: ProjectTemplate) -> str:
 
     default_configs = {
         ProjectTemplate.DEFAULT: f"""gateways:
@@ -46,7 +46,7 @@ def _gen_config(dialect: str, template: ProjectTemplate) -> str:
 
 from sqlmesh.dbt.loader import sqlmesh_config
 
-config = sqlmesh_config(Path(__file__).parent, default_sql_dialect='{dialect}'))
+config = sqlmesh_config(Path(__file__).parent)
 """,
     }
 
@@ -153,7 +153,9 @@ def _gen_config(dialect: str, template: ProjectTemplate) -> str:
 
 
 def init_example_project(
-    path: t.Union[str, Path], dialect: str, template: ProjectTemplate = ProjectTemplate.DEFAULT
+    path: t.Union[str, Path],
+    dialect: t.Optional[str],
+    template: ProjectTemplate = ProjectTemplate.DEFAULT,
 ) -> None:
     root_path = Path(path)
     config_extension = "py" if template == ProjectTemplate.DBT else "yaml"
@@ -167,6 +169,11 @@ def init_example_project(
     if config_path.exists():
         raise click.ClickException(f"Found an existing config in '{config_path}'")
 
+    if not dialect and template != ProjectTemplate.DBT:
+        raise click.ClickException(
+            "Default SQL dialect is a required argument for SQLMesh projects"
+        )
+
     _create_config(config_path, dialect, template)
     if template == ProjectTemplate.DBT:
         return
@@ -185,7 +192,7 @@ def _create_folders(target_folders: t.Sequence[Path]) -> None:
         (folder_path / ".gitkeep").touch()
 
 
-def _create_config(config_path: Path, dialect: str, template: ProjectTemplate) -> None:
+def _create_config(config_path: Path, dialect: t.Optional[str], template: ProjectTemplate) -> None:
     project_config = _gen_config(dialect, template)
 
     _write_file(

sqlmesh/cli/main.py

@@ -96,7 +96,7 @@ def cli(
 
 
 @cli.command("init")
-@click.argument("sql_dialect")
+@click.argument("sql_dialect", required=False)
 @click.option(
     "-t",
     "--template",
@@ -105,8 +105,10 @@ def cli(
 )
 @click.pass_context
 @error_handler
-def init(ctx: click.Context, sql_dialect: str, template: t.Optional[str] = None) -> None:
-    """Create a new SQLMesh repository with a default SQL dialect."""
+def init(
+    ctx: click.Context, sql_dialect: t.Optional[str] = None, template: t.Optional[str] = None
+) -> None:
+    """Create a new SQLMesh repository."""
     try:
         project_template = ProjectTemplate(template.lower() if template else "default")
     except ValueError:

sqlmesh/dbt/context.py

@@ -4,8 +4,6 @@
 from dataclasses import dataclass, field, replace
 from pathlib import Path
 
-from sqlmesh.core.config import ModelDefaultsConfig
-from sqlmesh.core.engine_adapter import EngineAdapter
 from sqlmesh.dbt.manifest import ManifestHelper
 from sqlmesh.dbt.target import TargetConfig
 from sqlmesh.utils import AttributeDict
@@ -26,7 +24,6 @@ class DbtContext:
     """Context for DBT environment"""
 
     project_root: Path = Path()
-    model_defaults: t.Optional[ModelDefaultsConfig] = None
     target_name: t.Optional[str] = None
     profile_name: t.Optional[str] = None
     project_schema: t.Optional[str] = None
@@ -36,8 +33,6 @@ class DbtContext:
         )
     )
 
-    engine_adapter: t.Optional[EngineAdapter] = None
-
     _project_name: t.Optional[str] = None
     _variables: t.Dict[str, t.Any] = field(default_factory=dict)
     _models: t.Dict[str, ModelConfig] = field(default_factory=dict)
@@ -52,8 +47,10 @@ class DbtContext:
     _manifest: t.Optional[ManifestHelper] = None
 
     @property
-    def dialect(self) -> t.Optional[str]:
-        return self.model_defaults.dialect if self.model_defaults else None
+    def dialect(self) -> str:
+        if not self.target:
+            raise SQLMeshError("Target must be configured before calling the dialect property.")
+        return self.target.type
 
     @property
     def project_name(self) -> t.Optional[str]:
@@ -180,7 +177,6 @@ def target(self, value: TargetConfig) -> None:
             raise ConfigError("Project name must be set in the context in order to use a target.")
 
         self._target = value
-        self.engine_adapter = self._target.to_sqlmesh().create_engine_adapter()
         self._jinja_environment = None
 
     def render(self, source: str, **kwargs: t.Any) -> str:

sqlmesh/dbt/loader.py

@@ -21,7 +21,6 @@
 from sqlmesh.dbt.project import Project
 from sqlmesh.dbt.target import TargetConfig
 from sqlmesh.utils import UniqueKeyDict
-from sqlmesh.utils.errors import ConfigError
 from sqlmesh.utils.jinja import JinjaMacroRegistry
 
 logger = logging.getLogger(__name__)
@@ -33,29 +32,19 @@
 def sqlmesh_config(
     project_root: t.Optional[Path] = None,
     state_connection: t.Optional[ConnectionConfig] = None,
-    default_sql_dialect: t.Optional[str] = None,
     **kwargs: t.Any,
 ) -> Config:
-    if default_sql_dialect is None:
-        raise ConfigError(
-            """Default model SQL dialect is a required configuration parameter. In the project's config.py file, set it in the `sqlmesh_config()` argument `default_sql_dialect`. 
-
-For example: 
-    `config = sqlmesh_config(Path(__file__).parent, default_sql_dialect=SQL_DIALECT_IN_QUOTES]))`
-"""
-        )
-
     project_root = project_root or Path()
-    context = DbtContext(
-        project_root=project_root, model_defaults=ModelDefaultsConfig(dialect=default_sql_dialect)
-    )
+    context = DbtContext(project_root=project_root)
     profile = Profile.load(context)
+    model_defaults = kwargs.get("model_defaults", ModelDefaultsConfig())
+    model_defaults.dialect = profile.target.type
 
     return Config(
         default_gateway=profile.target_name,
         gateways={profile.target_name: GatewayConfig(connection=profile.target.to_sqlmesh(), state_connection=state_connection)},  # type: ignore
         loader=DbtLoader,
-        model_defaults=ModelDefaultsConfig(dialect=default_sql_dialect),
+        model_defaults=model_defaults,
         **kwargs,
     )
 
@@ -130,11 +119,7 @@ def _load_project(self) -> Project:
             return self._project
 
         self._project = Project.load(
-            DbtContext(
-                project_root=self._context.path,
-                target_name=self._context.gateway,
-                model_defaults=self._context.config.model_defaults,
-            )
+            DbtContext(project_root=self._context.path, target_name=self._context.gateway)
         )
         for path in self._project.project_files:
             self._track_file(path)

sqlmesh/dbt/model.py

@@ -51,8 +51,6 @@ class ModelConfig(BaseModelConfig):
         time_column: The name of the time column
         cron: A cron string specifying how often the model should be refreshed, leveraging the
             [croniter](https://github.com/kiorky/croniter) library.
-        dialect: The SQL dialect that the model's query is written in. By default,
-            this is assumed to be the dialect of the context.
         batch_size: The maximum number of incremental intervals that can be run per backfill job. If this is None,
             then backfilling this model will do all of history in one job. If this is set, a model's backfill
             will be chunked such that each individual job will only contain jobs with max `batch_size` intervals.
@@ -69,7 +67,6 @@ class ModelConfig(BaseModelConfig):
     sql: SqlStr = SqlStr("")
     time_column: t.Optional[str] = None
     cron: t.Optional[str] = None
-    dialect: t.Optional[str] = None
     batch_size: t.Optional[int] = None
     lookback: t.Optional[int] = None
 
@@ -120,10 +117,6 @@ def _validate_partition_by(cls, v: t.Any) -> t.Union[t.List[str], t.Dict[str, t.
         },
     }
 
-    @property
-    def model_dialect(self) -> t.Optional[str]:
-        return self.dialect or self.meta.get("dialect", None)
-
     @property
     def model_materialization(self) -> Materialization:
         return Materialization(self.materialized.lower())
@@ -250,7 +243,7 @@ def _big_query_partition_by_expr(self) -> exp.Expression:
 
     def to_sqlmesh(self, context: DbtContext) -> Model:
         """Converts the dbt model into a SQLMesh model."""
-        dialect = self.model_dialect or context.dialect
+        dialect = context.dialect
         query = d.jinja_query(self.sql_no_config)
 
         optional_kwargs: t.Dict[str, t.Any] = {}

sqlmesh/dbt/test.py

@@ -34,7 +34,6 @@ class TestConfig(GeneralConfig):
         owner: The name of the model under test.
         column_name: The name of the column under test.
         dependencies: The macros, refs, and sources the test depends upon.
-        dialect: The sql dialect of the test.
         package_name: Name of the package that defines the test.
         alias: The alias for the materialized table where failures are stored (Not supported).
         schema: The schema for the materialized table where the failures are stored (Not supported).
@@ -56,7 +55,6 @@ class TestConfig(GeneralConfig):
     owner: str
     column_name: t.Optional[str] = None
     dependencies: Dependencies = Dependencies()
-    dialect: str = ""
 
     # dbt fields
     package_name: str = ""
@@ -110,7 +108,7 @@ def to_sqlmesh(self, context: DbtContext) -> Audit:
 
         audit = Audit(
             name=self.name,
-            dialect=self.dialect,
+            dialect=context.dialect,
             skip=skip,
             blocking=blocking,
             query=query,

sqlmesh/magics.py

@@ -94,6 +94,8 @@ def context(self, line: str) -> None:
     @argument(
         "sql_dialect",
         type=str,
+        nargs="?",
+        default=None,
         help=f"Default model SQL dialect. Supported values: {sqlglot_dialects()}.",
     )
     @argument(