merge main into feature/decouple-adapters-from-core

.changes/unreleased/Breaking Changes-20231129-091921.yaml

@@ -0,0 +1,7 @@
+kind: Breaking Changes
+body: Rm --dry-run flag from 'dbt deps --add-package', in favor of just 'dbt deps
+ --lock'
+time: 2023-11-29T09:19:21.071212+01:00
+custom:
+ Author: jtcohen6
+ Issue: "9100"

core/dbt/cli/main.py

@@ -457,7 +457,6 @@ def debug(ctx, **kwargs):
 @p.target
 @p.vars
 @p.source
-@p.dry_run
 @p.lock
 @p.upgrade
 @p.add_package
@@ -483,12 +482,6 @@ def deps(ctx, **kwargs):
  message=f"Version is required in --add-package when a package when source is {flags.SOURCE}",
  option_name="--add-package",
  )
- else:
- if flags.DRY_RUN:
- raise BadOptionUsage(
- message="Invalid flag `--dry-run` when not using `--add-package`.",
- option_name="--dry-run",
- )
  task = DepsTask(flags, ctx.obj["project"])
  results = task.run()
  success = task.interpret_results(results)

core/dbt/cli/params.py

@@ -83,13 +83,6 @@
  hidden=True,
 )
 
-dry_run = click.option(
- "--dry-run",
- envvar=None,
- help="Option to run `dbt deps --add-package` without updating package-lock.yml file.",
- is_flag=True,
-)
-
 empty = click.option(
  "--empty/--no-empty",
  envvar="DBT_EMPTY",

core/dbt/task/deps.py

@@ -221,8 +221,9 @@ def run(self) -> None:
  if previous_hash != current_hash:
  self.lock()
 
- # Early return when dry run or lock only.
- if self.args.dry_run or self.args.lock:
+ # Early return when 'dbt deps --lock'
+ # Just resolve packages and write lock file, don't actually install packages
+ if self.args.lock:
  return
 
  if system.path_exists(self.project.packages_install_path):

tests/adapter/dbt/tests/adapter/basic/test_adapter_methods.py

@@ -90,6 +90,17 @@ def project_config_update(self):
  "name": "adapter_methods",
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  # snowflake need all tables in CAP name
  @pytest.fixture(scope="class")
  def equal_tables(self):

tests/adapter/dbt/tests/adapter/basic/test_base.py

@@ -37,6 +37,17 @@ def project_config_update(self):
  "name": "base",
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_base(self, project):
 
  # seed command

tests/adapter/dbt/tests/adapter/basic/test_docs_generate.py

@@ -428,6 +428,18 @@ def expected_catalog(self, project, profile_user):
  model_stats=no_stats(),
  )
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ alternate_schema = f"{project.test_schema}_test"
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=alternate_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  # Test "--no-compile" flag works and produces no manifest.json
  def test_run_and_generate_no_compile(self, project, expected_catalog):
  start_time = run_and_generate(project, ["--no-compile"])

tests/adapter/dbt/tests/adapter/basic/test_generic_tests.py

@@ -33,6 +33,17 @@ def models(self):
  "schema_table.yml": generic_test_table_yml,
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_generic_tests(self, project):
  # seed command
  results = run_dbt(["seed"])

tests/adapter/dbt/tests/adapter/basic/test_incremental.py

@@ -23,6 +23,17 @@ def models(self):
  def seeds(self):
  return {"base.csv": seeds_base_csv, "added.csv": seeds_added_csv}
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_incremental(self, project):
  # seed command
  results = run_dbt(["seed"])

tests/adapter/dbt/tests/adapter/basic/test_singular_tests.py

@@ -18,6 +18,17 @@ def tests(self):
  def project_config_update(self):
  return {"name": "singular_tests"}
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_singular_tests(self, project):
  # test command
  results = run_dbt(["test"], expect_pass=False)

tests/adapter/dbt/tests/adapter/basic/test_singular_tests_ephemeral.py

@@ -39,6 +39,17 @@ def project_config_update(self):
  "name": "singular_tests_ephemeral",
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_singular_tests_ephemeral(self, project):
  # check results from seed command
  results = run_dbt(["seed"])

tests/adapter/dbt/tests/adapter/basic/test_snapshot_check_cols.py

@@ -35,6 +35,17 @@ def snapshots(self):
  "cc_name_snapshot.sql": cc_name_snapshot_sql,
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_snapshot_check_cols(self, project):
  # seed command
  results = run_dbt(["seed"])

tests/adapter/dbt/tests/adapter/basic/test_snapshot_timestamp.py

@@ -33,6 +33,17 @@ def snapshots(self):
  def project_config_update(self):
  return {"name": "snapshot_strategy_timestamp"}
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def test_snapshot_timestamp(self, project):
  # seed command
  results = run_dbt(["seed"])

tests/adapter/dbt/tests/adapter/incremental/test_incremental_unique_id.py

@@ -344,6 +344,17 @@ def seeds(self):
  "add_new_rows.sql": seeds__add_new_rows_sql,
  }
 
+ @pytest.fixture(autouse=True)
+ def clean_up(self, project):
+ yield
+ with project.adapter.connection_named("__test"):
+ relation = project.adapter.Relation.create(
+ database=project.database, schema=project.test_schema
+ )
+ project.adapter.drop_schema(relation)
+
+ pass
+
  def update_incremental_model(self, incremental_model):
  """update incremental model after the seed table has been updated"""
  model_result_set = run_dbt(["run", "--select", incremental_model])

tests/functional/artifacts/test_previous_version_state.py

@@ -412,7 +412,7 @@ def test_compare_state_current(self, project):
  current_manifest_schema_version == self.CURRENT_EXPECTED_MANIFEST_VERSION
  ), "Sounds like you've bumped the manifest version and need to update this test!"
  # If we need a newly generated manifest, uncomment the following line and commit the result
- self.generate_latest_manifest(project, current_manifest_schema_version)
+ # self.generate_latest_manifest(project, current_manifest_schema_version)
  self.compare_previous_state(project, current_manifest_schema_version, True, 0)
 
  def test_backwards_compatible_versions(self, project):

tests/functional/dependencies/test_dependency_options.py

@@ -75,14 +75,14 @@ def test_deps_add(self, clean_start):
  )
  assert len(os.listdir("dbt_packages")) == 3
 
- def test_deps_add_dry_run(self, clean_start):
+ def test_deps_add_without_install(self, clean_start):
  os.rename("packages.yml", "dependencies.yml")
  run_dbt(
  [
  "deps",
  "--add-package",
  "dbt-labs/[email protected]",
- "--dry-run",
+ "--lock",
  ]
  )
  assert not os.path.exists("dbt_packages")