fix: Path resolver for non embedded structs

erezrokah · erezrokah · commit cf964302bf65 · 2022-09-11T14:44:36.000+03:00
diff --git a/codegen/golang.go b/codegen/golang.go
@@ -17,6 +17,11 @@ import (
 
 type TableOptions func(*TableDefinition)
 
+type structFieldWithPath struct {
+	*reflect.StructField
+	path string
+}
+
 //go:embed templates/*.go.tpl
 var TemplatesFS embed.FS
 
@@ -122,28 +127,34 @@ func shouldUnwrapField(t *TableDefinition, field reflect.StructField) bool {
 	return isFieldStruct(field.Type) && (t.unwrapAllEmbeddedStructFields && field.Anonymous || sliceContains(t.structFieldsToUnwrap, field.Name))
 }
 
-func getEmbeddedFields(t *TableDefinition, reflectType reflect.Type) []reflect.StructField {
+func getEmbeddedFields(t *TableDefinition, field reflect.StructField) []structFieldWithPath {
+	reflectType := field.Type
 	if reflectType.Kind() == reflect.Ptr {
 		reflectType = reflectType.Elem()
 	}
 
-	fields := make([]reflect.StructField, 0)
+	fields := make([]structFieldWithPath, 0)
 	for i := 0; i < reflectType.NumField(); i++ {
 		sf := reflectType.Field(i)
-		if ignoreField(t, sf) {
+		if ignoreField(t, &sf) {
 			continue
 		}
-		fields = append(fields, sf)
+		path := sf.Name
+		// For non embedded structs we need to add the parent field name to the path
+		if !field.Anonymous {
+			path = field.Name + "." + path
+		}
+		fields = append(fields, structFieldWithPath{StructField: &sf, path: path})
 	}
 	return fields
 }
 
-func ignoreField(t *TableDefinition, field reflect.StructField) bool {
+func ignoreField(t *TableDefinition, field *reflect.StructField) bool {
 	return len(field.Name) == 0 || unicode.IsLower(rune(field.Name[0])) || sliceContains(t.skipFields, field.Name)
 }
 
-func addColumnFromField(t *TableDefinition, field reflect.StructField, comments map[string]string) {
-	if ignoreField(t, field) {
+func addColumnFromField(t *TableDefinition, field structFieldWithPath, comments map[string]string) {
+	if ignoreField(t, field.StructField) {
 		return
 	}
 
@@ -161,7 +172,7 @@ func addColumnFromField(t *TableDefinition, field reflect.StructField, comments
 	}
 
 	// generate a PathResolver to use by default
-	pathResolver := fmt.Sprintf("schema.PathResolver(%q)", field.Name)
+	pathResolver := fmt.Sprintf("schema.PathResolver(%q)", field.path)
 	column := ColumnDefinition{
 		Name:        t.nameTransformer(field.Name),
 		Type:        columnType,
@@ -207,12 +218,12 @@ func NewTableFromStruct(name string, obj interface{}, opts ...TableOptions) (*Ta
 		field := e.Type().Field(i)
 
 		if shouldUnwrapField(&t, field) {
-			embeddedFields := getEmbeddedFields(&t, field.Type)
+			embeddedFields := getEmbeddedFields(&t, field)
 			for _, f := range embeddedFields {
 				addColumnFromField(&t, f, make(map[string]string))
 			}
 		} else {
-			addColumnFromField(&t, field, comments)
+			addColumnFromField(&t, structFieldWithPath{StructField: &field, path: field.Name}, comments)
 		}
 	}
 
diff --git a/codegen/golang_test.go b/codegen/golang_test.go
@@ -110,7 +110,7 @@ var expectedTestTableNonEmbeddedStruct = TableDefinition{
 		// Should not be unwrapped
 		ColumnDefinition{Name: "test_struct", Type: schema.TypeJSON, Resolver: `schema.PathResolver("TestStruct")`},
 		// Should be unwrapped
-		ColumnDefinition{Name: "embedded_string", Type: schema.TypeString, Resolver: `schema.PathResolver("EmbeddedString")`},
+		ColumnDefinition{Name: "embedded_string", Type: schema.TypeString, Resolver: `schema.PathResolver("NonEmbedded.EmbeddedString")`},
 	},
 	nameTransformer: defaultTransformer,
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ var expectedTestTableNonEmbeddedStruct = TableDefinition{`
`110`	`110`	`// Should not be unwrapped`
`111`	`111`	ColumnDefinition{Name: "test_struct", Type: schema.TypeJSON, Resolver: `schema.PathResolver("TestStruct")`},
`112`	`112`	`// Should be unwrapped`
`113`		- ColumnDefinition{Name: "embedded_string", Type: schema.TypeString, Resolver: `schema.PathResolver("EmbeddedString")`},
	`113`	+ ColumnDefinition{Name: "embedded_string", Type: schema.TypeString, Resolver: `schema.PathResolver("NonEmbedded.EmbeddedString")`},
`114`	`114`	`},`
`115`	`115`	`nameTransformer: defaultTransformer,`
`116`	`116`	`}`