Merge branch 'main' into prql

dbt-labs · Oct 5, 2022 · 6462be7 · 6462be7
2 parents 615490a + d012451
commit 6462be7
Show file tree

Hide file tree

Showing 40 changed files with 435 additions and 1,317 deletions.
diff --git a/.changes/unreleased/Under the Hood-20220929-134406.yaml b/.changes/unreleased/Under the Hood-20220929-134406.yaml
@@ -0,0 +1,7 @@
+kind: Under the Hood
+body: Added flat_graph attribute the Manifest class's deepcopy() coverage
+time: 2022-09-29T13:44:06.275941-04:00
+custom:
+  Author: peterallenwebb
+  Issue: "5809"
+  PR: "5975"
diff --git a/core/dbt/contracts/graph/manifest.py b/core/dbt/contracts/graph/manifest.py
@@ -780,7 +780,7 @@ def get_used_databases(self):
         return frozenset(x.database for x in chain(self.nodes.values(), self.sources.values()))
 
     def deepcopy(self):
-        return Manifest(
+        copy = Manifest(
             nodes={k: _deepcopy(v) for k, v in self.nodes.items()},
             sources={k: _deepcopy(v) for k, v in self.sources.items()},
             macros={k: _deepcopy(v) for k, v in self.macros.items()},
@@ -793,6 +793,8 @@ def deepcopy(self):
             files={k: _deepcopy(v) for k, v in self.files.items()},
             state_check=_deepcopy(self.state_check),
         )
+        copy.build_flat_graph()
+        return copy
 
     def build_parent_and_child_maps(self):
         edge_members = list(

diff --git a/core/dbt/tests/fixtures/project.py b/core/dbt/tests/fixtures/project.py
@@ -6,6 +6,7 @@
 import warnings
 import yaml
 
+from dbt.exceptions import CompilationException
 import dbt.flags as flags
 from dbt.config.runtime import RuntimeConfig
 from dbt.adapters.factory import get_adapter, register_adapter, reset_adapters, get_adapter_by_type
@@ -481,8 +482,11 @@ def project(
     # See https://github.com/dbt-labs/dbt-core/issues/5041
     # The debug command also results in an AttributeError since `Profile` doesn't have
     # a `load_dependencies` method.
+    # Macros gets executed as part of drop_scheme in core/dbt/adapters/sql/impl.py.  When
+    # the macros have errors (which is what we're actually testing for...) they end up
+    # throwing CompilationExceptions
     try:
         project.drop_test_schema()
-    except (KeyError, AttributeError):
+    except (KeyError, AttributeError, CompilationException):
         pass
     os.chdir(orig_cwd)
diff --git a/test/integration/015_cli_invocation_tests/local_dependency/dbt_project.yml b/test/integration/015_cli_invocation_tests/local_dependency/dbt_project.yml
diff --git a/test/integration/015_cli_invocation_tests/local_dependency/macros/my_test_macro.sql b/test/integration/015_cli_invocation_tests/local_dependency/macros/my_test_macro.sql
diff --git a/test/integration/015_cli_invocation_tests/models/subdir1/subdir2/model.sql b/test/integration/015_cli_invocation_tests/models/subdir1/subdir2/model.sql
diff --git a/test/integration/015_cli_invocation_tests/models/subdir1/subdir2/schema.yml b/test/integration/015_cli_invocation_tests/models/subdir1/subdir2/schema.yml
diff --git a/test/integration/015_cli_invocation_tests/seed.sql b/test/integration/015_cli_invocation_tests/seed.sql
diff --git a/test/integration/015_cli_invocation_tests/seed_custom.sql b/test/integration/015_cli_invocation_tests/seed_custom.sql
diff --git a/test/integration/015_cli_invocation_tests/test_cli_invocation.py b/test/integration/015_cli_invocation_tests/test_cli_invocation.py
diff --git a/test/integration/025_duplicate_model_tests/local_dependency/dbt_project.yml b/test/integration/025_duplicate_model_tests/local_dependency/dbt_project.yml