Merge pull request #1148 from utherbit/fixgen

fix(gen): detect conflict when generic is not of the same base type
ogen-go · Jan 2, 2024 · 9be9cf9 · 9be9cf9
2 parents 67c195f + 00bf96b
commit 9be9cf9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/gen/schema_gen_sum.go b/gen/schema_gen_sum.go
@@ -465,10 +465,9 @@ func (g *schemaGen) allOf(name string, schema *jsonschema.Schema) (*ir.Type, err
 		return nil, err
 	}
 
-	// Do not modify reference fields, as they may still refer to the original schema.
-	if mergedSchema.Ref.IsZero() {
-		mergedSchema.Ref = schema.Ref
-	}
+	// The reference field must not change
+	mergedSchema.Ref = schema.Ref
+
 	return g.generate(name, mergedSchema, false)
 }