diff --git a/ch/db_test.go b/ch/db_test.go index 69219d8..7989776 100644 --- a/ch/db_test.go +++ b/ch/db_test.go @@ -48,8 +48,6 @@ func TestCHError(t *testing.T) { } func TestCHTimeout(t *testing.T) { - t.Skip() - ctx := context.Background() db := chDB(ch.WithTimeout(time.Second), ch.WithMaxRetries(0)) diff --git a/ch/query_insert.go b/ch/query_insert.go index aa97693..0fdd003 100644 --- a/ch/query_insert.go +++ b/ch/query_insert.go @@ -191,13 +191,20 @@ func (q *InsertQuery) Exec(ctx context.Context) (sql.Result, error) { } query := internal.String(queryBytes) - fields, err := q.getFields() - if err != nil { - return nil, err + ctx, evt := q.db.beforeQuery(ctx, q, query, nil, q.tableModel) + var res *result + + if q.tableModel != nil { + fields, err := q.getFields() + if err != nil { + return nil, err + } + res, err = q.db.insert(ctx, q.tableModel, query, fields) + } else { + res, err = q.db.exec(ctx, query) } - ctx, evt := q.db.beforeQuery(ctx, q, query, nil, q.tableModel) - res, err := q.db.insert(ctx, q.tableModel, query, fields) q.db.afterQuery(ctx, evt, res, err) + return res, err }