Merge pull request #1135 from j2gg0s/fix-determine-ambiguous-with-prefix

fix(schema): determine whether a field is ambiguous with prefix

Author: j2gg0s

schema/table.go

@@ -259,13 +259,13 @@ func (t *Table) processFields(typ reflect.Type) {
 	}
 
 	for _, embfield := range embedded {
-		subfield := embfield.subfield.Clone()
-
-		if ambiguousNames[subfield.Name] > 1 &&
-			!(!subfield.Tag.IsZero() && ambiguousTags[subfield.Name] == 1) {
+		if ambiguousNames[embfield.prefix+embfield.subfield.Name] > 1 &&
+			!(!embfield.subfield.Tag.IsZero() && ambiguousTags[embfield.prefix+embfield.subfield.Name] == 1) {
 			continue // ambiguous embedded field
 		}
 
+		subfield := embfield.subfield.Clone()
+
 		subfield.Index = makeIndex(embfield.index, subfield.Index)
 		if embfield.prefix != "" {
 			subfield.Name = embfield.prefix + subfield.Name

schema/table_test.go

@@ -112,6 +112,29 @@ func TestTable(t *testing.T) {
 		require.Equal(t, []int{1, 0}, barView.Index)
 	})
 
+	t.Run("unambiguous embed field", func(t *testing.T) {
+		type Perms struct {
+			View   bool
+			Create bool
+		}
+		type Role struct {
+			Perms        // should be ignore
+			Foo    Perms `bun:"embed:foo_"`
+			View   bool
+			Create bool
+		}
+
+		table := tables.Get(reflect.TypeFor[*Role]())
+
+		view, ok := table.FieldMap["view"]
+		require.True(t, ok)
+		require.Equal(t, []int{2}, view.Index)
+
+		fooView, ok := table.FieldMap["foo_view"]
+		require.True(t, ok)
+		require.Equal(t, []int{1, 0}, fooView.Index)
+	})
+
 	t.Run("embedWithUnique", func(t *testing.T) {
 		type Perms struct {
 			View          bool