diff --git a/.github/workflows/run-lint.yml b/.github/workflows/run-lint.yml new file mode 100644 index 0000000000..53f8104514 --- /dev/null +++ b/.github/workflows/run-lint.yml @@ -0,0 +1,29 @@ +name: Lint + +permissions: + contents: read + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + lint: + runs-on: [self-hosted, style-checker-aarch64] + steps: + - name: Checkout + uses: actions/checkout@v6 + + - name: Install Go + uses: actions/setup-go@v6 + with: + go-version: "1.25" + + - name: golangci-lint + uses: golangci/golangci-lint-action@v9 + with: + version: v2.11 diff --git a/.golangci.yaml b/.golangci.yaml index 44520afcc8..5522bdfc2b 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,71 +1,48 @@ +version: "2" run: tests: false - skip-dirs: - - benchmark - - tests - - internal/cmd - -linters-settings: - gocritic: - disabled-checks: - - singleCaseSwitch - - commentFormatting - - decorder: - dec-order: - - type - - const - - var - - func - disable-dec-order-check: false - - revive: - enable-all-rules: true - rules: - - name: cyclomatic - disabled: true - - name: argument-limit - disabled: true - - name: function-length - disabled: true - - name: function-result-limit - disabled: true - - name: line-length-limit - disabled: true - - name: file-header - disabled: true - - name: cognitive-complexity - disabled: true - - name: banned-characters - disabled: true - - name: max-public-structs - disabled: true - - name: add-constant - disabled: true - - name: unhandled-error - disabled: true - - name: deep-exit - disabled: true - - name: nested-structs - disabled: true - - gofmt: - rewrite-rules: - - pattern: 'interface{}' - replacement: 'any' - - pattern: 'a[b:len(a)]' - replacement: 'a[b:]' - linters: - disable-all: true + default: none + enable: + - asciicheck + - bodyclose + - gocritic + - govet + - ineffassign + - misspell + - staticcheck + settings: + gocritic: + disabled-checks: + - commentFormatting + - singleCaseSwitch + exclusions: + presets: + - comments + - common-false-positives + - legacy + - std-error-handling + rules: + - linters: [staticcheck] + path: "lib/cityhash102" + paths: + - benchmark + - examples + - tests +formatters: enable: - - asciicheck - - bodyclose - - depguard - - gocritic - - gofmt - - govet - - ineffassign - - imports - - misspell - - staticcheck + - gofmt + - goimports + exclusions: + paths: + - examples + settings: + gofmt: + rewrite-rules: + - pattern: interface{} + replacement: any + - pattern: a[b:len(a)] + replacement: a[b:] + goimports: + local-prefixes: + - "github.com/ClickHouse/clickhouse-go/v2" diff --git a/benchmark/json_test.go b/benchmark/json_test.go index b450041ac1..48c875dc50 100644 --- a/benchmark/json_test.go +++ b/benchmark/json_test.go @@ -4,11 +4,12 @@ import ( "context" "crypto/tls" "encoding/json" + "os" + "testing" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "os" - "testing" ) const testSet string = "json_bench" diff --git a/benchmark/v2/read-native/basic_test.go b/benchmark/v2/read-native/basic_test.go index 8ca08b99f0..265a40f24b 100644 --- a/benchmark/v2/read-native/basic_test.go +++ b/benchmark/v2/read-native/basic_test.go @@ -3,10 +3,11 @@ package main import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" "log" "testing" "time" + + "github.com/ClickHouse/clickhouse-go/v2" ) func getConnection() clickhouse.Conn { diff --git a/benchmark/v2/write-compress-buffer-limit/write_test.go b/benchmark/v2/write-compress-buffer-limit/write_test.go index 218aa18327..7a38dca9a6 100644 --- a/benchmark/v2/write-compress-buffer-limit/write_test.go +++ b/benchmark/v2/write-compress-buffer-limit/write_test.go @@ -3,11 +3,12 @@ package main import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" "log" "runtime" "testing" "time" + + "github.com/ClickHouse/clickhouse-go/v2" ) func bToMb(b uint64) uint64 { diff --git a/benchmark/v2/write-native/write_test.go b/benchmark/v2/write-native/write_test.go index 7e1d6358f4..c8e29664af 100644 --- a/benchmark/v2/write-native/write_test.go +++ b/benchmark/v2/write-native/write_test.go @@ -2,10 +2,11 @@ package main import ( "context" - "github.com/ClickHouse/clickhouse-go/v2" "log" "testing" "time" + + "github.com/ClickHouse/clickhouse-go/v2" ) func getConnection() clickhouse.Conn { diff --git a/bind.go b/bind.go index fa90ade6c3..ebc697f3c1 100644 --- a/bind.go +++ b/bind.go @@ -391,7 +391,7 @@ func format(tz *time.Location, scale TimeUnit, v any) (string, error) { } func join[E any](tz *time.Location, scale TimeUnit, values []E) (string, error) { - items := make([]string, len(values), len(values)) + items := make([]string, len(values)) for i := range values { val, err := format(tz, scale, values[i]) if err != nil { diff --git a/clickhouse_options.go b/clickhouse_options.go index 93a72a9a8a..fdd3895860 100644 --- a/clickhouse_options.go +++ b/clickhouse_options.go @@ -14,6 +14,7 @@ import ( "time" "github.com/ClickHouse/ch-go/compress" + "github.com/ClickHouse/clickhouse-go/v2/lib/churl" ) @@ -413,7 +414,7 @@ func (o Options) setDefaults() *Options { if o.MaxCompressionBuffer <= 0 { o.MaxCompressionBuffer = 10485760 } - if o.Addr == nil || len(o.Addr) == 0 { + if len(o.Addr) == 0 { switch o.Protocol { case Native: o.Addr = []string{"localhost:9000"} diff --git a/clickhouse_rows_test.go b/clickhouse_rows_test.go index 1c0b4e10ce..a6317ffa3e 100644 --- a/clickhouse_rows_test.go +++ b/clickhouse_rows_test.go @@ -1,11 +1,13 @@ package clickhouse import ( - "github.com/ClickHouse/clickhouse-go/v2/lib/column" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" - "github.com/stretchr/testify/assert" "strconv" "testing" + + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) func TestReadWithEmptyBlock(t *testing.T) { diff --git a/clickhouse_std.go b/clickhouse_std.go index 56801d5e6d..3b20458c5f 100644 --- a/clickhouse_std.go +++ b/clickhouse_std.go @@ -55,7 +55,7 @@ func (o *stdConnOpener) Connect(ctx context.Context) (_ driver.Conn, err error) } } - if o.opt.Addr == nil || len(o.opt.Addr) == 0 { + if len(o.opt.Addr) == 0 { return nil, ErrAcquireConnNoAddress } diff --git a/client_info.go b/client_info.go index ac27401604..64f25e9503 100644 --- a/client_info.go +++ b/client_info.go @@ -37,19 +37,11 @@ func (a ClientInfo) Append(b ClientInfo) ClientInfo { Comment: make([]string, 0, len(a.Comment)+len(b.Comment)), } - for _, p := range a.Products { - c.Products = append(c.Products, p) - } - for _, p := range b.Products { - c.Products = append(c.Products, p) - } + c.Products = append(c.Products, a.Products...) + c.Products = append(c.Products, b.Products...) - for _, cm := range a.Comment { - c.Comment = append(c.Comment, cm) - } - for _, cm := range b.Comment { - c.Comment = append(c.Comment, cm) - } + c.Comment = append(c.Comment, a.Comment...) + c.Comment = append(c.Comment, b.Comment...) return c } diff --git a/conn.go b/conn.go index 1b01d6eb78..b3c4f89aca 100644 --- a/conn.go +++ b/conn.go @@ -5,7 +5,6 @@ import ( "crypto/tls" "errors" "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" "io" "log/slog" "net" @@ -13,10 +12,13 @@ import ( "syscall" "time" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/ClickHouse/clickhouse-go/v2/resources" "github.com/ClickHouse/ch-go/compress" chproto "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) diff --git a/conn_error_context_test.go b/conn_error_context_test.go index 7827d43747..4a5a94ad1c 100644 --- a/conn_error_context_test.go +++ b/conn_error_context_test.go @@ -11,9 +11,10 @@ import ( "github.com/ClickHouse/ch-go/compress" chproto "github.com/ClickHouse/ch-go/proto" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) // mockNetConn is a mock net.Conn that can be configured to return specific errors diff --git a/conn_exec.go b/conn_exec.go index f49ddf392c..aa5875e933 100644 --- a/conn_exec.go +++ b/conn_exec.go @@ -2,8 +2,9 @@ package clickhouse import ( "context" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "time" + + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) func (c *connect) exec(ctx context.Context, query string, args ...any) error { diff --git a/conn_http.go b/conn_http.go index 2cc91ae63d..992bfe8da5 100644 --- a/conn_http.go +++ b/conn_http.go @@ -22,8 +22,9 @@ import ( "github.com/ClickHouse/ch-go/compress" chproto "github.com/ClickHouse/ch-go/proto" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "github.com/andybalholm/brotli" + + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) const ( @@ -107,7 +108,8 @@ func applyOptionsToRequest(ctx context.Context, req *http.Request, opt *Options) jwt := queryOpt.jwt useJWT := jwt != "" || useJWTAuth(opt) - if opt.TLS != nil && useJWT { + switch { + case opt.TLS != nil && useJWT: if jwt == "" { var err error jwt, err = opt.GetJWT(ctx) @@ -117,7 +119,7 @@ func applyOptionsToRequest(ctx context.Context, req *http.Request, opt *Options) } req.Header.Set("Authorization", "Bearer "+jwt) - } else if opt.TLS != nil && len(opt.Auth.Username) > 0 { + case opt.TLS != nil && len(opt.Auth.Username) > 0: req.Header.Set("X-ClickHouse-User", opt.Auth.Username) if len(opt.Auth.Password) > 0 { req.Header.Set("X-ClickHouse-Key", opt.Auth.Password) @@ -125,7 +127,7 @@ func applyOptionsToRequest(ctx context.Context, req *http.Request, opt *Options) } else { req.Header.Set("X-ClickHouse-SSL-Certificate-Auth", "on") } - } else if opt.TLS == nil && len(opt.Auth.Username) > 0 { + case opt.TLS == nil && len(opt.Auth.Username) > 0: if len(opt.Auth.Password) > 0 { req.URL.User = url.UserPassword(opt.Auth.Username, opt.Auth.Password) diff --git a/conn_http_async_insert.go b/conn_http_async_insert.go index 11a610312c..2f27a91717 100644 --- a/conn_http_async_insert.go +++ b/conn_http_async_insert.go @@ -20,7 +20,7 @@ func (h *httpConnect) asyncInsert(ctx context.Context, query string, wait bool, } } - res, err := h.sendQuery(ctx, query, &options, nil) + res, err := h.sendQuery(ctx, query, &options, nil) //nolint:bodyclose // false positive if err != nil { return err } diff --git a/conn_http_batch.go b/conn_http_batch.go index d4063050c6..930b30b4c5 100644 --- a/conn_http_batch.go +++ b/conn_http_batch.go @@ -3,13 +3,14 @@ package clickhouse import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "io" "log/slog" "os" "slices" + + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) func fetchColumnNamesAndTypesForInsert(h *httpConnect, release nativeTransportRelease, ctx context.Context, tableName string, requestedColumnNames []string) ([]ColumnNameAndType, error) { @@ -267,7 +268,7 @@ func (b *httpBatch) Send() (err error) { b.conn.logger.Debug("batch: sending via HTTP", slog.Int("columns", len(b.block.Columns)), slog.Int("rows", b.block.Rows())) - res, err := b.conn.sendStreamQuery(b.ctx, pipeReader, &options, headers) + res, err := b.conn.sendStreamQuery(b.ctx, pipeReader, &options, headers) //nolint:bodyclose // false positive if err != nil { return fmt.Errorf("batch sendStreamQuery: %w", err) } diff --git a/conn_http_exec.go b/conn_http_exec.go index fffe108985..e885258dac 100644 --- a/conn_http_exec.go +++ b/conn_http_exec.go @@ -11,7 +11,7 @@ func (h *httpConnect) exec(ctx context.Context, query string, args ...any) error return err } - res, err := h.sendQuery(ctx, query, &options, nil) + res, err := h.sendQuery(ctx, query, &options, nil) //nolint:bodyclose // false positive if err != nil { return err } diff --git a/conn_http_query.go b/conn_http_query.go index cbbd8e6c21..bc7e9897db 100644 --- a/conn_http_query.go +++ b/conn_http_query.go @@ -10,6 +10,7 @@ import ( "log/slog" chproto "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) @@ -46,7 +47,7 @@ func (h *httpConnect) query(ctx context.Context, release nativeTransportRelease, headers["Accept-Encoding"] = h.compression.String() } - res, err := h.sendQuery(ctx, query, &options, headers) + res, err := h.sendQuery(ctx, query, &options, headers) //nolint:bodyclose // false positive if err != nil { err = fmt.Errorf("sendQuery: %w", err) release(h, err) diff --git a/conn_pool_test.go b/conn_pool_test.go index ae7957575d..a8ccd23249 100644 --- a/conn_pool_test.go +++ b/conn_pool_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) func TestConnPool_Cap(t *testing.T) { diff --git a/context.go b/context.go index ffd736d527..4849a80751 100644 --- a/context.go +++ b/context.go @@ -6,8 +6,9 @@ import ( "slices" "time" - "github.com/ClickHouse/clickhouse-go/v2/ext" "go.opentelemetry.io/otel/trace" + + "github.com/ClickHouse/clickhouse-go/v2/ext" ) var _contextOptionKey = &QueryOptions{ diff --git a/ext/ext.go b/ext/ext.go index fba9dc13c3..c0870ade06 100644 --- a/ext/ext.go +++ b/ext/ext.go @@ -2,9 +2,10 @@ package ext import ( "fmt" + "strings" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/ClickHouse/clickhouse-go/v2/lib/proto" - "strings" ) func NewTable(name string, columns ...func(t *Table) error) (*Table, error) { diff --git a/internal/cmd/release/main.go b/internal/cmd/release/main.go index e0207ff6f6..14ff86fa6c 100644 --- a/internal/cmd/release/main.go +++ b/internal/cmd/release/main.go @@ -26,12 +26,20 @@ func main() { return } - releaseURL := getLatestDraftReleaseURL() + releaseURL, err := getLatestDraftReleaseURL() + if err != nil { + log.Fatalln(err) + return + } log.Println("Latest draft release URL:") log.Println(releaseURL) - r := getRelease(releaseURL) + r, err := getRelease(releaseURL) + if err != nil { + log.Fatalln(err) + return + } log.Println("Release tag:") log.Println(r.TagName) @@ -50,7 +58,10 @@ func main() { } changelogPath := changelogFilePath() - prependReleaseToChangelog(changelogPath, r) + if err := prependReleaseToChangelog(changelogPath, r); err != nil { + log.Fatalln(err) + return + } if err := updateClientInfo(major, minor, patch); err != nil { log.Fatalln(err) @@ -60,35 +71,34 @@ func main() { runGoGenerate() runGoFmt() - gitHubOutputReleaseURLIfAvailable(releaseURL) + if err := gitHubOutputReleaseURLIfAvailable(releaseURL); err != nil { + log.Fatalln(err) + return + } } -func gitHubOutputReleaseURLIfAvailable(url string) { +func gitHubOutputReleaseURLIfAvailable(url string) error { if len(url) == 0 { - return + return nil } gitHubOutputFile, exists := os.LookupEnv("GITHUB_OUTPUT") if !exists { - return + return nil } f, err := os.OpenFile(gitHubOutputFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - log.Fatalln(err) - return + return err } - defer func() { - if err := f.Close(); err != nil { - log.Fatalln(err) - } - }() + defer f.Close() - if _, err := f.WriteString(fmt.Sprintf("RELEASE_URL=%s\n", url)); err != nil { - log.Fatalln(err) - return + if _, err := fmt.Fprintf(f, "RELEASE_URL=%s\n", url); err != nil { + return err } + + return nil } func runGoFmt() { @@ -155,24 +165,25 @@ func parseSemVer(version string) (major, minor, patch int, err error) { return } -func prependReleaseToChangelog(changelogPath string, r release) { +func prependReleaseToChangelog(changelogPath string, r release) error { f, err := os.OpenFile(changelogPath, os.O_RDWR, 0666) if err != nil { - log.Fatalln(err) + return err } defer f.Close() content, err := io.ReadAll(f) if err != nil { - log.Fatalln(err) - return + return err } f.Seek(0, io.SeekStart) - f.WriteString(fmt.Sprintf("# %s, %s ", r.TagName, time.Now().Format("2006-01-02"))) + fmt.Fprintf(f, "# %s, %s ", r.TagName, time.Now().Format("2006-01-02")) f.WriteString(r.Body) f.WriteString("\n\n") f.Write(content) + + return nil } func changelogFilePath() string { @@ -187,24 +198,24 @@ func getRootPath() string { return rootPath } -func getRelease(releaseURL string) release { +func getRelease(releaseURL string) (release, error) { req, err := http.NewRequest(http.MethodGet, releaseURL, nil) if err != nil { - log.Fatalln(err) + return release{}, err } req.Header.Set("Authorization", "token "+os.Getenv("GITHUB_TOKEN")) res, err := http.DefaultClient.Do(req) if err != nil { - log.Fatalln(err) + return release{}, err } defer res.Body.Close() - var release release - if err := json.NewDecoder(res.Body).Decode(&release); err != nil { - log.Fatalln(err) + var rel release + if err := json.NewDecoder(res.Body).Decode(&rel); err != nil { + return release{}, err } - return release + return rel, nil } type release struct { @@ -213,17 +224,17 @@ type release struct { TagName string `json:"tag_name"` } -func getLatestDraftReleaseURL() string { +func getLatestDraftReleaseURL() (string, error) { // Fetch the latest release from GitHub repository using GitHub API req, err := http.NewRequest(http.MethodGet, "https://api.github.com/repos/clickhouse/clickhouse-go/releases?per_page=100", nil) if err != nil { - log.Fatalln(err) + return "", err } req.Header.Set("Authorization", "token "+os.Getenv("GITHUB_TOKEN")) res, err := http.DefaultClient.Do(req) if err != nil { - log.Fatalln(err) + return "", err } defer res.Body.Close() @@ -232,18 +243,17 @@ func getLatestDraftReleaseURL() string { Draft bool `json:"draft"` } if err := json.NewDecoder(res.Body).Decode(&releases); err != nil { - log.Fatalln(err) + return "", err } // filter out releases that are not drafts - for i := 0; i < len(releases); { + for i := 0; i < len(releases); i++ { if releases[i].Draft { - return releases[i].URL + return releases[i].URL, nil } } - log.Fatalln("No draft releases found") - return "" + return "", fmt.Errorf("no draft releases found") } func updateClientInfo(major, minor, patch int) error { @@ -273,11 +283,12 @@ func updateClientInfo(major, minor, patch int) error { var newContent string for scanner.Scan() { line := scanner.Text() - if reMajor.MatchString(line) { + switch { + case reMajor.MatchString(line): line = newLines[0] - } else if reMinor.MatchString(line) { + case reMinor.MatchString(line): line = newLines[1] - } else if rePatch.MatchString(line) { + case rePatch.MatchString(line): line = newLines[2] } newContent += line + "\n" diff --git a/lib/chcol/json.go b/lib/chcol/json.go index 69eb465955..dc10977727 100644 --- a/lib/chcol/json.go +++ b/lib/chcol/json.go @@ -123,7 +123,7 @@ func (o *JSON) MarshalJSON() ([]byte, error) { } // Scan implements the sql.Scanner interface -func (o *JSON) Scan(value interface{}) error { +func (o *JSON) Scan(value any) error { switch vv := value.(type) { case JSON: o.valuesByPath = vv.valuesByPath diff --git a/lib/chcol/variant.go b/lib/chcol/variant.go index e8301faf39..f42f9ceffe 100644 --- a/lib/chcol/variant.go +++ b/lib/chcol/variant.go @@ -56,7 +56,7 @@ func (v Variant) Any() any { } // Scan implements the sql.Scanner interface -func (v *Variant) Scan(value interface{}) error { +func (v *Variant) Scan(value any) error { switch vv := value.(type) { case Variant: v.value = vv.value diff --git a/lib/column/array.go b/lib/column/array.go index fc673c2a86..91e4dfe0c8 100644 --- a/lib/column/array.go +++ b/lib/column/array.go @@ -3,12 +3,13 @@ package column import ( "database/sql" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" "strings" + + "github.com/ClickHouse/ch-go/proto" ) -var scanTypeAny = reflect.TypeOf((*interface{})(nil)).Elem() +var scanTypeAny = reflect.TypeOf((*any)(nil)).Elem() type offset struct { values UInt64 diff --git a/lib/column/bigint.go b/lib/column/bigint.go index 16a147bb44..6c9e4c26d9 100644 --- a/lib/column/bigint.go +++ b/lib/column/bigint.go @@ -4,9 +4,10 @@ import ( "database/sql/driver" "encoding/binary" "fmt" - "github.com/ClickHouse/ch-go/proto" "math/big" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type BigInt struct { diff --git a/lib/column/bool.go b/lib/column/bool.go index dd0bebf9cc..bb09de68d1 100644 --- a/lib/column/bool.go +++ b/lib/column/bool.go @@ -4,8 +4,9 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type Bool struct { diff --git a/lib/column/column.go b/lib/column/column.go index 8b46c10680..8da3977e33 100644 --- a/lib/column/column.go +++ b/lib/column/column.go @@ -2,11 +2,12 @@ package column import ( "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" "regexp" "strings" "time" + + "github.com/ClickHouse/ch-go/proto" ) // column names which match this must be escaped - see https://clickhouse.com/docs/en/sql-reference/syntax/#identifiers diff --git a/lib/column/dynamic.go b/lib/column/dynamic.go index ce444e7696..224ff9ef43 100644 --- a/lib/column/dynamic.go +++ b/lib/column/dynamic.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) diff --git a/lib/column/enum.go b/lib/column/enum.go index 3e518065de..74ef3ec43d 100644 --- a/lib/column/enum.go +++ b/lib/column/enum.go @@ -91,23 +91,19 @@ func extractEnumNamedValues(chType Type) (typ string, values []string, indexes [ } bracketOpen = true - break // when inside a bracket, we can start capture value inside single quotes case bracketOpen && token == '\'' && !stringOpen: foundValueOffset = c + 1 stringOpen = true - break // close the string and capture the value case token == '\'' && stringOpen: stringOpen = false foundValueLen = c - foundValueOffset valueFound = true - break // escape character, skip the next character case token == '\\' && stringOpen: skippedValueTokens = append(skippedValueTokens, c-foundValueOffset) c++ - break // capture optional index. `=` token is followed with an integer index case token == '=' && !stringOpen: if !valueFound { @@ -128,7 +124,6 @@ func extractEnumNamedValues(chType Type) (typ string, values []string, indexes [ } valueIndex = idx indexFound = true - break // capture the value and index when a comma or closing bracket is found case (token == ',' || token == ')') && !stringOpen: if !valueFound { @@ -157,7 +152,6 @@ func extractEnumNamedValues(chType Type) (typ string, values []string, indexes [ values = append(values, string(foundName)) indexFound = false valueFound = false - break } } diff --git a/lib/column/enum16.go b/lib/column/enum16.go index 4d23b956e8..c5f7863191 100644 --- a/lib/column/enum16.go +++ b/lib/column/enum16.go @@ -4,8 +4,9 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type Enum16 struct { diff --git a/lib/column/enum8.go b/lib/column/enum8.go index ced4e9e2ec..7b1f8003b6 100644 --- a/lib/column/enum8.go +++ b/lib/column/enum8.go @@ -4,8 +4,9 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type Enum8 struct { diff --git a/lib/column/fixed_string.go b/lib/column/fixed_string.go index 68bd65eba5..8854ed8cc3 100644 --- a/lib/column/fixed_string.go +++ b/lib/column/fixed_string.go @@ -138,12 +138,13 @@ func (col *FixedString) Append(v any) (nulls []uint8, err error) { nulls = make([]uint8, len(v)) for i, v := range v { var err error - if v == nil { + switch { + case v == nil: nulls[i] = 1 err = col.safeAppendRow(nil) - } else if *v == "" { + case *v == "": err = col.safeAppendRow(nil) - } else { + default: err = col.safeAppendRow(binary.Str2Bytes(*v, col.col.Size)) } @@ -175,11 +176,12 @@ func (col *FixedString) Append(v any) (nulls []uint8, err error) { } n := len(v) var err error - if n == 0 { + switch { + case n == 0: err = col.safeAppendRow(nil) - } else if n >= col.col.Size { + case n >= col.col.Size: err = col.safeAppendRow(v[0:col.col.Size]) - } else { + default: err = col.safeAppendRow(v) } diff --git a/lib/column/geo_multi_polygon.go b/lib/column/geo_multi_polygon.go index 107c1e8343..c7de274fd2 100644 --- a/lib/column/geo_multi_polygon.go +++ b/lib/column/geo_multi_polygon.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + "github.com/ClickHouse/ch-go/proto" + "github.com/paulmach/orb" ) diff --git a/lib/column/geo_point.go b/lib/column/geo_point.go index 0833157231..04109853df 100644 --- a/lib/column/geo_point.go +++ b/lib/column/geo_point.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + "github.com/ClickHouse/ch-go/proto" + "github.com/paulmach/orb" ) diff --git a/lib/column/geo_polygon.go b/lib/column/geo_polygon.go index deef213007..2ef05932b8 100644 --- a/lib/column/geo_polygon.go +++ b/lib/column/geo_polygon.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + "github.com/ClickHouse/ch-go/proto" + "github.com/paulmach/orb" ) diff --git a/lib/column/geo_ring.go b/lib/column/geo_ring.go index 70e6f4eb8e..e19d6dcd3e 100644 --- a/lib/column/geo_ring.go +++ b/lib/column/geo_ring.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + "github.com/ClickHouse/ch-go/proto" + "github.com/paulmach/orb" ) diff --git a/lib/column/interval.go b/lib/column/interval.go index 119e86c6c8..27be76a122 100644 --- a/lib/column/interval.go +++ b/lib/column/interval.go @@ -3,9 +3,10 @@ package column import ( "errors" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" "strings" + + "github.com/ClickHouse/ch-go/proto" ) type Interval struct { diff --git a/lib/column/ipv4.go b/lib/column/ipv4.go index d0f2231f52..501e57806b 100644 --- a/lib/column/ipv4.go +++ b/lib/column/ipv4.go @@ -5,10 +5,11 @@ import ( "database/sql/driver" "encoding/binary" "fmt" - "github.com/ClickHouse/ch-go/proto" "net" "net/netip" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type IPv4 struct { @@ -117,7 +118,7 @@ func (col *IPv4) Append(v any) (nulls []uint8, err error) { switch v := v.(type) { case []string: nulls = make([]uint8, len(v)) - ips := make([]netip.Addr, len(v), len(v)) + ips := make([]netip.Addr, len(v)) for i := range v { ip, err := strToIPV4(v[i]) if err != nil { @@ -128,7 +129,7 @@ func (col *IPv4) Append(v any) (nulls []uint8, err error) { col.AppendV4IPs(ips) case []*string: nulls = make([]uint8, len(v)) - ips := make([]netip.Addr, len(v), len(v)) + ips := make([]netip.Addr, len(v)) for i := range v { switch { case v[i] != nil: diff --git a/lib/column/ipv6.go b/lib/column/ipv6.go index 292a128e6c..97301e707b 100644 --- a/lib/column/ipv6.go +++ b/lib/column/ipv6.go @@ -4,10 +4,11 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "net" "net/netip" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type IPv6 struct { @@ -105,7 +106,7 @@ func (col *IPv6) Append(v any) (nulls []uint8, err error) { switch v := v.(type) { case []string: nulls = make([]uint8, len(v)) - ips := make([]netip.Addr, len(v), len(v)) + ips := make([]netip.Addr, len(v)) for i := range v { ip, err := strToIPV6(v[i]) if err != nil { @@ -120,7 +121,7 @@ func (col *IPv6) Append(v any) (nulls []uint8, err error) { col.AppendV6IPs(ips) case []*string: nulls = make([]uint8, len(v)) - ips := make([]netip.Addr, len(v), len(v)) + ips := make([]netip.Addr, len(v)) for i := range v { switch { case v[i] != nil: diff --git a/lib/column/json.go b/lib/column/json.go index 0517ddeb8a..b570ee13c2 100644 --- a/lib/column/json.go +++ b/lib/column/json.go @@ -8,6 +8,7 @@ import ( "strings" "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/binary" "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) @@ -487,7 +488,7 @@ func (c *JSON) appendRowObject(v any) error { // Even if value is nil, we must append a value for this row. // nil is a valid value for most column types, with most implementations putting a zero value. // If the column doesn't support appending nil, then the user must provide a zero value. - value, _ := valuesByPath[typedPath] + value := valuesByPath[typedPath] col := c.typedColumns[i] err := col.AppendRow(value) diff --git a/lib/column/json_reflect.go b/lib/column/json_reflect.go index 16e59cdc45..cc82615e3d 100644 --- a/lib/column/json_reflect.go +++ b/lib/column/json_reflect.go @@ -215,11 +215,12 @@ func (c *JSON) fillMap(val reflect.Value, prefix string, row int) error { mapValueType := val.Type().Elem() var newMap reflect.Value - if mapValueType.Kind() == reflect.Interface { - newMap = reflect.MakeMap(reflect.TypeOf(map[string]interface{}{})) - } else if mapValueType.Kind() == reflect.Map { + switch mapValueType.Kind() { + case reflect.Interface: + newMap = reflect.MakeMap(reflect.TypeOf(map[string]any{})) + case reflect.Map: newMap = reflect.MakeMap(mapValueType) - } else { + default: return fmt.Errorf("invalid map value type for nested path \"%s\"", newPrefix) } @@ -372,13 +373,14 @@ func handleValue(val reflect.Value, path string, json *chcol.JSON, forcedType st return iterateStruct(val, path, json) case reflect.Map: - if forcedType == "" && val.Type().Elem().Kind() == reflect.Interface { + switch { + case forcedType == "" && val.Type().Elem().Kind() == reflect.Interface: // Only iterate maps if they are map[string]interface{} return iterateMap(val, path, json) - } else if forcedType == "" { + case forcedType == "": json.SetValueAtPath(path, val.Interface()) return nil - } else { + default: json.SetValueAtPath(path, chcol.NewDynamicWithType(val.Interface(), forcedType)) return nil } diff --git a/lib/column/json_test.go b/lib/column/json_test.go index 851572fb48..1d6182dea3 100644 --- a/lib/column/json_test.go +++ b/lib/column/json_test.go @@ -3,9 +3,10 @@ package column import ( "testing" - "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) // newTestJSONColumn creates a JSON column with unset serialization version (default state) diff --git a/lib/column/lowcardinality.go b/lib/column/lowcardinality.go index 80d01ed40f..751c535589 100644 --- a/lib/column/lowcardinality.go +++ b/lib/column/lowcardinality.go @@ -3,10 +3,11 @@ package column import ( "errors" "fmt" - "github.com/ClickHouse/ch-go/proto" "math" "reflect" "time" + + "github.com/ClickHouse/ch-go/proto" ) const indexTypeMask = 0b11111111 diff --git a/lib/column/map.go b/lib/column/map.go index 139b3f8164..d9393c43cb 100644 --- a/lib/column/map.go +++ b/lib/column/map.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" "strings" + + "github.com/ClickHouse/ch-go/proto" ) // https://github.com/ClickHouse/ClickHouse/blob/master/src/Columns/ColumnMap.cpp @@ -48,7 +49,7 @@ func (col *Map) Name() string { func (col *Map) parse(t Type, sc *ServerContext) (_ Interface, err error) { col.chType = t - types := make([]string, 2, 2) + types := make([]string, 2) typeParams := t.params() idx := strings.Index(typeParams, ",") if strings.HasPrefix(typeParams, "Enum") { diff --git a/lib/column/nested.go b/lib/column/nested.go index 82b9097ec8..7deffc6fa4 100644 --- a/lib/column/nested.go +++ b/lib/column/nested.go @@ -2,8 +2,9 @@ package column import ( "fmt" - "github.com/ClickHouse/ch-go/proto" "strings" + + "github.com/ClickHouse/ch-go/proto" ) type Nested struct { @@ -16,7 +17,7 @@ func (col *Nested) Reset() { } func asDDL(cols []namedCol) string { - sCols := make([]string, len(cols), len(cols)) + sCols := make([]string, len(cols)) for i := range cols { sCols[i] = fmt.Sprintf("%s %s", cols[i].name, cols[i].colType) } diff --git a/lib/column/nothing.go b/lib/column/nothing.go index 1c5093325a..a55bc6725f 100644 --- a/lib/column/nothing.go +++ b/lib/column/nothing.go @@ -2,8 +2,9 @@ package column import ( "errors" - "github.com/ClickHouse/ch-go/proto" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) type Nothing struct { diff --git a/lib/column/orderedmap/orderedmap.go b/lib/column/orderedmap/orderedmap.go index 01a99465c4..181d7fa5df 100644 --- a/lib/column/orderedmap/orderedmap.go +++ b/lib/column/orderedmap/orderedmap.go @@ -2,8 +2,9 @@ package orderedmap import ( "cmp" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" "slices" + + "github.com/ClickHouse/clickhouse-go/v2/lib/column" ) // Map is a simple implementation of [column.IterableOrderedMap] interface. diff --git a/lib/column/orderedmap/orderedmap_test.go b/lib/column/orderedmap/orderedmap_test.go index 5dc68d0999..2f660e01b6 100644 --- a/lib/column/orderedmap/orderedmap_test.go +++ b/lib/column/orderedmap/orderedmap_test.go @@ -2,9 +2,10 @@ package orderedmap import ( "cmp" - "github.com/stretchr/testify/assert" "slices" "testing" + + "github.com/stretchr/testify/assert" ) func TestMap(t *testing.T) { diff --git a/lib/column/sharedvariant.go b/lib/column/sharedvariant.go index 4d05f34b62..e4fac514d7 100644 --- a/lib/column/sharedvariant.go +++ b/lib/column/sharedvariant.go @@ -1,8 +1,9 @@ package column import ( - "github.com/ClickHouse/ch-go/proto" "reflect" + + "github.com/ClickHouse/ch-go/proto" ) // SharedVariant deprecated. Use Dynamic/JSON serialization version 3. diff --git a/lib/column/tuple.go b/lib/column/tuple.go index 7f01d532a4..5459fc94ed 100644 --- a/lib/column/tuple.go +++ b/lib/column/tuple.go @@ -437,7 +437,7 @@ func (col *Tuple) scan(targetType reflect.Type, row int) (reflect.Value, error) if !col.isNamed { return reflect.Value{}, &ColumnConverterError{ Op: "ScanRow", - To: fmt.Sprintf("%s", targetType), + To: targetType.String(), From: string(col.chType), Hint: "cannot use interface for unnamed tuples, use slice", } diff --git a/lib/column/uuid.go b/lib/column/uuid.go index 8dd8f23c3d..7a3e5697e7 100644 --- a/lib/column/uuid.go +++ b/lib/column/uuid.go @@ -4,9 +4,10 @@ import ( "database/sql" "database/sql/driver" "fmt" - "github.com/ClickHouse/ch-go/proto" "reflect" + "github.com/ClickHouse/ch-go/proto" + "github.com/google/uuid" ) diff --git a/lib/column/variant.go b/lib/column/variant.go index e59d664dc1..1ddd7260c6 100644 --- a/lib/column/variant.go +++ b/lib/column/variant.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) diff --git a/lib/column/variant_test.go b/lib/column/variant_test.go index d1788bf357..c2a1f4c39f 100644 --- a/lib/column/variant_test.go +++ b/lib/column/variant_test.go @@ -1,9 +1,10 @@ package column import ( + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" ) func TestColVariant_parse(t *testing.T) { diff --git a/lib/proto/block.go b/lib/proto/block.go index 88365ad4b0..bf64feb064 100644 --- a/lib/proto/block.go +++ b/lib/proto/block.go @@ -3,9 +3,11 @@ package proto import ( "errors" "fmt" + "sort" + "github.com/ClickHouse/ch-go/proto" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" - "sort" ) type Block struct { @@ -188,8 +190,8 @@ func (b *Block) Decode(reader *proto.Reader, revision uint64) (err error) { Err: errors.New("more than 1 billion rows in block - suspiciously big - preventing OOM"), } } - b.Columns = make([]column.Interface, numCols, numCols) - b.names = make([]string, numCols, numCols) + b.Columns = make([]column.Interface, numCols) + b.names = make([]string, numCols) for i := 0; i < int(numCols); i++ { var ( columnName string diff --git a/lib/proto/handshake.go b/lib/proto/handshake.go index fd5c555254..60934b9863 100644 --- a/lib/proto/handshake.go +++ b/lib/proto/handshake.go @@ -2,12 +2,13 @@ package proto import ( "fmt" - chproto "github.com/ClickHouse/ch-go/proto" - "go.yaml.in/yaml/v3" "strconv" "strings" "time" + chproto "github.com/ClickHouse/ch-go/proto" + "go.yaml.in/yaml/v3" + "github.com/ClickHouse/clickhouse-go/v2/lib/timezone" ) diff --git a/lib/proto/profile_info.go b/lib/proto/profile_info.go index 22f7e3d81e..1e416bac0b 100644 --- a/lib/proto/profile_info.go +++ b/lib/proto/profile_info.go @@ -2,6 +2,7 @@ package proto import ( "fmt" + chproto "github.com/ClickHouse/ch-go/proto" ) diff --git a/lib/proto/query.go b/lib/proto/query.go index b6f0c44a2b..42637448bf 100644 --- a/lib/proto/query.go +++ b/lib/proto/query.go @@ -3,10 +3,11 @@ package proto import ( stdbin "encoding/binary" "fmt" - chproto "github.com/ClickHouse/ch-go/proto" - "go.opentelemetry.io/otel/trace" "os" "strings" + + chproto "github.com/ClickHouse/ch-go/proto" + "go.opentelemetry.io/otel/trace" ) var ( diff --git a/lib/proto/table_columns.go b/lib/proto/table_columns.go index 2a81812035..1a17bb67c8 100644 --- a/lib/proto/table_columns.go +++ b/lib/proto/table_columns.go @@ -2,6 +2,7 @@ package proto import ( "fmt" + chproto "github.com/ClickHouse/ch-go/proto" ) diff --git a/resources/meta.go b/resources/meta.go index 74d2454b8b..b44633c133 100644 --- a/resources/meta.go +++ b/resources/meta.go @@ -2,9 +2,11 @@ package resources import ( _ "embed" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" - "go.yaml.in/yaml/v3" "strings" + + "go.yaml.in/yaml/v3" + + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) type Meta struct { @@ -35,7 +37,7 @@ func (m *Meta) IsSupportedClickHouseVersion(v proto.Version) bool { } func (m *Meta) SupportedVersions() string { - versions := make([]string, len(m.ClickhouseVersions), len(m.ClickhouseVersions)) + versions := make([]string, len(m.ClickhouseVersions)) for i := range m.ClickhouseVersions { versions[i] = m.ClickhouseVersions[i].String() } diff --git a/resources/meta_test.go b/resources/meta_test.go index 7d22e555f7..c618324da3 100644 --- a/resources/meta_test.go +++ b/resources/meta_test.go @@ -1,10 +1,12 @@ package resources import ( - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" + + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) var m Meta = Meta{ diff --git a/scan.go b/scan.go index a4503ac5f7..081aac30a9 100644 --- a/scan.go +++ b/scan.go @@ -4,9 +4,10 @@ import ( "context" "errors" "fmt" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "reflect" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) diff --git a/tests/abort_test.go b/tests/abort_test.go index 3d8590ce96..c00f4e2db3 100644 --- a/tests/abort_test.go +++ b/tests/abort_test.go @@ -2,11 +2,13 @@ package tests import ( "context" - "github.com/stretchr/testify/require" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestAbort(t *testing.T) { diff --git a/tests/array_test.go b/tests/array_test.go index 1153a56db6..a853620aea 100644 --- a/tests/array_test.go +++ b/tests/array_test.go @@ -4,12 +4,14 @@ import ( "context" "database/sql/driver" "fmt" - "github.com/stretchr/testify/require" "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleArray(t *testing.T) { @@ -161,26 +163,26 @@ func TestArray(t *testing.T) { timestamp = time.Now().Truncate(time.Second).In(time.UTC) col1Data = []string{"A", "b", "c"} col2Data = [][]uint32{ - []uint32{1, 2}, - []uint32{3, 87}, - []uint32{33, 3, 847}, + {1, 2}, + {3, 87}, + {33, 3, 847}, } col3Data = [][][]time.Time{ - [][]time.Time{ - []time.Time{ + { + { timestamp, timestamp, timestamp, timestamp, }, }, - [][]time.Time{ - []time.Time{ + { + { timestamp, timestamp, timestamp, }, - []time.Time{ + { timestamp, timestamp, }, @@ -235,26 +237,26 @@ func TestColumnarArray(t *testing.T) { timestamp = time.Now().Truncate(time.Second).In(time.UTC) col1Data = []string{"A", "b", "c"} col2Data = [][]uint32{ - []uint32{1, 2}, - []uint32{3, 87}, - []uint32{33, 3, 847}, + {1, 2}, + {3, 87}, + {33, 3, 847}, } col3Data = [][][]time.Time{ - [][]time.Time{ - []time.Time{ + { + { timestamp, timestamp, timestamp, timestamp, }, }, - [][]time.Time{ - []time.Time{ + { + { timestamp, timestamp, timestamp, }, - []time.Time{ + { timestamp, timestamp, }, diff --git a/tests/base_types_test.go b/tests/base_types_test.go index 4f0a519e12..1a5427b679 100644 --- a/tests/base_types_test.go +++ b/tests/base_types_test.go @@ -6,9 +6,10 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) type customUint8 uint8 diff --git a/tests/batch_release_connection_test.go b/tests/batch_release_connection_test.go index def7760aea..0f5fd05780 100644 --- a/tests/batch_release_connection_test.go +++ b/tests/batch_release_connection_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/stretchr/testify/require" ) func TestBatchReleaseConnection(t *testing.T) { diff --git a/tests/batch_test.go b/tests/batch_test.go index 26ac8b64e7..53b60bde2a 100644 --- a/tests/batch_test.go +++ b/tests/batch_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/require" "golang.org/x/net/context" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestBatchContextCancellation(t *testing.T) { diff --git a/tests/bfloat16_test.go b/tests/bfloat16_test.go index 6467b0b4c5..7b676fe7c1 100644 --- a/tests/bfloat16_test.go +++ b/tests/bfloat16_test.go @@ -10,8 +10,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleBFloat16(t *testing.T) { diff --git a/tests/bigint_test.go b/tests/bigint_test.go index 844bf9f1d6..54c9e499a9 100644 --- a/tests/bigint_test.go +++ b/tests/bigint_test.go @@ -9,8 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleBigInt(t *testing.T) { diff --git a/tests/bool_test.go b/tests/bool_test.go index d63e6d578a..079549d00b 100644 --- a/tests/bool_test.go +++ b/tests/bool_test.go @@ -9,9 +9,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestBool(t *testing.T) { diff --git a/tests/client_info_test.go b/tests/client_info_test.go index 9607882489..4c22d2bb20 100644 --- a/tests/client_info_test.go +++ b/tests/client_info_test.go @@ -6,10 +6,11 @@ import ( "runtime" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) func TestClientInfo(t *testing.T) { diff --git a/tests/column_types_test.go b/tests/column_types_test.go index 1cceff8ee2..5923cb2245 100644 --- a/tests/column_types_test.go +++ b/tests/column_types_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestColumnTypes(t *testing.T) { diff --git a/tests/columnar_batch_test.go b/tests/columnar_batch_test.go index 51300b54fb..8a6df63eae 100644 --- a/tests/columnar_batch_test.go +++ b/tests/columnar_batch_test.go @@ -10,8 +10,9 @@ import ( "github.com/shopspring/decimal" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestColumnarInterface(t *testing.T) { diff --git a/tests/compression_test.go b/tests/compression_test.go index 496fa98900..8c4a4f2bbe 100644 --- a/tests/compression_test.go +++ b/tests/compression_test.go @@ -2,11 +2,13 @@ package tests import ( "context" + "testing" + "github.com/ClickHouse/ch-go/compress" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "testing" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestZSTDCompression(t *testing.T) { diff --git a/tests/conn_test.go b/tests/conn_test.go index 4afb8ee363..2e8a299bb9 100644 --- a/tests/conn_test.go +++ b/tests/conn_test.go @@ -12,9 +12,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestConn(t *testing.T) { diff --git a/tests/context_cancel_test.go b/tests/context_cancel_test.go index 956549ab4e..282b050e73 100644 --- a/tests/context_cancel_test.go +++ b/tests/context_cancel_test.go @@ -11,9 +11,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestContextCancellationOfHeavyGeneratedInsert(t *testing.T) { diff --git a/tests/contributors_test.go b/tests/contributors_test.go index b541549c4c..4df778c1d8 100644 --- a/tests/contributors_test.go +++ b/tests/contributors_test.go @@ -3,8 +3,9 @@ package tests import ( "testing" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestContributors(t *testing.T) { diff --git a/tests/custom_dial_test.go b/tests/custom_dial_test.go index 7276789813..6654872e0d 100644 --- a/tests/custom_dial_test.go +++ b/tests/custom_dial_test.go @@ -12,8 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestCustomDialContext(t *testing.T) { diff --git a/tests/datetime64_test.go b/tests/datetime64_test.go index 2b2e2d7ab3..19e988fd70 100644 --- a/tests/datetime64_test.go +++ b/tests/datetime64_test.go @@ -9,8 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestDateTime64(t *testing.T) { diff --git a/tests/datetime_test.go b/tests/datetime_test.go index 3114a78ff7..48f896242c 100644 --- a/tests/datetime_test.go +++ b/tests/datetime_test.go @@ -9,8 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestDateTime(t *testing.T) { diff --git a/tests/ddl_test.go b/tests/ddl_test.go index 71e1033aab..0c80c853c9 100644 --- a/tests/ddl_test.go +++ b/tests/ddl_test.go @@ -3,9 +3,11 @@ package tests import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestQuotedDDL(t *testing.T) { diff --git a/tests/decimal_test.go b/tests/decimal_test.go index 65713c4e4b..d212975896 100644 --- a/tests/decimal_test.go +++ b/tests/decimal_test.go @@ -6,10 +6,11 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestDecimal(t *testing.T) { diff --git a/tests/dynamic_test.go b/tests/dynamic_test.go index b92bd9bfe2..27670bbe16 100644 --- a/tests/dynamic_test.go +++ b/tests/dynamic_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/stretchr/testify/require" ) var dynamicTestDate, _ = time.Parse(time.RFC3339, "2024-12-13T02:09:30.123Z") diff --git a/tests/empty_query_test.go b/tests/empty_query_test.go index b043e5a404..cf11efb88e 100644 --- a/tests/empty_query_test.go +++ b/tests/empty_query_test.go @@ -2,12 +2,14 @@ package tests import ( "context" - "github.com/stretchr/testify/require" "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestEmptyQuery(t *testing.T) { diff --git a/tests/enum_test.go b/tests/enum_test.go index 4694ec9304..6c32713de8 100644 --- a/tests/enum_test.go +++ b/tests/enum_test.go @@ -8,8 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleEnum(t *testing.T) { diff --git a/tests/external_table_test.go b/tests/external_table_test.go index b130471410..ffd625ab29 100644 --- a/tests/external_table_test.go +++ b/tests/external_table_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/ext" - "github.com/stretchr/testify/assert" ) func TestExternalTable(t *testing.T) { diff --git a/tests/fixed_string_test.go b/tests/fixed_string_test.go index 8831f9b482..707b35a17e 100644 --- a/tests/fixed_string_test.go +++ b/tests/fixed_string_test.go @@ -9,8 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) type BinFixedString struct { diff --git a/tests/float64_test.go b/tests/float64_test.go index 0c9bc0c7c4..cde31af6d1 100644 --- a/tests/float64_test.go +++ b/tests/float64_test.go @@ -4,9 +4,11 @@ import ( "context" "database/sql/driver" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestFloat64(t *testing.T) { diff --git a/tests/float_test.go b/tests/float_test.go index 66ac45642f..f9d8bfa03b 100644 --- a/tests/float_test.go +++ b/tests/float_test.go @@ -9,8 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleFloat(t *testing.T) { diff --git a/tests/flush_test.go b/tests/flush_test.go index 9e258451fb..46444e09a3 100644 --- a/tests/flush_test.go +++ b/tests/flush_test.go @@ -3,12 +3,14 @@ package tests import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/google/uuid" - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/google/uuid" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) func TestBatchNoFlush(t *testing.T) { diff --git a/tests/geo_linestring_test.go b/tests/geo_linestring_test.go index a22ca7d7c2..81f54e9086 100644 --- a/tests/geo_linestring_test.go +++ b/tests/geo_linestring_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoLineString(t *testing.T) { diff --git a/tests/geo_multi_linestring_test.go b/tests/geo_multi_linestring_test.go index ee9ca22c3c..e9c977d74c 100644 --- a/tests/geo_multi_linestring_test.go +++ b/tests/geo_multi_linestring_test.go @@ -9,9 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoMultiLineString(t *testing.T) { diff --git a/tests/geo_multipolygon_test.go b/tests/geo_multipolygon_test.go index 351dc3ad4a..14ea96e62c 100644 --- a/tests/geo_multipolygon_test.go +++ b/tests/geo_multipolygon_test.go @@ -9,9 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoMultiPolygon(t *testing.T) { @@ -65,21 +66,21 @@ func TestGeoMultiPolygon(t *testing.T) { col2Data = []orb.MultiPolygon{ []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 2}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, @@ -87,21 +88,21 @@ func TestGeoMultiPolygon(t *testing.T) { }, []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{11, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 22}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, diff --git a/tests/geo_point_test.go b/tests/geo_point_test.go index 95210047aa..9870b2b51f 100644 --- a/tests/geo_point_test.go +++ b/tests/geo_point_test.go @@ -9,9 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoPoint(t *testing.T) { diff --git a/tests/geo_polygon_test.go b/tests/geo_polygon_test.go index 0999dc7e65..659fad81ae 100644 --- a/tests/geo_polygon_test.go +++ b/tests/geo_polygon_test.go @@ -9,9 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoPolygon(t *testing.T) { @@ -52,21 +53,21 @@ func TestGeoPolygon(t *testing.T) { } col2Data = []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 2}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, diff --git a/tests/geo_ring_test.go b/tests/geo_ring_test.go index 40bd9d99e2..3a43b7a761 100644 --- a/tests/geo_ring_test.go +++ b/tests/geo_ring_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestGeoRing(t *testing.T) { @@ -44,11 +45,11 @@ func TestGeoRing(t *testing.T) { orb.Point{1, 2}, } col2Data = []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 2}, }, - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 2}, }, diff --git a/tests/http_exception_test.go b/tests/http_exception_test.go index b60bd17c85..e95a144b9f 100644 --- a/tests/http_exception_test.go +++ b/tests/http_exception_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestHTTPExceptionHandling(t *testing.T) { diff --git a/tests/insert_bind_test.go b/tests/insert_bind_test.go index 03a31e44cc..c25a1d4a6d 100644 --- a/tests/insert_bind_test.go +++ b/tests/insert_bind_test.go @@ -2,9 +2,11 @@ package tests import ( "context" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestBindArrayInsert(t *testing.T) { diff --git a/tests/int64_test.go b/tests/int64_test.go index cd2a6f3f5b..dfbc54d635 100644 --- a/tests/int64_test.go +++ b/tests/int64_test.go @@ -2,11 +2,13 @@ package tests import ( "context" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestDurationInt64(t *testing.T) { diff --git a/tests/interval_test.go b/tests/interval_test.go index 634af8353b..1b62d58169 100644 --- a/tests/interval_test.go +++ b/tests/interval_test.go @@ -2,11 +2,13 @@ package tests import ( "context" - "github.com/stretchr/testify/require" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestInterval(t *testing.T) { diff --git a/tests/ipv4_test.go b/tests/ipv4_test.go index b39d16e346..8f2897fe58 100644 --- a/tests/ipv4_test.go +++ b/tests/ipv4_test.go @@ -9,11 +9,13 @@ import ( "net/netip" "testing" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleIPv4(t *testing.T) { diff --git a/tests/ipv6_test.go b/tests/ipv6_test.go index e5f4f902d6..37be3b600a 100644 --- a/tests/ipv6_test.go +++ b/tests/ipv6_test.go @@ -9,11 +9,13 @@ import ( "testing" "github.com/ClickHouse/ch-go/proto" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIPv6(t *testing.T) { diff --git a/tests/issues/1016_test.go b/tests/issues/1016_test.go index 052cc06601..022079fc4c 100644 --- a/tests/issues/1016_test.go +++ b/tests/issues/1016_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1016(t *testing.T) { diff --git a/tests/issues/1049_test.go b/tests/issues/1049_test.go index 96ff8f161b..39db72f88c 100644 --- a/tests/issues/1049_test.go +++ b/tests/issues/1049_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1049(t *testing.T) { diff --git a/tests/issues/1053_test.go b/tests/issues/1053_test.go index 6e30247e82..8632198329 100644 --- a/tests/issues/1053_test.go +++ b/tests/issues/1053_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1053(t *testing.T) { diff --git a/tests/issues/1066_test.go b/tests/issues/1066_test.go index a5386ff47d..7d42d711ab 100644 --- a/tests/issues/1066_test.go +++ b/tests/issues/1066_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1066(t *testing.T) { diff --git a/tests/issues/1067_test.go b/tests/issues/1067_test.go index 02e88fdcbe..2405f7e7d7 100644 --- a/tests/issues/1067_test.go +++ b/tests/issues/1067_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1067(t *testing.T) { diff --git a/tests/issues/1072_test.go b/tests/issues/1072_test.go index 2c0f2ccf72..56eafdfefc 100644 --- a/tests/issues/1072_test.go +++ b/tests/issues/1072_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1072(t *testing.T) { diff --git a/tests/issues/1106_test.go b/tests/issues/1106_test.go index af9b6596ff..ff43ccfa02 100644 --- a/tests/issues/1106_test.go +++ b/tests/issues/1106_test.go @@ -5,9 +5,10 @@ import ( "net" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1106(t *testing.T) { diff --git a/tests/issues/1113_test.go b/tests/issues/1113_test.go index 074b9da308..13527b2bde 100644 --- a/tests/issues/1113_test.go +++ b/tests/issues/1113_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1113(t *testing.T) { diff --git a/tests/issues/1119_test.go b/tests/issues/1119_test.go index 057d6e871d..fef30daf83 100644 --- a/tests/issues/1119_test.go +++ b/tests/issues/1119_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1119(t *testing.T) { diff --git a/tests/issues/1127_test.go b/tests/issues/1127_test.go index 72c166688d..3f60b116b0 100644 --- a/tests/issues/1127_test.go +++ b/tests/issues/1127_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1127(t *testing.T) { diff --git a/tests/issues/1128_test.go b/tests/issues/1128_test.go index 8097d1e8d0..8885b9a318 100644 --- a/tests/issues/1128_test.go +++ b/tests/issues/1128_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) const ( diff --git a/tests/issues/1163_test.go b/tests/issues/1163_test.go index 7ee70bfaca..5d555691bc 100644 --- a/tests/issues/1163_test.go +++ b/tests/issues/1163_test.go @@ -4,13 +4,15 @@ import ( "context" "crypto/tls" "fmt" - "github.com/stretchr/testify/assert" "strconv" "testing" + "github.com/stretchr/testify/assert" + + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue1163(t *testing.T) { diff --git a/tests/issues/1164_test.go b/tests/issues/1164_test.go index c404e9aeed..0451e3caae 100644 --- a/tests/issues/1164_test.go +++ b/tests/issues/1164_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/column" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue1164(t *testing.T) { diff --git a/tests/issues/1169_test.go b/tests/issues/1169_test.go index f8787727f2..9404e7a2f6 100644 --- a/tests/issues/1169_test.go +++ b/tests/issues/1169_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1169(t *testing.T) { diff --git a/tests/issues/1200_pr_test.go b/tests/issues/1200_pr_test.go index 3d5b1c868d..33b501646c 100644 --- a/tests/issues/1200_pr_test.go +++ b/tests/issues/1200_pr_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1200(t *testing.T) { diff --git a/tests/issues/1216_test.go b/tests/issues/1216_test.go index 0d720dcfda..5048c02a0e 100644 --- a/tests/issues/1216_test.go +++ b/tests/issues/1216_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1216(t *testing.T) { diff --git a/tests/issues/1229_test.go b/tests/issues/1229_test.go index fc7621a09c..8597b97717 100644 --- a/tests/issues/1229_test.go +++ b/tests/issues/1229_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1229(t *testing.T) { diff --git a/tests/issues/1245_test.go b/tests/issues/1245_test.go index 18565566c2..6817bd1efc 100644 --- a/tests/issues/1245_test.go +++ b/tests/issues/1245_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1245Native(t *testing.T) { diff --git a/tests/issues/1247_test.go b/tests/issues/1247_test.go index 2a8b8d509e..bf9b140c35 100644 --- a/tests/issues/1247_test.go +++ b/tests/issues/1247_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1247(t *testing.T) { diff --git a/tests/issues/1257_test.go b/tests/issues/1257_test.go index 20bac6d4c7..d338300045 100644 --- a/tests/issues/1257_test.go +++ b/tests/issues/1257_test.go @@ -5,8 +5,9 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test1257(t *testing.T) { diff --git a/tests/issues/1271_test.go b/tests/issues/1271_test.go index 5a1cfdbf85..ad31dec53f 100644 --- a/tests/issues/1271_test.go +++ b/tests/issues/1271_test.go @@ -9,12 +9,14 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/google/uuid" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) // test for https://github.com/ClickHouse/clickhouse-go/issues/1271 diff --git a/tests/issues/1280_test.go b/tests/issues/1280_test.go index 3f69544b9e..e5bcae1701 100644 --- a/tests/issues/1280_test.go +++ b/tests/issues/1280_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1280(t *testing.T) { diff --git a/tests/issues/1297_test.go b/tests/issues/1297_test.go index e2c61cf76f..5eef735bd8 100644 --- a/tests/issues/1297_test.go +++ b/tests/issues/1297_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1297(t *testing.T) { diff --git a/tests/issues/1299_test.go b/tests/issues/1299_test.go index f60ce41a3b..b9686d1ba1 100644 --- a/tests/issues/1299_test.go +++ b/tests/issues/1299_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue1299(t *testing.T) { diff --git a/tests/issues/1329_test.go b/tests/issues/1329_test.go index 5dd927bcbb..18c695f0a6 100644 --- a/tests/issues/1329_test.go +++ b/tests/issues/1329_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1329(t *testing.T) { diff --git a/tests/issues/1345_test.go b/tests/issues/1345_test.go index 758f8d3e69..6db9094976 100644 --- a/tests/issues/1345_test.go +++ b/tests/issues/1345_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue1345(t *testing.T) { diff --git a/tests/issues/1349_test.go b/tests/issues/1349_test.go index 2a2d6becba..8d4b949ed4 100644 --- a/tests/issues/1349_test.go +++ b/tests/issues/1349_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue1349(t *testing.T) { @@ -31,8 +32,8 @@ func TestIssue1349(t *testing.T) { var ( a = "a" b = "b" - col1Data = []interface{}{[]string{}, []string{"a", "b"}, &[]string{"c"}, []interface{}{&a, &b}} - col2Data = []interface{}{[]*string{&a, nil}, &[]*string{&b, nil}, &[]interface{}{nil, &a}} + col1Data = []any{[]string{}, []string{"a", "b"}, &[]string{"c"}, []any{&a, &b}} + col2Data = []any{[]*string{&a, nil}, &[]*string{&b, nil}, &[]any{nil, &a}} ) err = batch.Append(col1Data, col2Data) diff --git a/tests/issues/1359_test.go b/tests/issues/1359_test.go index 54acd17f50..63ac5b6bcf 100644 --- a/tests/issues/1359_test.go +++ b/tests/issues/1359_test.go @@ -6,8 +6,9 @@ import ( "fmt" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) type SomeStruct struct { diff --git a/tests/issues/1365_test.go b/tests/issues/1365_test.go index 7ff0bb1765..7ea491d845 100644 --- a/tests/issues/1365_test.go +++ b/tests/issues/1365_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) type T1365OrderedMap int diff --git a/tests/issues/1395_test.go b/tests/issues/1395_test.go index e75b1ed5dd..ba68f71540 100644 --- a/tests/issues/1395_test.go +++ b/tests/issues/1395_test.go @@ -7,9 +7,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1395(t *testing.T) { diff --git a/tests/issues/1421_test.go b/tests/issues/1421_test.go index da21ec2a61..2347592f17 100644 --- a/tests/issues/1421_test.go +++ b/tests/issues/1421_test.go @@ -7,11 +7,12 @@ import ( "syscall" "testing" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/docker/docker/api/types/container" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" + + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2/tests" ) //goland:noinspection ALL diff --git a/tests/issues/1446_test.go b/tests/issues/1446_test.go index 2643fc7067..7d03329f6f 100644 --- a/tests/issues/1446_test.go +++ b/tests/issues/1446_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) type sampleFailTuple struct { diff --git a/tests/issues/1503_test.go b/tests/issues/1503_test.go index 5c8bb86956..79076c1b3f 100644 --- a/tests/issues/1503_test.go +++ b/tests/issues/1503_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue1503(t *testing.T) { diff --git a/tests/issues/1515_test.go b/tests/issues/1515_test.go index 19f236199f..a2e8baec0e 100644 --- a/tests/issues/1515_test.go +++ b/tests/issues/1515_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue1515(t *testing.T) { diff --git a/tests/issues/1565_test.go b/tests/issues/1565_test.go index 771e52a75e..faab9e5c30 100644 --- a/tests/issues/1565_test.go +++ b/tests/issues/1565_test.go @@ -4,8 +4,9 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue1565(t *testing.T) { diff --git a/tests/issues/1638_test.go b/tests/issues/1638_test.go index 792bc37e8c..fd38114c4f 100644 --- a/tests/issues/1638_test.go +++ b/tests/issues/1638_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue1638_NullableJSON(t *testing.T) { diff --git a/tests/issues/164_test.go b/tests/issues/164_test.go index bcdc731ea7..3d68a27a09 100644 --- a/tests/issues/164_test.go +++ b/tests/issues/164_test.go @@ -3,13 +3,15 @@ package issues import ( "context" "database/sql" + "strconv" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "strconv" - "testing" ) func TestIssue164(t *testing.T) { diff --git a/tests/issues/1685_test.go b/tests/issues/1685_test.go index f376f4eb77..4f4cd1ef56 100644 --- a/tests/issues/1685_test.go +++ b/tests/issues/1685_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func benchmark1685(ctx context.Context, conn clickhouse.Conn) error { diff --git a/tests/issues/1708_test.go b/tests/issues/1708_test.go index f8589f8098..0a93a77740 100644 --- a/tests/issues/1708_test.go +++ b/tests/issues/1708_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhousetests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1708(t *testing.T) { diff --git a/tests/issues/1775_test.go b/tests/issues/1775_test.go index ff673f8b7a..574db8e773 100644 --- a/tests/issues/1775_test.go +++ b/tests/issues/1775_test.go @@ -5,9 +5,10 @@ import ( "strings" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue1775_JSONMapScanOmitsAbsentKeys(t *testing.T) { diff --git a/tests/issues/1801_test.go b/tests/issues/1801_test.go index dc3b95ea31..7fffc7aaec 100644 --- a/tests/issues/1801_test.go +++ b/tests/issues/1801_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test1801(t *testing.T) { diff --git a/tests/issues/260_test.go b/tests/issues/260_test.go index 38186c5adc..f20a100033 100644 --- a/tests/issues/260_test.go +++ b/tests/issues/260_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/issues/357_test.go b/tests/issues/357_test.go index 59172ef807..56595bfb08 100644 --- a/tests/issues/357_test.go +++ b/tests/issues/357_test.go @@ -1,14 +1,16 @@ package issues import ( - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" + "github.com/stretchr/testify/assert" ) diff --git a/tests/issues/360/main.go b/tests/issues/360/main.go index c156b104e7..eed2ed2775 100644 --- a/tests/issues/360/main.go +++ b/tests/issues/360/main.go @@ -3,12 +3,13 @@ package main import ( "database/sql" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" "log" "net/http" _ "net/http/pprof" "time" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" + "github.com/ClickHouse/clickhouse-go/v2" ) diff --git a/tests/issues/389_test.go b/tests/issues/389_test.go index a67aeb1dc8..517f31cacc 100644 --- a/tests/issues/389_test.go +++ b/tests/issues/389_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" ) func TestIssue389(t *testing.T) { diff --git a/tests/issues/406_test.go b/tests/issues/406_test.go index a8c4beaf10..b782c0913c 100644 --- a/tests/issues/406_test.go +++ b/tests/issues/406_test.go @@ -7,9 +7,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" ) func TestIssue406(t *testing.T) { diff --git a/tests/issues/412_test.go b/tests/issues/412_test.go index 4326bb8b6f..e43fbd42db 100644 --- a/tests/issues/412_test.go +++ b/tests/issues/412_test.go @@ -8,9 +8,10 @@ import ( "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" ) func TestIssue412(t *testing.T) { diff --git a/tests/issues/470/main.go b/tests/issues/470/main.go index 3cdd57937b..83b494e53d 100644 --- a/tests/issues/470/main.go +++ b/tests/issues/470/main.go @@ -3,10 +3,11 @@ package main import ( "database/sql" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" "log" "reflect" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" + _ "github.com/ClickHouse/clickhouse-go/v2" ) diff --git a/tests/issues/470_pr_test.go b/tests/issues/470_pr_test.go index 9550e72f69..2848b85dfc 100644 --- a/tests/issues/470_pr_test.go +++ b/tests/issues/470_pr_test.go @@ -1,12 +1,14 @@ package issues import ( + "strconv" + "testing" + + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/require" - "strconv" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/tests/issues/472_test.go b/tests/issues/472_test.go index c145778294..93db0691d6 100644 --- a/tests/issues/472_test.go +++ b/tests/issues/472_test.go @@ -5,11 +5,13 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/google/uuid" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue472(t *testing.T) { diff --git a/tests/issues/476_test.go b/tests/issues/476_test.go index 4ac221d0da..7fd50d3919 100644 --- a/tests/issues/476_test.go +++ b/tests/issues/476_test.go @@ -4,11 +4,13 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue476(t *testing.T) { diff --git a/tests/issues/482_test.go b/tests/issues/482_test.go index 79e0ff0d84..36e51fe664 100644 --- a/tests/issues/482_test.go +++ b/tests/issues/482_test.go @@ -5,11 +5,13 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue482(t *testing.T) { diff --git a/tests/issues/483_test.go b/tests/issues/483_test.go index 0568a19404..4b35dd1188 100644 --- a/tests/issues/483_test.go +++ b/tests/issues/483_test.go @@ -4,11 +4,13 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue483(t *testing.T) { diff --git a/tests/issues/502_test.go b/tests/issues/502_test.go index f6a6fe1e4b..e899c5b752 100644 --- a/tests/issues/502_test.go +++ b/tests/issues/502_test.go @@ -4,11 +4,13 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue502(t *testing.T) { diff --git a/tests/issues/504_test.go b/tests/issues/504_test.go index 26e8d8516d..d4e92b0992 100644 --- a/tests/issues/504_test.go +++ b/tests/issues/504_test.go @@ -4,11 +4,13 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue504(t *testing.T) { diff --git a/tests/issues/506_test.go b/tests/issues/506_test.go index ab1c8d25fb..353df3a68e 100644 --- a/tests/issues/506_test.go +++ b/tests/issues/506_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue506(t *testing.T) { diff --git a/tests/issues/517_test.go b/tests/issues/517_test.go index 36219a9699..1f7fa9f21c 100644 --- a/tests/issues/517_test.go +++ b/tests/issues/517_test.go @@ -4,10 +4,11 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue517(t *testing.T) { diff --git a/tests/issues/546_test.go b/tests/issues/546_test.go index 912397889a..5613e06671 100644 --- a/tests/issues/546_test.go +++ b/tests/issues/546_test.go @@ -6,11 +6,13 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue546(t *testing.T) { diff --git a/tests/issues/548_test.go b/tests/issues/548_test.go index 81f673614c..5af9390502 100644 --- a/tests/issues/548_test.go +++ b/tests/issues/548_test.go @@ -7,8 +7,9 @@ import ( clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue548(t *testing.T) { diff --git a/tests/issues/570_test.go b/tests/issues/570_test.go index a6076b47f0..2cc53e07d8 100644 --- a/tests/issues/570_test.go +++ b/tests/issues/570_test.go @@ -4,14 +4,16 @@ import ( "crypto/tls" "database/sql" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" ) func TestIssue570(t *testing.T) { diff --git a/tests/issues/578_test.go b/tests/issues/578_test.go index 3f8c8ac128..43a3cc3393 100644 --- a/tests/issues/578_test.go +++ b/tests/issues/578_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue578(t *testing.T) { diff --git a/tests/issues/584_test.go b/tests/issues/584_test.go index e49fdd1e1c..4eb53716ce 100644 --- a/tests/issues/584_test.go +++ b/tests/issues/584_test.go @@ -4,10 +4,11 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue584(t *testing.T) { diff --git a/tests/issues/592_test.go b/tests/issues/592_test.go index c8f06d39f8..da918c48c8 100644 --- a/tests/issues/592_test.go +++ b/tests/issues/592_test.go @@ -2,9 +2,11 @@ package issues import ( "context" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestIssue592(t *testing.T) { diff --git a/tests/issues/615_test.go b/tests/issues/615_test.go index 23521c1054..d7068781c7 100644 --- a/tests/issues/615_test.go +++ b/tests/issues/615_test.go @@ -6,10 +6,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue615(t *testing.T) { diff --git a/tests/issues/647_test.go b/tests/issues/647_test.go index 3d163673b5..9eecf83116 100644 --- a/tests/issues/647_test.go +++ b/tests/issues/647_test.go @@ -8,9 +8,10 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue647(t *testing.T) { diff --git a/tests/issues/648_test.go b/tests/issues/648_test.go index dea1ff122b..8ab7da139f 100644 --- a/tests/issues/648_test.go +++ b/tests/issues/648_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestIssue648(t *testing.T) { diff --git a/tests/issues/655_test.go b/tests/issues/655_test.go index 159bd04607..cb2c2cd06b 100644 --- a/tests/issues/655_test.go +++ b/tests/issues/655_test.go @@ -4,10 +4,11 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) // Test655 confirms an agreed semantic on failing batch append results with entire batch cancellation. diff --git a/tests/issues/692_test.go b/tests/issues/692_test.go index 29d55bc090..ff2cd891e8 100644 --- a/tests/issues/692_test.go +++ b/tests/issues/692_test.go @@ -6,12 +6,13 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/ClickHouse/clickhouse-go/v2/tests/std" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestIssue692(t *testing.T) { diff --git a/tests/issues/693_test.go b/tests/issues/693_test.go index 2af266554a..9354bff3af 100644 --- a/tests/issues/693_test.go +++ b/tests/issues/693_test.go @@ -1,14 +1,16 @@ package issues import ( - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" ) func TestIssue693(t *testing.T) { diff --git a/tests/issues/741_test.go b/tests/issues/741_test.go index b8be41be5d..1d892ce0f6 100644 --- a/tests/issues/741_test.go +++ b/tests/issues/741_test.go @@ -10,12 +10,13 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" "github.com/google/uuid" "github.com/shopspring/decimal" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" ) func TestIssue741(t *testing.T) { diff --git a/tests/issues/751_test.go b/tests/issues/751_test.go index f9ce453a16..7646018833 100644 --- a/tests/issues/751_test.go +++ b/tests/issues/751_test.go @@ -5,9 +5,10 @@ import ( "database/sql" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestIssue751(t *testing.T) { diff --git a/tests/issues/759_test.go b/tests/issues/759_test.go index 562b21fe50..3a7a02b54c 100644 --- a/tests/issues/759_test.go +++ b/tests/issues/759_test.go @@ -5,10 +5,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test759(t *testing.T) { diff --git a/tests/issues/762_test.go b/tests/issues/762_test.go index 10bf2d8215..ee4f3762f2 100644 --- a/tests/issues/762_test.go +++ b/tests/issues/762_test.go @@ -5,10 +5,11 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/require" ) func Test762(t *testing.T) { diff --git a/tests/issues/777_test.go b/tests/issues/777_test.go index dd6257274c..5ed0675869 100644 --- a/tests/issues/777_test.go +++ b/tests/issues/777_test.go @@ -5,10 +5,11 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func TestInsertNullableString(t *testing.T) { diff --git a/tests/issues/783_test.go b/tests/issues/783_test.go index df6a1f9a96..506ebaf8d5 100644 --- a/tests/issues/783_test.go +++ b/tests/issues/783_test.go @@ -5,10 +5,11 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/require" ) func Test783(t *testing.T) { diff --git a/tests/issues/798_test.go b/tests/issues/798_test.go index 6b791b433c..ddaee6add4 100644 --- a/tests/issues/798_test.go +++ b/tests/issues/798_test.go @@ -6,9 +6,10 @@ import ( "sync/atomic" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test798(t *testing.T) { diff --git a/tests/issues/812_test.go b/tests/issues/812_test.go index aa45b6a0c4..2555641a73 100644 --- a/tests/issues/812_test.go +++ b/tests/issues/812_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test812(t *testing.T) { diff --git a/tests/issues/813_test.go b/tests/issues/813_test.go index 38adb0b5a7..9944506316 100644 --- a/tests/issues/813_test.go +++ b/tests/issues/813_test.go @@ -1,12 +1,14 @@ package issues import ( + "strconv" + "testing" + + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/require" - "strconv" - "testing" ) func Test813(t *testing.T) { diff --git a/tests/issues/816_test.go b/tests/issues/816_test.go index 1b08ce7282..ad22710804 100644 --- a/tests/issues/816_test.go +++ b/tests/issues/816_test.go @@ -1,13 +1,15 @@ package issues import ( + "strconv" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "strconv" - "testing" ) func Test816(t *testing.T) { diff --git a/tests/issues/828_test.go b/tests/issues/828_test.go index 06863ecb72..4723e00454 100644 --- a/tests/issues/828_test.go +++ b/tests/issues/828_test.go @@ -5,9 +5,10 @@ import ( "fmt" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test828(t *testing.T) { diff --git a/tests/issues/870_test.go b/tests/issues/870_test.go index ce7a304967..2c7e058ced 100644 --- a/tests/issues/870_test.go +++ b/tests/issues/870_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test870(t *testing.T) { diff --git a/tests/issues/904_test.go b/tests/issues/904_test.go index c03629fcc2..25fe526dc0 100644 --- a/tests/issues/904_test.go +++ b/tests/issues/904_test.go @@ -5,10 +5,11 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func Test904(t *testing.T) { diff --git a/tests/issues/955_test.go b/tests/issues/955_test.go index 1e3f7834a0..a0709ba3f9 100644 --- a/tests/issues/955_test.go +++ b/tests/issues/955_test.go @@ -5,11 +5,12 @@ import ( "reflect" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func Test955(t *testing.T) { diff --git a/tests/issues/957_test.go b/tests/issues/957_test.go index 7cf3c7bcd3..ecb903a33d 100644 --- a/tests/issues/957_test.go +++ b/tests/issues/957_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) func Test957(t *testing.T) { diff --git a/tests/issues/990_test.go b/tests/issues/990_test.go index 01ca68b7fb..bb82fb2991 100644 --- a/tests/issues/990_test.go +++ b/tests/issues/990_test.go @@ -3,15 +3,17 @@ package issues import ( "context" "fmt" + "strconv" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/ext" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" clickhouse_std_tests "github.com/ClickHouse/clickhouse-go/v2/tests/std" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "strconv" - "testing" - "time" ) func Test990(t *testing.T) { diff --git a/tests/issues/stress_http_batch_test.go b/tests/issues/stress_http_batch_test.go index 54f50c166f..a6d963ed43 100644 --- a/tests/issues/stress_http_batch_test.go +++ b/tests/issues/stress_http_batch_test.go @@ -4,14 +4,16 @@ import ( "context" "crypto/tls" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "strings" "sync" "sync/atomic" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStressHTTPBatchConcurrency(t *testing.T) { diff --git a/tests/json_helper.go b/tests/json_helper.go index 81e3c0de4f..cb4dd224df 100644 --- a/tests/json_helper.go +++ b/tests/json_helper.go @@ -27,7 +27,7 @@ type TestStruct struct { Address TestStructAddress KeysNumbers map[string]int64 - Metadata map[string]interface{} + Metadata map[string]any Timestamp time.Time `chType:"DateTime64(3)"` @@ -112,10 +112,10 @@ func BuildTestJSONStruct() TestStruct { Country: "Country", }, KeysNumbers: map[string]int64{"FieldA": 42, "FieldB": 32}, - Metadata: map[string]interface{}{ + Metadata: map[string]any{ "FieldA": "a", "FieldB": int64(123), - "FieldC": map[string]interface{}{ + "FieldC": map[string]any{ "FieldD": "d", }, }, diff --git a/tests/json_test.go b/tests/json_test.go index e4a4d282f2..b73234a087 100644 --- a/tests/json_test.go +++ b/tests/json_test.go @@ -5,9 +5,10 @@ import ( "encoding/json" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/stretchr/testify/require" ) func setupJSONTest(t *testing.T, protocol clickhouse.Protocol) driver.Conn { diff --git a/tests/lowcardinality_test.go b/tests/lowcardinality_test.go index 899a11842d..aaf2136733 100644 --- a/tests/lowcardinality_test.go +++ b/tests/lowcardinality_test.go @@ -8,8 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestLowCardinality(t *testing.T) { @@ -50,13 +51,13 @@ func TestLowCardinality(t *testing.T) { col2Data = "RU" col3Data = []string{"A", "B", "C"} col4Data = [][]string{ - []string{"Q", "W", "E"}, - []string{"R", "T", "Y"}, + {"Q", "W", "E"}, + {"R", "T", "Y"}, } col5Data = &col2Data col6Data = [][]*string{ - []*string{&col2Data, nil, &col2Data}, - []*string{nil, &col2Data, nil}, + {&col2Data, nil, &col2Data}, + {nil, &col2Data, nil}, } ) if i%2 == 0 { @@ -84,8 +85,8 @@ func TestLowCardinality(t *testing.T) { assert.Equal(t, "RU", col2) assert.Equal(t, []string{"A", "B", "C"}, col3) assert.Equal(t, [][]string{ - []string{"Q", "W", "E"}, - []string{"R", "T", "Y"}, + {"Q", "W", "E"}, + {"R", "T", "Y"}, }, col4) switch { case i%2 == 0: @@ -95,8 +96,8 @@ func TestLowCardinality(t *testing.T) { } col2Data := "RU" assert.Equal(t, [][]*string{ - []*string{&col2Data, nil, &col2Data}, - []*string{nil, &col2Data, nil}, + {&col2Data, nil, &col2Data}, + {nil, &col2Data, nil}, }, col6) } }) diff --git a/tests/map_test.go b/tests/map_test.go index 3b020144ea..8ebb4994ab 100644 --- a/tests/map_test.go +++ b/tests/map_test.go @@ -11,8 +11,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestMap(t *testing.T) { @@ -53,8 +54,8 @@ func TestMap(t *testing.T) { } col3Data = map[string]uint64{} col4Data = []map[string]string{ - map[string]string{"A": "B"}, - map[string]string{"C": "D"}, + {"A": "B"}, + {"C": "D"}, } col5Data = map[string]string{ "key_col_5_1": "100", diff --git a/tests/nested_test.go b/tests/nested_test.go index f683cc5abb..23249dcbef 100644 --- a/tests/nested_test.go +++ b/tests/nested_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleNested(t *testing.T) { @@ -90,14 +91,14 @@ func TestNestedFlattened(t *testing.T) { col2Data = []uint8{10, 20, 30} col3Data = []uint8{101, 201, 230} // Col2.Col1_N2 col4Data = [][][]any{ - [][]any{ - []any{uint8(1), uint8(2)}, + { + {uint8(1), uint8(2)}, }, - [][]any{ - []any{uint8(1), uint8(2)}, + { + {uint8(1), uint8(2)}, }, - [][]any{ - []any{uint8(1), uint8(2)}, + { + {uint8(1), uint8(2)}, }, } ) diff --git a/tests/nothing_test.go b/tests/nothing_test.go index 1c9b75f1ee..0d9e20efdc 100644 --- a/tests/nothing_test.go +++ b/tests/nothing_test.go @@ -6,8 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestNothing(t *testing.T) { diff --git a/tests/nullable_array_test.go b/tests/nullable_array_test.go index 1da6d9fb80..1f9fece7cb 100644 --- a/tests/nullable_array_test.go +++ b/tests/nullable_array_test.go @@ -3,15 +3,17 @@ package tests import ( "context" "fmt" - "github.com/stretchr/testify/require" "net" "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/google/uuid" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestNullableArray(t *testing.T) { diff --git a/tests/opentelemetry_test.go b/tests/opentelemetry_test.go index 17a27f544a..ab92f97ef6 100644 --- a/tests/opentelemetry_test.go +++ b/tests/opentelemetry_test.go @@ -2,12 +2,14 @@ package tests import ( "context" - "github.com/stretchr/testify/require" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel/trace" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestOpenTelemetry(t *testing.T) { diff --git a/tests/package.go b/tests/package.go index e12c199176..888aa17994 100644 --- a/tests/package.go +++ b/tests/package.go @@ -1,10 +1,11 @@ package tests import ( - "github.com/ClickHouse/clickhouse-go/v2" "os" "strings" "testing" + + "github.com/ClickHouse/clickhouse-go/v2" ) var LocalClickHouse = false diff --git a/tests/query_parameters_test.go b/tests/query_parameters_test.go index e3bb84d6aa..00b97e1c89 100644 --- a/tests/query_parameters_test.go +++ b/tests/query_parameters_test.go @@ -3,11 +3,13 @@ package tests import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestQueryParameters(t *testing.T) { diff --git a/tests/read_only_user_test.go b/tests/read_only_user_test.go index a8e5fca7c0..a3361339a6 100644 --- a/tests/read_only_user_test.go +++ b/tests/read_only_user_test.go @@ -4,9 +4,10 @@ import ( "context" "testing" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) func TestReadOnlyUser(t *testing.T) { diff --git a/tests/scan_struct_test.go b/tests/scan_struct_test.go index 4d7b0c35ab..4fad1485aa 100644 --- a/tests/scan_struct_test.go +++ b/tests/scan_struct_test.go @@ -8,8 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestQueryRowScanStruct(t *testing.T) { diff --git a/tests/simple_aggregate_function_test.go b/tests/simple_aggregate_function_test.go index 52a5f1996c..338cd733ab 100644 --- a/tests/simple_aggregate_function_test.go +++ b/tests/simple_aggregate_function_test.go @@ -7,8 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestSimpleAggregateFunction(t *testing.T) { diff --git a/tests/std/array_test.go b/tests/std/array_test.go index 915295e30c..7d4dd3687a 100644 --- a/tests/std/array_test.go +++ b/tests/std/array_test.go @@ -2,13 +2,15 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/bigint_test.go b/tests/std/bigint_test.go index 03a6e0e4b0..25e893acd1 100644 --- a/tests/std/bigint_test.go +++ b/tests/std/bigint_test.go @@ -2,13 +2,15 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "math/big" "strconv" "testing" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/bool_test.go b/tests/std/bool_test.go index fea0e59a9e..db392a7b9f 100644 --- a/tests/std/bool_test.go +++ b/tests/std/bool_test.go @@ -2,12 +2,14 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/client_info_test.go b/tests/std/client_info_test.go index 3bae694b4b..c2cf9d3675 100644 --- a/tests/std/client_info_test.go +++ b/tests/std/client_info_test.go @@ -9,10 +9,11 @@ import ( "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestClientInfo(t *testing.T) { diff --git a/tests/std/close_test.go b/tests/std/close_test.go index b8956f9587..2736e89253 100644 --- a/tests/std/close_test.go +++ b/tests/std/close_test.go @@ -3,14 +3,17 @@ package std import ( "crypto/tls" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdConnClose(t *testing.T) { diff --git a/tests/std/compression_test.go b/tests/std/compression_test.go index a4afaf0517..cc186bf7d8 100644 --- a/tests/std/compression_test.go +++ b/tests/std/compression_test.go @@ -3,13 +3,15 @@ package std import ( "crypto/tls" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "net/url" "strconv" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestCompressionStd(t *testing.T) { diff --git a/tests/std/conn_test.go b/tests/std/conn_test.go index 9641fe2d41..8806d4ea62 100644 --- a/tests/std/conn_test.go +++ b/tests/std/conn_test.go @@ -12,10 +12,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdConn(t *testing.T) { diff --git a/tests/std/connect_check_test.go b/tests/std/connect_check_test.go index 901400a112..669ff2cef8 100644 --- a/tests/std/connect_check_test.go +++ b/tests/std/connect_check_test.go @@ -3,13 +3,15 @@ package std import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/context_timeout_test.go b/tests/std/context_timeout_test.go index e3aa02a225..6f2ae5775a 100644 --- a/tests/std/context_timeout_test.go +++ b/tests/std/context_timeout_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" ) diff --git a/tests/std/custom_dial_test.go b/tests/std/custom_dial_test.go index bf958463cd..16fae5c633 100644 --- a/tests/std/custom_dial_test.go +++ b/tests/std/custom_dial_test.go @@ -4,15 +4,18 @@ import ( "context" "crypto/tls" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "net" "strconv" "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdCustomDial(t *testing.T) { diff --git a/tests/std/date32_test.go b/tests/std/date32_test.go index f218b6ec2f..036b8a5132 100644 --- a/tests/std/date32_test.go +++ b/tests/std/date32_test.go @@ -8,10 +8,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdDate32(t *testing.T) { diff --git a/tests/std/date_test.go b/tests/std/date_test.go index 1ea97f2738..009e5a601d 100644 --- a/tests/std/date_test.go +++ b/tests/std/date_test.go @@ -8,10 +8,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdDate(t *testing.T) { diff --git a/tests/std/datetime64_test.go b/tests/std/datetime64_test.go index 099f626a83..9e3d42d37d 100644 --- a/tests/std/datetime64_test.go +++ b/tests/std/datetime64_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdDateTime64(t *testing.T) { diff --git a/tests/std/datetime_test.go b/tests/std/datetime_test.go index c282a17960..e52bc90120 100644 --- a/tests/std/datetime_test.go +++ b/tests/std/datetime_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdDateTime(t *testing.T) { diff --git a/tests/std/ddl_test.go b/tests/std/ddl_test.go index f5ee83309b..a5be1147c3 100644 --- a/tests/std/ddl_test.go +++ b/tests/std/ddl_test.go @@ -3,11 +3,13 @@ package std import ( "context" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestQuotedDDL(t *testing.T) { diff --git a/tests/std/decimal_test.go b/tests/std/decimal_test.go index 4edc26f555..c0895920b6 100644 --- a/tests/std/decimal_test.go +++ b/tests/std/decimal_test.go @@ -5,9 +5,10 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "github.com/shopspring/decimal" "github.com/stretchr/testify/assert" diff --git a/tests/std/dynamic_test.go b/tests/std/dynamic_test.go index a4026c427a..221a65dad1 100644 --- a/tests/std/dynamic_test.go +++ b/tests/std/dynamic_test.go @@ -3,14 +3,17 @@ package std import ( "context" "database/sql" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) var dynamicTestDate, _ = time.Parse(time.RFC3339, "2024-12-13T02:09:30.123Z") diff --git a/tests/std/enum_test.go b/tests/std/enum_test.go index 5fc47295cd..48832f2025 100644 --- a/tests/std/enum_test.go +++ b/tests/std/enum_test.go @@ -2,12 +2,14 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/external_table_test.go b/tests/std/external_table_test.go index d0b8362ad3..98ef10ef69 100644 --- a/tests/std/external_table_test.go +++ b/tests/std/external_table_test.go @@ -3,15 +3,18 @@ package std import ( "context" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + + "github.com/stretchr/testify/assert" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/ext" - "github.com/stretchr/testify/assert" ) func TestStdExternalTable(t *testing.T) { diff --git a/tests/std/fixed_string_test.go b/tests/std/fixed_string_test.go index 481ad8091e..bc61ad3b20 100644 --- a/tests/std/fixed_string_test.go +++ b/tests/std/fixed_string_test.go @@ -3,12 +3,14 @@ package std import ( "crypto/rand" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/geo_linestring_test.go b/tests/std/geo_linestring_test.go index 0eebd2435f..40dab7b5a2 100644 --- a/tests/std/geo_linestring_test.go +++ b/tests/std/geo_linestring_test.go @@ -6,12 +6,14 @@ import ( "strconv" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoLineString(t *testing.T) { diff --git a/tests/std/geo_multi_linestring_test.go b/tests/std/geo_multi_linestring_test.go index 4715ee6f8e..97c18367ff 100644 --- a/tests/std/geo_multi_linestring_test.go +++ b/tests/std/geo_multi_linestring_test.go @@ -6,12 +6,14 @@ import ( "strconv" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoMultiLineString(t *testing.T) { diff --git a/tests/std/geo_multipolygon_test.go b/tests/std/geo_multipolygon_test.go index e7ac86ef88..a6f11aa7c8 100644 --- a/tests/std/geo_multipolygon_test.go +++ b/tests/std/geo_multipolygon_test.go @@ -3,14 +3,17 @@ package std import ( "context" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoMultiPolygon(t *testing.T) { @@ -70,21 +73,21 @@ func TestStdGeoMultiPolygon(t *testing.T) { col2Data = []orb.MultiPolygon{ []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 2}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, @@ -92,21 +95,21 @@ func TestStdGeoMultiPolygon(t *testing.T) { }, []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{11, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 22}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, diff --git a/tests/std/geo_point_test.go b/tests/std/geo_point_test.go index fbe68e856b..182a09c3fa 100644 --- a/tests/std/geo_point_test.go +++ b/tests/std/geo_point_test.go @@ -3,14 +3,17 @@ package std import ( "context" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoPoint(t *testing.T) { diff --git a/tests/std/geo_polygon_test.go b/tests/std/geo_polygon_test.go index 2f765fdd96..26f9853649 100644 --- a/tests/std/geo_polygon_test.go +++ b/tests/std/geo_polygon_test.go @@ -3,14 +3,17 @@ package std import ( "context" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoPolygon(t *testing.T) { @@ -57,21 +60,21 @@ func TestStdGeoPolygon(t *testing.T) { } col2Data = []orb.Polygon{ []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 22}, }, - orb.Ring{ + { orb.Point{1, 23}, orb.Point{12, 2}, }, }, []orb.Ring{ - orb.Ring{ + { orb.Point{21, 2}, orb.Point{1, 222}, }, - orb.Ring{ + { orb.Point{21, 23}, orb.Point{12, 22}, }, diff --git a/tests/std/geo_ring_test.go b/tests/std/geo_ring_test.go index c851a574d7..e6d9c52a51 100644 --- a/tests/std/geo_ring_test.go +++ b/tests/std/geo_ring_test.go @@ -3,14 +3,17 @@ package std import ( "context" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/paulmach/orb" "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdGeoRing(t *testing.T) { @@ -49,11 +52,11 @@ func TestStdGeoRing(t *testing.T) { orb.Point{1, 2}, } col2Data = []orb.Ring{ - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 2}, }, - orb.Ring{ + { orb.Point{1, 2}, orb.Point{1, 2}, }, diff --git a/tests/std/http_exception_test.go b/tests/std/http_exception_test.go index bbf55a2e71..03b2ecd133 100644 --- a/tests/std/http_exception_test.go +++ b/tests/std/http_exception_test.go @@ -6,10 +6,11 @@ import ( "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestHTTPExceptionHandlingDB(t *testing.T) { diff --git a/tests/std/ipv4_test.go b/tests/std/ipv4_test.go index 732d824ff2..7048b96f4f 100644 --- a/tests/std/ipv4_test.go +++ b/tests/std/ipv4_test.go @@ -2,13 +2,15 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "net" "strconv" "testing" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" ) diff --git a/tests/std/json_test.go b/tests/std/json_test.go index 83ec957eeb..f14cdaecde 100644 --- a/tests/std/json_test.go +++ b/tests/std/json_test.go @@ -8,10 +8,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" ) var jsonTestDate, _ = time.Parse(time.RFC3339, "2024-12-13T02:09:30.123Z") @@ -142,7 +143,7 @@ type TestStruct struct { Address Address KeysNumbers map[string]int64 - Metadata map[string]interface{} + Metadata map[string]any Timestamp time.Time `chType:"DateTime64(3)"` @@ -188,10 +189,10 @@ func TestJSONStruct(t *testing.T) { Country: "Country", }, KeysNumbers: map[string]int64{"FieldA": 42, "FieldB": 32}, - Metadata: map[string]interface{}{ + Metadata: map[string]any{ "FieldA": "a", "FieldB": "b", - "FieldC": map[string]interface{}{ + "FieldC": map[string]any{ "FieldD": "d", }, }, @@ -206,13 +207,13 @@ func TestJSONStruct(t *testing.T) { inputRow2 := TestStruct{ KeysNumbers: map[string]int64{}, Timestamp: jsonTestDate, - Metadata: map[string]interface{}{ + Metadata: map[string]any{ "FieldA": "a", "FieldB": "b", - "FieldC": map[string]interface{}{ + "FieldC": map[string]any{ "FieldD": int64(5), }, - "FieldE": map[string]interface{}{ + "FieldE": map[string]any{ "FieldF": "f", }, }, @@ -231,7 +232,7 @@ func TestJSONStruct(t *testing.T) { err = rows.Scan(&row) require.NoError(t, err) // The second row adds a nil value at this path. Update the inputRow for easier deep equal check - inputRow.Metadata["FieldE"] = map[string]interface{}{ + inputRow.Metadata["FieldE"] = map[string]any{ "FieldF": nil, } require.Equal(t, inputRow, row) @@ -293,10 +294,10 @@ func TestJSONString(t *testing.T) { Country: "Country", }, KeysNumbers: map[string]int64{"FieldA": 42, "FieldB": 32}, - Metadata: map[string]interface{}{ + Metadata: map[string]any{ "FieldA": "a", "FieldB": "b", - "FieldC": map[string]interface{}{ + "FieldC": map[string]any{ "FieldD": "d", }, }, diff --git a/tests/std/lowcardinality_test.go b/tests/std/lowcardinality_test.go index d31c51a308..d20d7b8d44 100644 --- a/tests/std/lowcardinality_test.go +++ b/tests/std/lowcardinality_test.go @@ -7,11 +7,13 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdLowCardinality(t *testing.T) { @@ -57,13 +59,13 @@ func TestStdLowCardinality(t *testing.T) { col2Data = "RU" col3Data = []string{"A", "B", "C"} col4Data = [][]string{ - []string{"Q", "W", "E"}, - []string{"R", "T", "Y"}, + {"Q", "W", "E"}, + {"R", "T", "Y"}, } col5Data = &col2Data col6Data = [][]*string{ - []*string{&col2Data, nil, &col2Data}, - []*string{nil, &col2Data, nil}, + {&col2Data, nil, &col2Data}, + {nil, &col2Data, nil}, } ) if i%2 == 0 { @@ -96,8 +98,8 @@ func TestStdLowCardinality(t *testing.T) { assert.Equal(t, "RU", col2) assert.Equal(t, []string{"A", "B", "C"}, col3) assert.Equal(t, [][]string{ - []string{"Q", "W", "E"}, - []string{"R", "T", "Y"}, + {"Q", "W", "E"}, + {"R", "T", "Y"}, }, col4) switch { case i%2 == 0: @@ -107,8 +109,8 @@ func TestStdLowCardinality(t *testing.T) { } col2Data := "RU" assert.Equal(t, [][]*string{ - []*string{&col2Data, nil, &col2Data}, - []*string{nil, &col2Data, nil}, + {&col2Data, nil, &col2Data}, + {nil, &col2Data, nil}, }, col6) } }) diff --git a/tests/std/map_test.go b/tests/std/map_test.go index 1bfea1fcc9..5c53e7e1ac 100644 --- a/tests/std/map_test.go +++ b/tests/std/map_test.go @@ -6,9 +6,10 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" ) @@ -54,8 +55,8 @@ func TestStdMap(t *testing.T) { } col3Data = map[string]uint64{} col4Data = []map[string]string{ - map[string]string{"A": "B"}, - map[string]string{"C": "D"}, + {"A": "B"}, + {"C": "D"}, } col5Data = map[string]string{ "key_col_5_1": "100", diff --git a/tests/std/materialized_column_test.go b/tests/std/materialized_column_test.go index 2e68039e90..5a6a37a8d9 100644 --- a/tests/std/materialized_column_test.go +++ b/tests/std/materialized_column_test.go @@ -6,10 +6,11 @@ import ( "strconv" "testing" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestMaterializedColumnInsert(t *testing.T) { diff --git a/tests/std/nested_test.go b/tests/std/nested_test.go index 5967cef46c..2203d53dd4 100644 --- a/tests/std/nested_test.go +++ b/tests/std/nested_test.go @@ -3,12 +3,14 @@ package std import ( "crypto/tls" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "strconv" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestStdNested(t *testing.T) { diff --git a/tests/std/query_parameters_test.go b/tests/std/query_parameters_test.go index 7ca7f4098b..a354d407d6 100644 --- a/tests/std/query_parameters_test.go +++ b/tests/std/query_parameters_test.go @@ -2,13 +2,15 @@ package std import ( "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestQueryParameters(t *testing.T) { diff --git a/tests/std/string_test.go b/tests/std/string_test.go index 2c89dbd795..8466c626e1 100644 --- a/tests/std/string_test.go +++ b/tests/std/string_test.go @@ -3,11 +3,13 @@ package std import ( "database/sql" "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "strconv" "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func TestSimpleStdString(t *testing.T) { diff --git a/tests/std/temporary_table_test.go b/tests/std/temporary_table_test.go index 322ee5809d..06d9f86afe 100644 --- a/tests/std/temporary_table_test.go +++ b/tests/std/temporary_table_test.go @@ -6,11 +6,13 @@ import ( "strconv" "testing" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestStdTemporaryTable(t *testing.T) { diff --git a/tests/std/totals_test.go b/tests/std/totals_test.go index a5a212191e..e8d5fad1f7 100644 --- a/tests/std/totals_test.go +++ b/tests/std/totals_test.go @@ -4,9 +4,10 @@ import ( "strconv" "testing" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" ) diff --git a/tests/std/tuples_test.go b/tests/std/tuples_test.go index 176b88532b..b15bee3d79 100644 --- a/tests/std/tuples_test.go +++ b/tests/std/tuples_test.go @@ -7,11 +7,13 @@ import ( "testing" "time" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) var testDate, _ = time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-05-25 17:20:57 +0100 WEST") @@ -64,8 +66,8 @@ func TestTuple(t *testing.T) { }, } col4Data = [][][]any{ - [][]any{ - []any{"Hi", int64(42)}, + { + {"Hi", int64(42)}, }, } col5Data = []any{ diff --git a/tests/std/utils.go b/tests/std/utils.go index b4082e13bb..e6b21547cd 100644 --- a/tests/std/utils.go +++ b/tests/std/utils.go @@ -5,13 +5,14 @@ import ( "database/sql" "encoding/json" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "net/url" "strconv" "strings" "time" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" ) func GetStdTestEnvironment() (clickhouse_tests.ClickHouseTestEnvironment, error) { diff --git a/tests/std/uuid_test.go b/tests/std/uuid_test.go index 143a8b9e9f..79eb13cd5b 100644 --- a/tests/std/uuid_test.go +++ b/tests/std/uuid_test.go @@ -2,11 +2,13 @@ package std import ( "fmt" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" - "github.com/stretchr/testify/require" "strconv" "testing" + "github.com/stretchr/testify/require" + + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/tests/std/variant_test.go b/tests/std/variant_test.go index 67ea3ca870..e9f7c16460 100644 --- a/tests/std/variant_test.go +++ b/tests/std/variant_test.go @@ -3,14 +3,17 @@ package std import ( "context" "database/sql" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "fmt" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/chcol" ) var variantTestDate, _ = time.Parse(time.RFC3339, "2024-12-13T02:09:30.123Z") diff --git a/tests/stress/stress.go b/tests/stress/stress.go index a15f5a0bef..3ca0b94c1b 100644 --- a/tests/stress/stress.go +++ b/tests/stress/stress.go @@ -2,20 +2,22 @@ package main import ( "context" - clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" "log" "os" "os/signal" "syscall" "time" + clickhouse_tests "github.com/ClickHouse/clickhouse-go/v2/tests" + "net/http" _ "net/http/pprof" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/google/uuid" _ "github.com/mkevac/debugcharts" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) type App struct { @@ -57,15 +59,15 @@ func (app *App) batch() { uuid.New(), time.Now(), [][]time.Time{ - []time.Time{ + { time.Now(), time.Now(), }, - []time.Time{ + { time.Now(), time.Now(), }, - []time.Time{ + { time.Now(), time.Now(), }, diff --git a/tests/struct_map_test.go b/tests/struct_map_test.go index 67eb670660..30ca5e7ff2 100644 --- a/tests/struct_map_test.go +++ b/tests/struct_map_test.go @@ -3,11 +3,13 @@ package tests import ( "context" "fmt" - "github.com/stretchr/testify/require" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestAppendStruct(t *testing.T) { diff --git a/tests/time64_test.go b/tests/time64_test.go index 8f2f6bba1f..3cc0b53baa 100644 --- a/tests/time64_test.go +++ b/tests/time64_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func setupTime64Test(t *testing.T, protocol clickhouse.Protocol) clickhouse.Conn { diff --git a/tests/time_mixed_test.go b/tests/time_mixed_test.go index 7502fd106b..3a9774d397 100644 --- a/tests/time_mixed_test.go +++ b/tests/time_mixed_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func setupTimeMixedTest(t *testing.T, protocol clickhouse.Protocol) clickhouse.Conn { diff --git a/tests/time_test.go b/tests/time_test.go index 5af649b63d..47d54a19e6 100644 --- a/tests/time_test.go +++ b/tests/time_test.go @@ -6,9 +6,10 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func setupTimeTest(t *testing.T, protocol clickhouse.Protocol) clickhouse.Conn { diff --git a/tests/totals_test.go b/tests/totals_test.go index df33fd89e8..a5aa4acc6d 100644 --- a/tests/totals_test.go +++ b/tests/totals_test.go @@ -2,11 +2,13 @@ package tests import ( "context" - "github.com/stretchr/testify/require" "testing" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/assert" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestWithTotals(t *testing.T) { diff --git a/tests/tuple_test.go b/tests/tuple_test.go index dd552e30c7..d0d6d396ec 100644 --- a/tests/tuple_test.go +++ b/tests/tuple_test.go @@ -58,8 +58,8 @@ func TestTuple(t *testing.T) { }, } col4Data = [][][]any{ - [][]any{ - []any{"Hi", int64(42)}, + { + {"Hi", int64(42)}, }, } col5Data = []any{ diff --git a/tests/uint8_test.go b/tests/uint8_test.go index b8a161fa2a..305ea39cc6 100644 --- a/tests/uint8_test.go +++ b/tests/uint8_test.go @@ -2,9 +2,11 @@ package tests import ( "context" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" + + "github.com/ClickHouse/clickhouse-go/v2" ) func TestBoolUInt8(t *testing.T) { diff --git a/tests/utils.go b/tests/utils.go index ddea6cfc99..1d7a6d2f22 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -22,15 +22,16 @@ import ( "testing" "time" - "github.com/ClickHouse/clickhouse-go/v2" - "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/ClickHouse/clickhouse-go/v2/lib/proto" "github.com/docker/docker/api/types/container" "github.com/docker/go-units" "github.com/google/uuid" "github.com/stretchr/testify/require" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" + + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "github.com/ClickHouse/clickhouse-go/v2/lib/proto" ) var testUUID = uuid.NewString()[0:12] diff --git a/tests/uuid_test.go b/tests/uuid_test.go index 30dcc409f0..23a606ae35 100644 --- a/tests/uuid_test.go +++ b/tests/uuid_test.go @@ -6,12 +6,14 @@ import ( "fmt" "testing" - "github.com/ClickHouse/clickhouse-go/v2/lib/column" "github.com/stretchr/testify/require" - "github.com/ClickHouse/clickhouse-go/v2" + "github.com/ClickHouse/clickhouse-go/v2/lib/column" + "github.com/google/uuid" + "github.com/ClickHouse/clickhouse-go/v2" + "github.com/stretchr/testify/assert" ) diff --git a/tests/variant_test.go b/tests/variant_test.go index 91f050d665..65909fd9b5 100644 --- a/tests/variant_test.go +++ b/tests/variant_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/require" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" - "github.com/stretchr/testify/require" ) var variantTestDate, _ = time.Parse(time.RFC3339, "2024-12-13T02:09:30.123Z")