Merge branch 'main' into 7444/spike-generate-macro-resolution

database/schema/identifier to PublicModel. Update TargetNotFound
exception.

core/dbt/contracts/graph/manifest.py

@@ -568,11 +568,11 @@ class MacroMethods:
 
         return candidates.last()
 
-    def find_generate_macro_by_name(
+    def find_default_generate_macro_by_name(
         self, component: str, root_project_name: str
     ) -> Optional[Macro]:
         """
-        The `generate_X_name` macros are similar to regular ones, but ignore
+        The default `generate_X_name` macros are similar to regular ones, and ignore
         imported packages.
             - if there is a `generate_{component}_name` macro in the root
               project, return it
@@ -591,6 +591,21 @@ class MacroMethods:
         )
         return candidates.last()
 
+    def find_package_generate_macros_by_name(
+        self, component: str, root_project_name: str
+    ) -> List[Macro]:
+        """
+        Return any `generate_X_name` macros defined in imported packages
+        """
+
+        def filter(candidate: MacroCandidate) -> bool:
+            return candidate.locality == Locality.Imported
+
+        candidates: CandidateList = self._find_macros_by_name(
+            name=f"generate_{component}_name", root_project_name=root_project_name, filter=filter
+        )
+        return [candidate.macro for candidate in candidates]
+
     def _find_macros_by_name(
         self,
         name: str,

core/dbt/parser/base.py

@@ -71,20 +71,43 @@ class Parser(BaseParser[FinalValue], Generic[FinalValue]):
 
 class RelationUpdate:
     def __init__(self, config: RuntimeConfig, manifest: Manifest, component: str) -> None:
-        macro = manifest.find_generate_macro_by_name(
+        default_macro = manifest.find_default_generate_macro_by_name(
             component=component,
             root_project_name=config.project_name,
         )
-        if macro is None:
+
+        package_macros = manifest.find_package_generate_macros_by_name(
+            component=component,
+            root_project_name=config.project_name,
+        )
+
+        if default_macro is None:
             raise DbtInternalError(f"No macro with name generate_{component}_name found")
 
-        root_context = generate_generate_name_macro_context(macro, config, manifest)
+        default_macro_context = generate_generate_name_macro_context(
-        self.updater = MacroGenerator(macro, root_context)
+            default_macro, config, manifest
+        )
+        self.default_updater = MacroGenerator(default_macro, default_macro_context)
+
+        package_updaters = {}
+        for package_macro in package_macros:
+            imported_macro_context = generate_generate_name_macro_context(
+                package_macro, config, manifest
+            )
+            package_updaters[package_macro.package_name] = MacroGenerator(
+                package_macro, imported_macro_context
+            )
+
+        self.package_updaters = package_updaters
         self.component = component
 
     def __call__(self, parsed_node: Any, config_dict: Dict[str, Any]) -> None:
         override = config_dict.get(self.component)
-        new_value = self.updater(override, parsed_node)
+        if parsed_node.package_name in self.package_updaters:
+            new_value = self.package_updaters[parsed_node.package_name](override, parsed_node)
+        else:
+            new_value = self.default_updater(override, parsed_node)
+
         if isinstance(new_value, str):
             new_value = new_value.strip()
         setattr(parsed_node, self.component, new_value)