wdevs/relspecgo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 11 Wiki Activity

feat(writer): 🎉 Update relationship field naming convention
All checks were successful
CI / Test (1.24) (push) Successful in -27m26s
Details
CI / Test (1.25) (push) Successful in -27m14s
Details
CI / Lint (push) Successful in -27m27s
Details
CI / Build (push) Successful in -27m36s
Details
Release / Build and Release (push) Successful in -27m22s
Details
Integration Tests / Integration Tests (push) Successful in -27m17s
Details

Browse Source 
* Refactor generateRelationshipFieldName to use foreign key columns for unique naming.
* Add test for multiple references to the same table to ensure unique relationship field names.
* Update existing tests to reflect new naming convention.
This commit is contained in:
Warky
2026-01-10 13:49:54 +02:00
parent b20ad35485
commit 120ffc6a5a
2 changed files with 121 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/writers/bun/writer.go
View File

@@ -239,7 +239,7 @@ func (w *Writer) addRelationshipFields(modelData *ModelData, table *models.Table
// Create relationship field (has-one in Bun, similar to belongs-to in GORM)
refModelName := w.getModelName(constraint.ReferencedTable)
fieldName := w.generateRelationshipFieldName(constraint.ReferencedTable)
fieldName := w.generateRelationshipFieldName(constraint)
relationTag := w.typeMapper.BuildRelationshipTag(constraint, "has-one")
modelData.AddRelationshipField(&FieldData{
@@ -267,7 +267,7 @@ func (w *Writer) addRelationshipFields(modelData *ModelData, table *models.Table
if constraint.ReferencedTable == table.Name && constraint.ReferencedSchema == schema.Name {
// Add has-many relationship
otherModelName := w.getModelName(otherTable.Name)
fieldName := w.generateRelationshipFieldName(otherTable.Name) + "s" // Pluralize
fieldName := w.generateRelationshipFieldName(constraint) + "s" // Pluralize
relationTag := w.typeMapper.BuildRelationshipTag(constraint, "has-many")
modelData.AddRelationshipField(&FieldData{
@@ -310,10 +310,19 @@ func (w *Writer) getModelName(tableName string) string {
return modelName
}
// generateRelationshipFieldName generates a field name for a relationship
func (w *Writer) generateRelationshipFieldName(tableName string) string {
// Use just the prefix (3 letters) for relationship fields
return GeneratePrefix(tableName)
// generateRelationshipFieldName generates a field name for a relationship based on the foreign key column
func (w *Writer) generateRelationshipFieldName(constraint *models.Constraint) string {
// Use the foreign key column name to ensure uniqueness
// If there are multiple columns, use the first one
if len(constraint.Columns) > 0 {
columnName := constraint.Columns[0]
// Convert to PascalCase for proper Go field naming
// e.g., "rid_filepointer_request" -> "RidFilepointerRequest"
return "Rel" + SnakeCaseToPascalCase(columnName)
}
// Fallback to table-based prefix if no columns defined
return "Rel" + GeneratePrefix(constraint.ReferencedTable)
}
// getPackageName returns the package name from options or defaults to "models"