PR feedback

Author: erindru

sqlmesh/cli/project_init.py

@@ -121,6 +121,13 @@ def _gen_config(
 # https://sqlmesh.readthedocs.io/en/stable/guides/configuration/#virtual-data-environment-modes
 virtual_environment_mode: {VirtualEnvironmentMode.DEV_ONLY.lower()}
 
+# --- Plan Defaults ---
+# https://sqlmesh.readthedocs.io/en/stable/reference/configuration/#plan
+plan:
+  # For Virtual Data Environments, this ensures that any changes are always considered against prod,
+  # rather than the previous state of that environment
+  always_recreate_environment: True
+
 # --- Model Defaults ---
 # https://sqlmesh.readthedocs.io/en/stable/reference/model_configuration/#model-defaults
 model_defaults:

sqlmesh/core/context.py

@@ -1296,7 +1296,6 @@ def plan(
         explain: t.Optional[bool] = None,
         ignore_cron: t.Optional[bool] = None,
         min_intervals: t.Optional[int] = None,
-        always_recreate_environment: t.Optional[bool] = None,
     ) -> Plan:
         """Interactively creates a plan.
 
@@ -1346,7 +1345,6 @@ def plan(
             explain: Whether to explain the plan instead of applying it.
             min_intervals: Adjust the plan start date on a per-model basis in order to ensure at least this many intervals are covered
                 on every model when checking for missing intervals
-            always_recreate_environment: Whether to always recreate the target environment from the `create_from` environment.
 
         Returns:
             The populated Plan object.
@@ -1378,7 +1376,6 @@ def plan(
             explain=explain,
             ignore_cron=ignore_cron,
             min_intervals=min_intervals,
-            always_recreate_environment=always_recreate_environment,
         )
 
         plan = plan_builder.build()
@@ -1431,7 +1428,6 @@ def plan_builder(
         explain: t.Optional[bool] = None,
         ignore_cron: t.Optional[bool] = None,
         min_intervals: t.Optional[int] = None,
-        always_recreate_environment: t.Optional[bool] = None,
     ) -> PlanBuilder:
         """Creates a plan builder.
 
@@ -1470,7 +1466,6 @@ def plan_builder(
             diff_rendered: Whether the diff should compare raw vs rendered models
             min_intervals: Adjust the plan start date on a per-model basis in order to ensure at least this many intervals are covered
                 on every model when checking for missing intervals
-            always_recreate_environment: Whether to always recreate the target environment from the `create_from` environment.
         Returns:
             The plan builder.
         """
@@ -1501,7 +1496,6 @@ def plan_builder(
             "diff_rendered": diff_rendered,
             "skip_linter": skip_linter,
             "min_intervals": min_intervals,
-            "always_recreate_environment": always_recreate_environment,
         }
         user_provided_flags: t.Dict[str, UserProvidedFlags] = {
             k: v for k, v in kwargs.items() if v is not None
@@ -1593,8 +1587,7 @@ def plan_builder(
             or (backfill_models is not None and not backfill_models),
             ensure_finalized_snapshots=self.config.plan.use_finalized_state,
             diff_rendered=diff_rendered,
-            always_recreate_environment=always_recreate_environment
-            or self.config.plan.always_recreate_environment,
+            always_recreate_environment=self.config.plan.always_recreate_environment,
         )
         modified_model_names = {
             *context_diff.modified_snapshots,

sqlmesh_dbt/cli.py

@@ -93,6 +93,7 @@ def dbt(
     help="If specified, dbt will drop incremental models and fully-recalculate the incremental table from the model definition.",
 )
 @click.option(
+    "--env",
     "--environment",
     help="Run against a specific Virtual Data Environment (VDE) instead of the main environment",
 )

sqlmesh_dbt/operations.py

@@ -109,10 +109,9 @@ def _plan_options(
                 dict(
                     # don't create views for all of prod in the dev environment
                     include_unmodified=False,
-                    # always plan from scratch against prod rather than planning against the previous state of an existing dev environment
-                    # this results in the full scope of changes vs prod always being shown on the local branch
+                    # always plan from scratch against prod. note that this is coupled with the `always_recreate_environment=True` setting in the default config file.
+                    # the result is that rather than planning against the previous state of an existing dev environment, the full scope of changes vs prod are always shown
                     create_from=c.PROD,
-                    always_recreate_environment=True,
                     # Always enable dev previews for incremental / forward-only models.
                     # Due to how DBT does incrementals (INCREMENTAL_UNMANAGED on the SQLMesh engine), this will result in the full model being refreshed
                     # with the entire dataset, which can potentially be very large. If this is undesirable, users have two options:

tests/dbt/cli/test_operations.py

@@ -7,6 +7,7 @@
 import time_machine
 from sqlmesh.core.console import NoopConsole
 from sqlmesh.core.plan import PlanBuilder
+from sqlmesh.core.config.common import VirtualEnvironmentMode
 
 pytestmark = pytest.mark.slow
 
@@ -93,6 +94,18 @@ def test_create_can_specify_profile_and_target(jaffle_shop_duckdb: Path):
     assert dbt_project.context.target_name == "dev"
 
 
+def test_default_options(jaffle_shop_duckdb: Path):
+    operations = create()
+
+    config = operations.context.config
+    dbt_project = operations.project
+
+    assert config.plan.always_recreate_environment is True
+    assert config.virtual_environment_mode == VirtualEnvironmentMode.DEV_ONLY
+    assert config.model_defaults.start is not None
+    assert config.model_defaults.dialect == dbt_project.context.target.dialect
+
+
 def test_create_can_set_project_variables(jaffle_shop_duckdb: Path):
     (jaffle_shop_duckdb / "models" / "test_model.sql").write_text("""
        select '{{ var('foo') }}' as a