Fix foreign field naming

vloldik · Oct 26, 2024 · f5e0b69 · f5e0b69
1 parent 7dcbeec
commit f5e0b69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,6 +9,6 @@
         "program": ".",
         "type": "go",
         "cwd": "${cwd}",
-        "args": ["generate", "--module", "github.com/vloldik/dbml-gen", "-i", "./test/test.dbml", "-o", "./test/output", "--backend", "gorm"]
+        "args": ["generate", "--module", "github.com/vloldik/dbml-gen", "-i", "./example/test.dbml", "-o", "./example/output", "--backend", "gorm"]
     }]
 }
diff --git a/example/output/ecommerce/merchant.go b/example/output/ecommerce/merchant.go
diff --git a/example/output/migrates/migrate.go b/example/output/migrates/migrate.go
@@ -7,5 +7,5 @@ import (
 )
 
 func MigrateAll(db *gorm.DB) error {
-	return db.AutoMigrate(&ecommerce.Order{}, &ecommerce.Product{}, &ecommerce.MerchantPeriod{}, &public.User{}, &public.Country{}, &ecommerce.ProductTag{}, &ecommerce.Merchant{}, &ecommerce.OrderItem{})
+	return db.AutoMigrate(&ecommerce.ProductTag{}, &ecommerce.MerchantPeriod{}, &ecommerce.Merchant{}, &public.Country{}, &ecommerce.Order{}, &public.User{}, &ecommerce.OrderItem{}, &ecommerce.Product{})
 }
diff --git a/internal/generator/gormgen/struct_generator.go b/internal/generator/gormgen/struct_generator.go
@@ -105,7 +105,7 @@ func (sg *GORMStructGenerator) createFieldRelation(relation *models.Relationship
 	// True if we want to use []list
 	isX_ToMany := relation.RelationType == models.ManyToMany || relation.RelationType == models.OneToMany
 	qual := sg.getStructQualifier(relation.ToTable)
-	createdFieldName := sg.createRelatedFieldName(relation.ToField, relation.ToTable, isX_ToMany)
+	createdFieldName := sg.createRelatedFieldName(relation.FromField, relation.ToTable, isX_ToMany)
 
 	createdField := jen.Id(createdFieldName)
 	if isX_ToMany {
@@ -186,11 +186,14 @@ func (sg *GORMStructGenerator) getStructQualifier(table *models.Table) string {
 	return qual
 }
 
-func (sg *GORMStructGenerator) createRelatedFieldName(field *models.Field, table *models.Table, isX_toMany bool) string {
-	relatedFieldName := field.DisplayName()
+func (sg *GORMStructGenerator) createRelatedFieldName(fromField *models.Field, toTable *models.Table, isX_toMany bool) string {
+	relatedFieldName := fromField.DisplayName()
 	relatedFieldName, found := strings.CutSuffix(relatedFieldName, "Id")
+	if !found {
+		relatedFieldName, found = strings.CutSuffix(relatedFieldName, "ID")
+	}
 	if len(relatedFieldName) < 2 || !found {
-		relatedFieldName = table.DisplayName()
+		relatedFieldName = toTable.DisplayName()
 	}
 	if sg.structFields.hasName(relatedFieldName) {
 		relatedFieldName = "Related" + relatedFieldName