chore: rework inlining and embedding (#948)

bun.go

@@ -20,11 +20,6 @@ type (
 
 	BeforeScanRowHook = schema.BeforeScanRowHook
 	AfterScanRowHook  = schema.AfterScanRowHook
-
-	// DEPRECATED. Use BeforeScanRowHook instead.
-	BeforeScanHook = schema.BeforeScanHook
-	// DEPRECATED. Use AfterScanRowHook instead.
-	AfterScanHook = schema.AfterScanHook
 )
 
 type BeforeSelectHook interface {

internal/dbtest/db_test.go

@@ -275,7 +275,6 @@ func TestDB(t *testing.T) {
 		{testJSONMarshaler},
 		{testNilDriverValue},
 		{testRunInTxAndSavepoint},
-		{testEmbedTypeField},
 		{testDriverValuerReturnsItself},
 		{testNoPanicWhenReturningNullColumns},
 	}
@@ -1440,27 +1439,6 @@ func testEmbedModelPointer(t *testing.T, db *bun.DB) {
 	require.Equal(t, *m1, m2)
 }
 
-func testEmbedTypeField(t *testing.T, db *bun.DB) {
-	type Embed string
-	type Model struct {
-		Embed
-	}
-
-	ctx := context.Background()
-	mustResetModel(t, ctx, db, (*Model)(nil))
-
-	m1 := &Model{
-		Embed: Embed("foo"),
-	}
-	_, err := db.NewInsert().Model(m1).Exec(ctx)
-	require.NoError(t, err)
-
-	var m2 Model
-	err = db.NewSelect().Model(&m2).Scan(ctx)
-	require.NoError(t, err)
-	require.Equal(t, *m1, m2)
-}
-
 type JSONField struct {
 	Foo string `json:"foo"`
 }

internal/dbtest/query_test.go

@@ -664,7 +664,7 @@ func TestQuery(t *testing.T) {
 		func(db *bun.DB) schema.QueryAppender {
 			type ID string
 			type Model struct {
-				ID
+				ID ID
 			}
 			return db.NewInsert().Model(&Model{ID: ID("embed")})
 		},

model_table_has_many.go

@@ -83,9 +83,9 @@ func (m *hasManyModel) Scan(src interface{}) error {
 	column := m.columns[m.scanIndex]
 	m.scanIndex++
 
-	field, err := m.table.Field(column)
-	if err != nil {
-		return err
+	field := m.table.LookupField(column)
+	if field == nil {
+		return fmt.Errorf("bun: %s does not have column %q", m.table.TypeName, column)
 	}
 
 	if err := field.ScanValue(m.strct, src); err != nil {

model_table_struct.go

@@ -116,9 +116,6 @@ func (m *structTableModel) BeforeScanRow(ctx context.Context) error {
 	if m.table.HasBeforeScanRowHook() {
 		return m.strct.Addr().Interface().(schema.BeforeScanRowHook).BeforeScanRow(ctx)
 	}
-	if m.table.HasBeforeScanHook() {
-		return m.strct.Addr().Interface().(schema.BeforeScanHook).BeforeScan(ctx)
-	}
 	return nil
 }
 
@@ -144,21 +141,6 @@ func (m *structTableModel) AfterScanRow(ctx context.Context) error {
 		return firstErr
 	}
 
-	if m.table.HasAfterScanHook() {
-		firstErr := m.strct.Addr().Interface().(schema.AfterScanHook).AfterScan(ctx)
-
-		for _, j := range m.joins {
-			switch j.Relation.Type {
-			case schema.HasOneRelation, schema.BelongsToRelation:
-				if err := j.JoinModel.AfterScanRow(ctx); err != nil && firstErr == nil {
-					firstErr = err
-				}
-			}
-		}
-
-		return firstErr
-	}
-
 	return nil
 }
 
@@ -325,7 +307,7 @@ func (m *structTableModel) scanColumn(column string, src interface{}) (bool, err
 		}
 	}
 
-	if field, ok := m.table.FieldMap[column]; ok {
+	if field := m.table.LookupField(column); field != nil {
 		if src == nil && m.isNil() {
 			return true, nil
 		}

relation_join.go

@@ -262,7 +262,9 @@ func (j *relationJoin) appendBaseAlias(fmter schema.Formatter, b []byte) []byte
 	return append(b, j.BaseModel.Table().SQLAlias...)
 }
 
-func (j *relationJoin) appendSoftDelete(fmter schema.Formatter, b []byte, flags internal.Flag) []byte {
+func (j *relationJoin) appendSoftDelete(
+	fmter schema.Formatter, b []byte, flags internal.Flag,
+) []byte {
 	b = append(b, '.')
 
 	field := j.JoinModel.Table().SoftDeleteField

schema/field.go

@@ -44,6 +44,15 @@ func (f *Field) String() string {
 	return f.Name
 }
 
+func (f *Field) WithIndex(path []int) *Field {
+	if len(path) == 0 {
+		return f
+	}
+	clone := *f
+	clone.Index = makeIndex(path, f.Index)
+	return &clone
+}
+
 func (f *Field) Clone() *Field {
 	cp := *f
 	cp.Index = cp.Index[:len(f.Index):len(f.Index)]
@@ -103,13 +112,6 @@ func (f *Field) AppendValue(fmter Formatter, b []byte, strct reflect.Value) []by
 	return f.Append(fmter, b, fv)
 }
 
-func (f *Field) ScanWithCheck(fv reflect.Value, src interface{}) error {
-	if f.Scan == nil {
-		return fmt.Errorf("bun: Scan(unsupported %s)", f.IndirectType)
-	}
-	return f.Scan(fv, src)
-}
-
 func (f *Field) ScanValue(strct reflect.Value, src interface{}) error {
 	if src == nil {
 		if fv, ok := fieldByIndex(strct, f.Index); ok {
@@ -122,18 +124,13 @@ func (f *Field) ScanValue(strct reflect.Value, src interface{}) error {
 	return f.ScanWithCheck(fv, src)
 }
 
-func (f *Field) SkipUpdate() bool {
-	return f.Tag.HasOption("skipupdate")
+func (f *Field) ScanWithCheck(fv reflect.Value, src interface{}) error {
+	if f.Scan == nil {
+		return fmt.Errorf("bun: Scan(unsupported %s)", f.IndirectType)
+	}
+	return f.Scan(fv, src)
 }
 
-func indexEqual(ind1, ind2 []int) bool {
-	if len(ind1) != len(ind2) {
-		return false
-	}
-	for i, ind := range ind1 {
-		if ind != ind2[i] {
-			return false
-		}
-	}
-	return true
+func (f *Field) SkipUpdate() bool {
+	return f.Tag.HasOption("skipupdate")
 }

schema/hook.go

@@ -28,22 +28,6 @@ var beforeAppendModelHookType = reflect.TypeOf((*BeforeAppendModelHook)(nil)).El
 
 //------------------------------------------------------------------------------
 
-type BeforeScanHook interface {
-	BeforeScan(context.Context) error
-}
-
-var beforeScanHookType = reflect.TypeOf((*BeforeScanHook)(nil)).Elem()
-
-//------------------------------------------------------------------------------
-
-type AfterScanHook interface {
-	AfterScan(context.Context) error
-}
-
-var afterScanHookType = reflect.TypeOf((*AfterScanHook)(nil)).Elem()
-
-//------------------------------------------------------------------------------
-
 type BeforeScanRowHook interface {
 	BeforeScanRow(context.Context) error
 }