diff --git a/ch/query_select.go b/ch/query_select.go index d6bfd20..92c66a2 100644 --- a/ch/query_select.go +++ b/ch/query_select.go @@ -68,7 +68,7 @@ func (q *SelectQuery) Err(err error) *SelectQuery { return q } -func (q *SelectQuery) WithQuery(fn func(*SelectQuery) *SelectQuery) *SelectQuery { +func (q *SelectQuery) Apply(fn func(*SelectQuery) *SelectQuery) *SelectQuery { return fn(q) } diff --git a/ch/query_table_create.go b/ch/query_table_create.go index 4e2bcc0..0757e06 100644 --- a/ch/query_table_create.go +++ b/ch/query_table_create.go @@ -34,7 +34,7 @@ func (q *CreateTableQuery) Model(model any) *CreateTableQuery { return q } -func (q *CreateTableQuery) WithQuery(fn func(*CreateTableQuery) *CreateTableQuery) *CreateTableQuery { +func (q *CreateTableQuery) Apply(fn func(*CreateTableQuery) *CreateTableQuery) *CreateTableQuery { return fn(q) } diff --git a/ch/query_view_create.go b/ch/query_view_create.go index 3f23536..14052c4 100644 --- a/ch/query_view_create.go +++ b/ch/query_view_create.go @@ -36,7 +36,7 @@ func (q *CreateViewQuery) Model(model any) *CreateViewQuery { return q } -func (q *CreateViewQuery) WithQuery(fn func(*CreateViewQuery) *CreateViewQuery) *CreateViewQuery { +func (q *CreateViewQuery) Apply(fn func(*CreateViewQuery) *CreateViewQuery) *CreateViewQuery { return fn(q) } diff --git a/ch/query_view_drop.go b/ch/query_view_drop.go index 00a6883..900118d 100644 --- a/ch/query_view_drop.go +++ b/ch/query_view_drop.go @@ -32,7 +32,7 @@ func (q *DropViewQuery) Model(model any) *DropViewQuery { return q } -func (q *DropViewQuery) WithQuery(fn func(*DropViewQuery) *DropViewQuery) *DropViewQuery { +func (q *DropViewQuery) Apply(fn func(*DropViewQuery) *DropViewQuery) *DropViewQuery { return fn(q) } diff --git a/chmigrate/migrator.go b/chmigrate/migrator.go index 045317c..6b62015 100644 --- a/chmigrate/migrator.go +++ b/chmigrate/migrator.go @@ -109,7 +109,7 @@ func (m *Migrator) migrationsWithStatus(ctx context.Context) (MigrationSlice, in func (m *Migrator) Init(ctx context.Context) error { if _, err := m.db.NewCreateTable(). Model((*Migration)(nil)). - WithQuery(func(q *ch.CreateTableQuery) *ch.CreateTableQuery { + Apply(func(q *ch.CreateTableQuery) *ch.CreateTableQuery { if m.replicated { return q.Engine("ReplicatedCollapsingMergeTree(sign)") } @@ -123,7 +123,7 @@ func (m *Migrator) Init(ctx context.Context) error { } if _, err := m.db.NewCreateTable(). Model((*migrationLock)(nil)). - WithQuery(func(q *ch.CreateTableQuery) *ch.CreateTableQuery { + Apply(func(q *ch.CreateTableQuery) *ch.CreateTableQuery { if m.replicated { return q.Engine("ReplicatedMergeTree") }