Fix duplicate error when multiple macros in one file with macro patches (#11531)

Author: gshank

.changes/unreleased/Fixes-20250422-122835.yaml

@@ -0,0 +1,6 @@
+kind: Fixes
+body: Fix duplicate macro error message with multiple macros and multiple patches
+time: 2025-04-22T12:28:35.642843-04:00
+custom:
+  Author: gshank
+  Issue: "4233"

core/dbt/parser/partial.py

@@ -920,10 +920,14 @@ def delete_schema_macro_patch(self, schema_file, macro):
         if macro["name"] in schema_file.macro_patches:
             macro_unique_id = schema_file.macro_patches[macro["name"]]
             del schema_file.macro_patches[macro["name"]]
+        # Need to delete all macros in the same file
+        # and then reapply all schema file updates for those macros
         if macro_unique_id and macro_unique_id in self.saved_manifest.macros:
             macro = self.saved_manifest.macros.pop(macro_unique_id)
             macro_file_id = macro.file_id
             if macro_file_id in self.new_files:
+                source_file = self.saved_files[macro_file_id]
+                self.delete_macro_file(source_file)
                 self.saved_files[macro_file_id] = deepcopy(self.new_files[macro_file_id])
                 self.add_to_pp_files(self.saved_files[macro_file_id])
 

tests/functional/partial_parsing/fixtures.py

@@ -1288,3 +1288,29 @@
 
 
 """
+
+macros_sql = """
+{% macro foo() %}
+    foo
+{% endmacro %}
+
+{% macro bar() %}
+    bar
+{% endmacro %}
+"""
+
+macros_schema1_yml = """
+macros:
+  - name: foo
+    description: Lorem.
+  - name: bar
+    description: Lorem.
+"""
+
+macros_schema2_yml = """
+macros:
+  - name: foo
+    description: Lorem.
+  - name: bar
+    description: Lorem ipsum.
+"""

tests/functional/partial_parsing/test_partial_parsing.py

@@ -39,7 +39,10 @@
     local_dependency__models__model_to_import_sql,
     local_dependency__models__schema_yml,
     local_dependency__seeds__seed_csv,
+    macros_schema1_yml,
+    macros_schema2_yml,
     macros_schema_yml,
+    macros_sql,
     macros_yml,
     model_a_sql,
     model_b_sql,
@@ -255,13 +258,24 @@ def test_pp_models(self, project):
         with pytest.raises(CompilationError):
             results = run_dbt(["--partial-parse", "--warn-error", "run"])
 
-        # put back macro file, got back to schema file with no macro
+        # put back macro file, go back to schema file with no macro
         # add separate macro patch schema file
         write_file(models_schema2_yml, project.project_root, "models", "schema.yml")
         write_file(my_macro_sql, project.project_root, "macros", "my_macro.sql")
         write_file(macros_yml, project.project_root, "macros", "macros.yml")
         results = run_dbt(["--partial-parse", "run"])
 
+        # add macro file with two macros and schema file with patches for both
+        write_file(macros_schema1_yml, project.project_root, "macros", "macros_x.yml")
+        write_file(macros_sql, project.project_root, "macros", "macros_x.sql")
+        results = run_dbt(["--partial-parse", "parse"])
+
+        # modify one of the patches
+        write_file(macros_schema2_yml, project.project_root, "macros", "macros_x.yml")
+        results = run_dbt(["--partial-parse", "parse"])
+        rm_file(project.project_root, "macros", "macros_x.sql")
+        rm_file(project.project_root, "macros", "macros_x.yml")
+
         # delete macro and schema file
         rm_file(project.project_root, "macros", "my_macro.sql")
         rm_file(project.project_root, "macros", "macros.yml")
@@ -565,6 +579,58 @@ def test_skip_macros(self, project):
         assert "Starting full parse." in log_output
 
 
+class TestMacroDescriptionUpdate:
+    @pytest.fixture(scope="class")
+    def models(self):
+        return {
+            "my_model.sql": model_one_sql,
+        }
+
+    @pytest.fixture(scope="class")
+    def macros(self):
+        return {
+            "macros.sql": macros_sql,
+            "schema.yml": macros_schema1_yml,
+        }
+
+    def test_pp_macro_description_update(self, project):
+        # initial parse
+        run_dbt(["parse"])
+
+        manifest = get_manifest(project.project_root)
+        assert "macro.test.foo" in manifest.macros
+        assert "macro.test.bar" in manifest.macros
+        assert manifest.macros["macro.test.foo"].description == "Lorem."
+        assert manifest.macros["macro.test.bar"].description == "Lorem."
+        assert manifest.macros["macro.test.foo"].patch_path == "test://" + normalize(
+            "macros/schema.yml"
+        )
+        assert manifest.macros["macro.test.bar"].patch_path == "test://" + normalize(
+            "macros/schema.yml"
+        )
+
+        # edit YAML in macros-path
+        write_file(macros_schema2_yml, project.project_root, "macros", "schema.yml")
+
+        # parse again
+        run_dbt(["--partial-parse", "parse"])
+
+        manifest = get_manifest(project.project_root)
+        assert "macro.test.foo" in manifest.macros
+        assert "macro.test.bar" in manifest.macros
+        assert manifest.macros["macro.test.foo"].description == "Lorem."
+        assert manifest.macros["macro.test.bar"].description == "Lorem ipsum."
+        assert manifest.macros["macro.test.foo"].patch_path == "test://" + normalize(
+            "macros/schema.yml"
+        )
+        assert manifest.macros["macro.test.bar"].patch_path == "test://" + normalize(
+            "macros/schema.yml"
+        )
+
+        # compile
+        run_dbt(["--partial-parse", "compile"])
+
+
 class TestSnapshots:
     @pytest.fixture(scope="class")
     def models(self):