Merge branch 'master' into support-clickhouse-v2

kokizzu · web-flow · commit 4dfeff23cfa0 · 2025-04-18T06:42:13.000+08:00
diff --git a/.golangci.yml b/.golangci.yml
@@ -13,10 +13,14 @@ linters:
     - unparam
     - nakedret
     - prealloc
+    - revive
     #- gosec
 linters-settings:
   misspell:
     locale: US
+  revive:
+    rules:
+      - name: redundant-build-tag
 issues:
   max-same-issues: 0
   max-issues-per-linter: 0
diff --git a/cmd/migrate/README.md b/cmd/migrate/README.md
@@ -86,14 +86,18 @@ Options:
   -help            Print usage
 
 Commands:
-  create [-ext E] [-dir D] [-seq] [-digits N] [-format] NAME
-               Create a set of timestamped up/down migrations titled NAME, in directory D with extension E.
-               Use -seq option to generate sequential up/down migrations with N digits.
-               Use -format option to specify a Go time format string.
+  create [-ext E] [-dir D] [-seq] [-digits N] [-format] [-tz] NAME
+           Create a set of timestamped up/down migrations titled NAME, in directory D with extension E.
+           Use -seq option to generate sequential up/down migrations with N digits.
+           Use -format option to specify a Go time format string. Note: migrations with the same time cause "duplicate migration version" error.
+           Use -tz option to specify the timezone that will be used when generating non-sequential migrations (defaults: UTC).
+
   goto V       Migrate to version V
   up [N]       Apply all or N up migrations
-  down [N]     Apply all or N down migrations
-  drop         Drop everything inside database
+  down [N] [-all]    Apply all or N down migrations
+        Use -all to apply all down migrations
+  drop [-f]    Drop everything inside database
+        Use -f to bypass confirmation
   force V      Set version V but don't run migration (ignores dirty state)
   version      Print current migration version
 ```
diff --git a/database/firebird/firebird.go b/database/firebird/firebird.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package firebird
 
diff --git a/database/mysql/mysql.go b/database/mysql/mysql.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package mysql
 
diff --git a/database/pgx/pgx.go b/database/pgx/pgx.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 
diff --git a/database/pgx/v5/pgx.go b/database/pgx/v5/pgx.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package pgx
 
diff --git a/database/postgres/postgres.go b/database/postgres/postgres.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package postgres
 
diff --git a/database/redshift/redshift.go b/database/redshift/redshift.go
@@ -1,5 +1,4 @@
 //go:build go1.9
-// +build go1.9
 
 package redshift
 
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/aws/aws-sdk-go v1.49.6
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/cockroachdb/cockroach-go/v2 v2.1.1
-	github.com/dhui/dktest v0.4.4
+	github.com/dhui/dktest v0.4.5
 	github.com/docker/docker v28.0.1+incompatible
 	github.com/fsouza/fake-gcs-server v1.17.0
 	github.com/go-sql-driver/mysql v1.5.0
diff --git a/go.sum b/go.sum
@@ -150,8 +150,8 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8=
-github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM=
+github.com/dhui/dktest v0.4.5 h1:uUfYBIVREmj/Rw6MvgmqNAYzTiKOHJak+enB5Di73MM=
+github.com/dhui/dktest v0.4.5/go.mod h1:tmcyeHDKagvlDrz7gDKq4UAJOLIfVZYkfD5OnHDwcCo=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
diff --git a/internal/cli/build_aws-s3.go b/internal/cli/build_aws-s3.go
@@ -1,5 +1,4 @@
 //go:build aws_s3
-// +build aws_s3
 
 package cli
 
diff --git a/internal/cli/build_bitbucket.go b/internal/cli/build_bitbucket.go
@@ -1,5 +1,4 @@
 //go:build bitbucket
-// +build bitbucket
 
 package cli
 
diff --git a/internal/cli/build_cassandra.go b/internal/cli/build_cassandra.go
@@ -1,5 +1,4 @@
 //go:build cassandra
-// +build cassandra
 
 package cli
 
diff --git a/internal/cli/build_clickhouse.go b/internal/cli/build_clickhouse.go
@@ -1,5 +1,4 @@
 //go:build clickhouse
-// +build clickhouse
 
 package cli
 
diff --git a/internal/cli/build_cockroachdb.go b/internal/cli/build_cockroachdb.go
@@ -1,5 +1,4 @@
 //go:build cockroachdb
-// +build cockroachdb
 
 package cli
 
diff --git a/internal/cli/build_firebird.go b/internal/cli/build_firebird.go
@@ -1,5 +1,4 @@
 //go:build firebird
-// +build firebird
 
 package cli
 
diff --git a/internal/cli/build_github.go b/internal/cli/build_github.go
@@ -1,5 +1,4 @@
 //go:build github
-// +build github
 
 package cli
 
diff --git a/internal/cli/build_github_ee.go b/internal/cli/build_github_ee.go
@@ -1,5 +1,4 @@
 //go:build github
-// +build github
 
 package cli
 
diff --git a/internal/cli/build_gitlab.go b/internal/cli/build_gitlab.go
@@ -1,5 +1,4 @@
 //go:build gitlab
-// +build gitlab
 
 package cli
 
diff --git a/internal/cli/build_go-bindata.go b/internal/cli/build_go-bindata.go
@@ -1,5 +1,4 @@
 //go:build go_bindata
-// +build go_bindata
 
 package cli
 
diff --git a/internal/cli/build_godoc-vfs.go b/internal/cli/build_godoc-vfs.go
@@ -1,5 +1,4 @@
 //go:build godoc_vfs
-// +build godoc_vfs
 
 package cli
 
diff --git a/internal/cli/build_google-cloud-storage.go b/internal/cli/build_google-cloud-storage.go
@@ -1,5 +1,4 @@
 //go:build google_cloud_storage
-// +build google_cloud_storage
 
 package cli
 
diff --git a/internal/cli/build_mongodb.go b/internal/cli/build_mongodb.go
@@ -1,5 +1,4 @@
 //go:build mongodb
-// +build mongodb
 
 package cli
 
diff --git a/internal/cli/build_mysql.go b/internal/cli/build_mysql.go
@@ -1,5 +1,4 @@
 //go:build mysql
-// +build mysql
 
 package cli
 
diff --git a/internal/cli/build_neo4j.go b/internal/cli/build_neo4j.go
@@ -1,5 +1,4 @@
 //go:build neo4j
-// +build neo4j
 
 package cli
 
diff --git a/internal/cli/build_pgx.go b/internal/cli/build_pgx.go
@@ -1,5 +1,4 @@
 //go:build pgx
-// +build pgx
 
 package cli
 
diff --git a/internal/cli/build_pgxv5.go b/internal/cli/build_pgxv5.go
@@ -1,5 +1,4 @@
 //go:build pgx5
-// +build pgx5
 
 package cli
 
diff --git a/internal/cli/build_postgres.go b/internal/cli/build_postgres.go
@@ -1,5 +1,4 @@
 //go:build postgres
-// +build postgres
 
 package cli
 
diff --git a/internal/cli/build_ql.go b/internal/cli/build_ql.go
@@ -1,5 +1,4 @@
 //go:build ql
-// +build ql
 
 package cli
 
diff --git a/internal/cli/build_redshift.go b/internal/cli/build_redshift.go
@@ -1,5 +1,4 @@
 //go:build redshift
-// +build redshift
 
 package cli
 
diff --git a/internal/cli/build_rqlite.go b/internal/cli/build_rqlite.go
@@ -1,5 +1,4 @@
 //go:build rqlite
-// +build rqlite
 
 package cli
 
diff --git a/internal/cli/build_snowflake.go b/internal/cli/build_snowflake.go
@@ -1,5 +1,4 @@
 //go:build snowflake
-// +build snowflake
 
 package cli
 
diff --git a/internal/cli/build_spanner.go b/internal/cli/build_spanner.go
@@ -1,5 +1,4 @@
 //go:build spanner
-// +build spanner
 
 package cli
 
diff --git a/internal/cli/build_sqlcipher.go b/internal/cli/build_sqlcipher.go
@@ -1,5 +1,4 @@
 //go:build sqlcipher
-// +build sqlcipher
 
 package cli
 
diff --git a/internal/cli/build_sqlite.go b/internal/cli/build_sqlite.go
@@ -1,5 +1,4 @@
 //go:build sqlite
-// +build sqlite
 
 package cli
 
diff --git a/internal/cli/build_sqlite3.go b/internal/cli/build_sqlite3.go
@@ -1,5 +1,4 @@
 //go:build sqlite3
-// +build sqlite3
 
 package cli
 
diff --git a/internal/cli/build_sqlserver.go b/internal/cli/build_sqlserver.go
@@ -1,5 +1,4 @@
 //go:build sqlserver
-// +build sqlserver
 
 package cli
 
diff --git a/internal/cli/build_yugabytedb.go b/internal/cli/build_yugabytedb.go
@@ -1,5 +1,4 @@
 //go:build yugabytedb
-// +build yugabytedb
 
 package cli
 
diff --git a/migrate.go b/migrate.go
@@ -526,7 +526,7 @@ func (m *Migrate) read(from int, to int, ret chan<- interface{}) {
 	}
 }
 
-// readUp reads up migrations from `from` limitted by `limit`.
+// readUp reads up migrations from `from` limited by `limit`.
 // limit can be -1, implying no limit and reading until there are no more migrations.
 // Each migration is then written to the ret channel.
 // If an error occurs during reading, that error is written to the ret channel, too.
@@ -626,7 +626,7 @@ func (m *Migrate) readUp(from int, limit int, ret chan<- interface{}) {
 	}
 }
 
-// readDown reads down migrations from `from` limitted by `limit`.
+// readDown reads down migrations from `from` limited by `limit`.
 // limit can be -1, implying no limit and reading until there are no more migrations.
 // Each migration is then written to the ret channel.
 // If an error occurs during reading, that error is written to the ret channel, too.
diff --git a/source/iofs/example_test.go b/source/iofs/example_test.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs_test
 
diff --git a/source/iofs/iofs.go b/source/iofs/iofs.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs
 
diff --git a/source/iofs/iofs_test.go b/source/iofs/iofs_test.go
@@ -1,5 +1,4 @@
 //go:build go1.16
-// +build go1.16
 
 package iofs_test
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build go1.9`
`2`		`-// +build go1.9`
`3`	`2`
`4`	`3`	`package firebird`
`5`	`4`