From 934e344b951960de07ba7bda326e3a19b51c406c Mon Sep 17 00:00:00 2001 From: CyJay Date: Fri, 6 Mar 2026 21:53:49 +0800 Subject: [PATCH] style: fix code style --- migrate/auto.go | 3 ++- query_column_add.go | 2 +- query_column_drop.go | 2 +- query_delete.go | 2 +- query_index_create.go | 2 +- query_index_drop.go | 2 +- query_insert.go | 3 +-- query_merge.go | 2 +- query_raw.go | 2 +- query_select.go | 12 ++++++------ query_table_create.go | 2 +- query_table_drop.go | 2 +- query_table_truncate.go | 2 +- query_update.go | 2 +- schema/table.go | 10 +++++----- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/migrate/auto.go b/migrate/auto.go index 174a25649..8ce0b1658 100644 --- a/migrate/auto.go +++ b/migrate/auto.go @@ -175,7 +175,8 @@ func NewAutoMigrator(db *bun.DB, opts ...AutoMigratorOption) (*AutoMigrator, err return nil, err } am.dbInspector = dbInspector - am.diffOpts = append(am.diffOpts, withCompareTypeFunc(db.Dialect().(sqlschema.InspectorDialect).CompareType)) + modelInspector := db.Dialect().(sqlschema.InspectorDialect) + am.diffOpts = append(am.diffOpts, withCompareTypeFunc(modelInspector.CompareType)) dbMigrator, err := sqlschema.NewMigrator(db, am.schemaName) if err != nil { diff --git a/query_column_add.go b/query_column_add.go index f8ffec27b..c38579343 100644 --- a/query_column_add.go +++ b/query_column_add.go @@ -140,7 +140,7 @@ func (q *AddColumnQuery) Exec(ctx context.Context, dest ...any) (sql.Result, err } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*AddColumnQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_column_drop.go b/query_column_drop.go index c98a6fbb2..1cee1bfa2 100644 --- a/query_column_drop.go +++ b/query_column_drop.go @@ -132,7 +132,7 @@ func (q *DropColumnQuery) AppendQuery(gen schema.QueryGen, b []byte) (_ []byte, func (q *DropColumnQuery) Exec(ctx context.Context, dest ...any) (sql.Result, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*DropColumnQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_delete.go b/query_delete.go index d6c4d9c0b..f04d2b0ed 100644 --- a/query_delete.go +++ b/query_delete.go @@ -329,7 +329,7 @@ func (q *DeleteQuery) scanOrExec( } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*DeleteQuery](ctx, q) // Generate the query before checking hasReturning. queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) diff --git a/query_index_create.go b/query_index_create.go index bee1e6839..2d4421e01 100644 --- a/query_index_create.go +++ b/query_index_create.go @@ -252,7 +252,7 @@ func (q *CreateIndexQuery) AppendQuery(gen schema.QueryGen, b []byte) (_ []byte, func (q *CreateIndexQuery) Exec(ctx context.Context, dest ...any) (sql.Result, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*CreateIndexQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_index_drop.go b/query_index_drop.go index e73008c78..d152c0d0f 100644 --- a/query_index_drop.go +++ b/query_index_drop.go @@ -118,7 +118,7 @@ func (q *DropIndexQuery) AppendQuery(gen schema.QueryGen, b []byte) (_ []byte, e func (q *DropIndexQuery) Exec(ctx context.Context, dest ...any) (sql.Result, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*DropIndexQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_insert.go b/query_insert.go index d6c8b4fec..2586a46dd 100644 --- a/query_insert.go +++ b/query_insert.go @@ -80,7 +80,6 @@ func (q *InsertQuery) WithQuery(query *WithQuery) *InsertQuery { return q } - //------------------------------------------------------------------------------ func (q *InsertQuery) Table(tables ...string) *InsertQuery { @@ -590,7 +589,7 @@ func (q *InsertQuery) scanOrExec( } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*InsertQuery](ctx, q) // Generate the query before checking hasReturning. queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) diff --git a/query_merge.go b/query_merge.go index 9a8b913b5..f03e31aa8 100644 --- a/query_merge.go +++ b/query_merge.go @@ -259,7 +259,7 @@ func (q *MergeQuery) scanOrExec( } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*MergeQuery](ctx, q) // Generate the query before checking hasReturning. queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) diff --git a/query_raw.go b/query_raw.go index c54d4b81c..89b89bad5 100644 --- a/query_raw.go +++ b/query_raw.go @@ -70,7 +70,7 @@ func (q *RawQuery) scanOrExec( } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*RawQuery](ctx, q) query := q.db.format(q.query, q.args) var res sql.Result diff --git a/query_select.go b/query_select.go index 081dde451..075d517ff 100644 --- a/query_select.go +++ b/query_select.go @@ -857,7 +857,7 @@ func (q *SelectQuery) Rows(ctx context.Context) (*sql.Rows, error) { } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { @@ -882,7 +882,7 @@ func (q *SelectQuery) Exec(ctx context.Context, dest ...any) (res sql.Result, er } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { @@ -946,7 +946,7 @@ func (q *SelectQuery) scanResult(ctx context.Context, dest ...any) (sql.Result, } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { @@ -1002,7 +1002,7 @@ func (q *SelectQuery) Count(ctx context.Context) (int, error) { } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) qq := countQuery{q} @@ -1117,7 +1117,7 @@ func (q *SelectQuery) Exists(ctx context.Context) (bool, error) { func (q *SelectQuery) selectExists(ctx context.Context) (bool, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) qq := selectExistsQuery{q} @@ -1139,7 +1139,7 @@ func (q *SelectQuery) selectExists(ctx context.Context) (bool, error) { func (q *SelectQuery) whereExists(ctx context.Context) (bool, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*SelectQuery](ctx, q) qq := whereExistsQuery{q} diff --git a/query_table_create.go b/query_table_create.go index dee9a76e3..af5e6abfb 100644 --- a/query_table_create.go +++ b/query_table_create.go @@ -377,7 +377,7 @@ func (q *CreateTableQuery) Exec(ctx context.Context, dest ...any) (sql.Result, e } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*CreateTableQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_table_drop.go b/query_table_drop.go index 8f18255cb..b709201d2 100644 --- a/query_table_drop.go +++ b/query_table_drop.go @@ -126,7 +126,7 @@ func (q *DropTableQuery) Exec(ctx context.Context, dest ...any) (sql.Result, err } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*DropTableQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_table_truncate.go b/query_table_truncate.go index 51173c866..7a36382a9 100644 --- a/query_table_truncate.go +++ b/query_table_truncate.go @@ -139,7 +139,7 @@ func (q *TruncateTableQuery) AppendQuery( func (q *TruncateTableQuery) Exec(ctx context.Context, dest ...any) (sql.Result, error) { // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*TruncateTableQuery](ctx, q) queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) if err != nil { diff --git a/query_update.go b/query_update.go index f1c35d660..167ae143e 100644 --- a/query_update.go +++ b/query_update.go @@ -515,7 +515,7 @@ func (q *UpdateQuery) scanOrExec( } // if a comment is propagated via the context, use it - setCommentFromContext(ctx, q) + setCommentFromContext[*UpdateQuery](ctx, q) // Generate the query before checking hasReturning. queryBytes, err := q.AppendQuery(q.db.gen, q.db.makeQueryBytes()) diff --git a/schema/table.go b/schema/table.go index 0d3637177..d117a6184 100644 --- a/schema/table.go +++ b/schema/table.go @@ -129,12 +129,12 @@ func (t *Table) processFields(typ reflect.Type) { sf := typ.Field(i) unexported := sf.PkgPath != "" - tagstr := sf.Tag.Get("bun") - if tagstr == "-" { + tagStr := sf.Tag.Get("bun") + if tagStr == "-" { names[sf.Name] = struct{}{} continue } - tag := tagparser.Parse(tagstr) + tag := tagparser.Parse(tagStr) if unexported && !sf.Anonymous { // unexported continue @@ -177,8 +177,8 @@ func (t *Table) processFields(typ reflect.Type) { } } - if tagstr != "" { - tag := tagparser.Parse(tagstr) + if tagStr != "" { + tag := tagparser.Parse(tagStr) if tag.HasOption("inherit") || tag.HasOption("extend") { t.Name = subtable.Name t.TypeName = subtable.TypeName