Fix allOf multi-ref to preserve inheritance with property overrides (#2838)

Author: koxudaxi

src/datamodel_code_generator/parser/jsonschema.py

@@ -1767,7 +1767,8 @@ def _merge_all_of_object(self, obj: JsonSchemaObject) -> JsonSchemaObject | None
         """Merge allOf items when they share object properties to avoid duplicate models.
 
         Skip merging when there is exactly one $ref (inheritance with property overrides).
-        Continue merging when multiple $refs share properties to avoid duplicate fields.
+        Continue merging when multiple $refs have conflicting property definitions to avoid MRO issues.
+        Child property overrides (obj.properties) are not considered conflicts.
         """
         ref_count = sum(1 for item in obj.allOf if item.ref)
         if ref_count == 1:
@@ -1782,10 +1783,6 @@ def _merge_all_of_object(self, obj: JsonSchemaObject) -> JsonSchemaObject | None
                 for prop_name, prop_schema in resolved_item.properties.items():
                     property_signatures.setdefault(prop_name, set()).add(self._schema_signature(prop_schema))
 
-        if obj.properties:
-            for prop_name, prop_schema in obj.properties.items():
-                property_signatures.setdefault(prop_name, set()).add(self._schema_signature(prop_schema))
-
         if not any(len(signatures) > 1 for signatures in property_signatures.values()):
             return None
 

tests/data/expected/main/jsonschema/all_of_multi_ref_with_property_override.py

@@ -0,0 +1,22 @@
+# generated by datamodel-codegen:
+#   filename:  all_of_multi_ref_with_property_override.json
+#   timestamp: 2019-07-26T00:00:00+00:00
+
+from __future__ import annotations
+
+from pydantic import BaseModel, constr
+
+
+class Thing(BaseModel):
+    type: str
+    name: constr(min_length=1)
+
+
+class Location(BaseModel):
+    address: constr(min_length=5)
+
+
+class Person(Thing, Location):
+    type: str | None = 'playground:Person'
+    name: constr(min_length=1) | None = None
+    age: int | None = None

tests/data/jsonschema/all_of_multi_ref_with_property_override.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://example.com/person.schema.json",
+  "title": "Person",
+  "$defs": {
+    "Thing": {
+      "type": "object",
+      "properties": {
+        "type": { "type": "string" },
+        "name": { "type": "string", "minLength": 1 }
+      },
+      "required": ["type", "name"]
+    },
+    "Location": {
+      "type": "object",
+      "properties": {
+        "address": { "type": "string", "minLength": 5 }
+      },
+      "required": ["address"]
+    }
+  },
+  "type": "object",
+  "allOf": [
+    { "$ref": "#/$defs/Thing" },
+    { "$ref": "#/$defs/Location" }
+  ],
+  "properties": {
+    "type": { "default": "playground:Person" },
+    "name": { "minLength": 2 },
+    "age": { "type": "integer" }
+  }
+}

tests/main/jsonschema/test_main_jsonschema.py

@@ -1411,6 +1411,18 @@ def test_main_all_of_ref_with_property_override(output_file: Path) -> None:
         )
 
 
+def test_main_all_of_multi_ref_with_property_override(output_file: Path) -> None:
+    """Test allOf with multiple $refs preserves multi-inheritance when properties are overridden."""
+    with chdir(JSON_SCHEMA_DATA_PATH):
+        run_main_and_assert(
+            input_path=Path("all_of_multi_ref_with_property_override.json"),
+            output_path=output_file,
+            input_file_type="jsonschema",
+            assert_func=assert_file_content,
+            expected_file="all_of_multi_ref_with_property_override.py",
+        )
+
+
 @pytest.mark.skipif(
     black.__version__.split(".")[0] >= "24",
     reason="Installed black doesn't support the old style",